commit fe41fd537b9ffa9fef4b975f6ad2333e1452122b
author Nicolas Geoffray <ngeoffray@google.com> Mon Mar 03 18:48:18 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 03 18:48:19 2014 +0000
tree aaf3301283eddb3884dd21317f5861e66c4b7aad
parent 516caa6ca003b29c1dec67a07f3329f4e3ea6121
parent f741af5f8ce461a5100eea579b116ff61378dc12

Merge "Revert "Makefile changes to get mclinker to build again.""

Android.mk

diff --git a/Android.mk b/Android.mk
index 7998c59..79c6d5b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,6 @@
   lib/LD \
   lib/MC \
   lib/Object \
-  lib/Script \
   lib/Support \
   lib/Target
 

lib/LD/Android.mk

diff --git a/lib/LD/Android.mk b/lib/LD/Android.mk
index 4bfafd7..1f46a0b 100644
--- a/lib/LD/Android.mk
+++ b/lib/LD/Android.mk
@@ -9,7 +9,6 @@
   ArchiveReader.cpp \
   BranchIsland.cpp  \
   BranchIslandFactory.cpp  \
-  BinaryReader.cpp \
   DWARFLineInfo.cpp \
   Diagnostic.cpp  \
   DiagnosticEngine.cpp  \
@@ -23,7 +22,6 @@
   EhFrame.cpp \
   EhFrameHdr.cpp  \
   EhFrameReader.cpp  \
-  GarbageCollection.cpp \
   GroupReader.cpp \
   LDContext.cpp \
   LDFileFormat.cpp  \

lib/Script/Android.mk

diff --git a/lib/Script/Android.mk b/lib/Script/Android.mk
deleted file mode 100644
index e24fa35..0000000
--- a/lib/Script/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-mcld_script_SRC_FILES := \
-  AssertCmd.cpp \
-  Assignment.cpp \
-  BinaryOp.cpp \
-  EntryCmd.cpp \
-  FileToken.cpp \
-  GroupCmd.cpp \
-  InputSectDesc.cpp \
-  InputToken.cpp \
-  NameSpec.cpp \
-  NullaryOp.cpp \
-  Operand.cpp \
-  Operator.cpp \
-  OutputArchCmd.cpp \
-  OutputCmd.cpp \
-  OutputFormatCmd.cpp \
-  OutputSectDesc.cpp \
-  RpnEvaluator.cpp \
-  RpnExpr.cpp \
-  ScriptCommand.cpp \
-  ScriptFile.cpp \
-  ScriptReader.cpp \
-  SearchDirCmd.cpp \
-  SectionsCmd.cpp \
-  ScriptScanner.ll \
-  ScriptParser.yy \
-  StrToken.cpp \
-  StringList.cpp \
-  TernaryOp.cpp \
-  UnaryOp.cpp \
-  WildcardPattern.cpp
-
-# For the host
-# =====================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(mcld_script_SRC_FILES)
-LOCAL_MODULE:= libmcldScript
-LOCAL_C_INCLUDES := $(MCLD_ROOT_PATH)/include/mcld/Script
-
-LOCAL_MODULE_TAGS := optional
-
-include $(MCLD_HOST_BUILD_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# For the device
-# =====================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(mcld_script_SRC_FILES)
-LOCAL_MODULE:= libmcldScript
-LOCAL_C_INCLUDES := $(MCLD_ROOT_PATH)/include/mcld/Script
-
-LOCAL_MODULE_TAGS := optional
-
-include $(MCLD_DEVICE_BUILD_MK)
-include $(BUILD_STATIC_LIBRARY)

lib/Target/ARM/Android.mk

diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 31fe7af..f35d76b 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -2,7 +2,6 @@
 
 mcld_arm_target_SRC_FILES := \
   ARMDiagnostic.cpp \
-  ARMELFAttributeData.cpp \
   ARMELFDynamic.cpp \
   ARMELFMCLinker.cpp \
   ARMEmulation.cpp \

lib/Target/Mips/Android.mk

diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index 541f5bb..4c921ca 100644
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -5,13 +5,9 @@
   MipsELFDynamic.cpp  \
   MipsELFMCLinker.cpp  \
   MipsEmulation.cpp \
-  MipsGNUInfo.cpp \
   MipsGOT.cpp \
-  MipsGOTPLT.cpp \
-  MipsLA25Stub.cpp \
   MipsLDBackend.cpp \
   MipsMCLinker.cpp \
-  MipsPLT.cpp \
   MipsRelocator.cpp \
   MipsTargetMachine.cpp