Apply changes after migration to upstream.
Change-Id: I238ddc9d9461402d15509bdacba7fee22ebf900b
diff --git a/Android.mk b/Android.mk
index 6210620..c59e55c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,7 @@
# MCLinker Libraries
subdirs := \
+ lib/ADT \
lib/CodeGen \
lib/LD \
lib/MC \
diff --git a/include/mcld/Config/Config.h b/include/mcld/Config/Config.h
index 362b076..a6ce28a 100644
--- a/include/mcld/Config/Config.h
+++ b/include/mcld/Config/Config.h
@@ -14,13 +14,16 @@
#ifndef MCLD_CONFIG_H
#define MCLD_CONFIG_H
-namespace mcld {
-namespace internal {
+#include <llvm/Config/llvm-config.h>
-static const char* version="0.2.10.1-18peaks";
+#ifdef LLVM_ON_UNIX
+# define MCLD_ON_UNIX 1
+#else
+// Assume on Win32 otherwise.
+# define MCLD_ON_WIN32 1
+#endif
-} // namespace of internal
-} // namespace of mcld
+#define MCLD_VERSION "LionHead - 1.3.18"
#endif
diff --git a/lib/ADT/Android.mk b/lib/ADT/Android.mk
new file mode 100644
index 0000000..5318dd8
--- /dev/null
+++ b/lib/ADT/Android.mk
@@ -0,0 +1,28 @@
+LOCAL_PATH:= $(call my-dir)
+
+mcld_adt_SRC_FILES := \
+ StringEntry.cpp
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mcld_adt_SRC_FILES)
+LOCAL_MODULE:= libmcldADT
+
+LOCAL_MODULE_TAGS := optional
+
+include $(MCLD_HOST_BUILD_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mcld_adt_SRC_FILES)
+LOCAL_MODULE:= libmcldADT
+
+LOCAL_MODULE_TAGS := optional
+
+include $(MCLD_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/LD/Android.mk b/lib/LD/Android.mk
index dc356c7..d7cccfa 100644
--- a/lib/LD/Android.mk
+++ b/lib/LD/Android.mk
@@ -7,10 +7,21 @@
mcld_ld_SRC_FILES := \
ArchiveReader.cpp \
BranchIsland.cpp \
+ CIE.cpp \
+ DWARFLineInfo.cpp \
+ Diagnostic.cpp \
+ DiagnosticEngine.cpp \
+ DiagnosticInfos.cpp \
+ DiagnosticLineInfo.cpp \
+ DiagnosticPrinter.cpp \
DynObjReader.cpp \
DynObjWriter.cpp \
ELFSegment.cpp \
ELFSegmentFactory.cpp \
+ EhFrame.cpp \
+ EhFrameHdr.cpp \
+ ExecWriter.cpp \
+ FDE.cpp \
Layout.cpp \
LDContext.cpp \
LDFileFormat.cpp \
@@ -19,6 +30,8 @@
LDSectionFactory.cpp \
LDSymbol.cpp \
LDWriter.cpp \
+ MsgHandler.cpp \
+ NamePool.cpp \
ObjectWriter.cpp \
Relocation.cpp \
RelocationFactory.cpp \
@@ -28,7 +41,7 @@
SectionMap.cpp \
SectionMerger.cpp \
StaticResolver.cpp \
- StrSymPool.cpp
+ TextDiagnosticPrinter.cpp
# For the host
# =====================================================
@@ -65,6 +78,7 @@
ELFDynObjReader.cpp \
ELFDynObjWriter.cpp \
ELFExecFileFormat.cpp \
+ ELFExecWriter.cpp \
ELFFileFormat.cpp \
ELFObjectReader.cpp \
ELFObjectWriter.cpp \
diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index 044b027..b184116 100644
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -4,6 +4,7 @@
AttributeFactory.cpp \
ContextFactory.cpp \
InputFactory.cpp \
+ InputTree.cpp \
MCBitcodeInterceptor.cpp \
MCFragmentRef.cpp \
MCLDAttribute.cpp \
@@ -12,13 +13,13 @@
MCLDFile.cpp \
MCLDInfo.cpp \
MCLDInput.cpp \
- MCLDInputTree.cpp \
MCLDOptions.cpp \
MCLDOutput.cpp \
MCLinker.cpp \
MCRegionFragment.cpp \
SearchDirs.cpp \
- SymbolCategory.cpp
+ SymbolCategory.cpp \
+ ZOption.cpp
# For the host
# =====================================================
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 952ba53..8e5a7ca 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -3,15 +3,21 @@
mcld_support_SRC_FILES := \
CommandLine.cpp \
Directory.cpp \
+ FileHandle.cpp \
FileSystem.cpp \
+ HandleToArea.cpp \
LEB128.cpp \
MemoryArea.cpp \
MemoryAreaFactory.cpp \
MemoryRegion.cpp \
+ MsgHandling.cpp \
Path.cpp \
RealPath.cpp \
RegionFactory.cpp \
- TargetRegistry.cpp
+ Space.cpp \
+ SystemUtils.cpp \
+ TargetRegistry.cpp \
+ raw_ostream.cpp
# For the host
# =====================================================
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 272e9f4..114f2dc 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)
mcld_arm_target_SRC_FILES := \
- ARMAndroidSectLinker.cpp \
+ ARMDiagnostic.cpp \
ARMELFDynamic.cpp \
ARMELFSectLinker.cpp \
ARMGOT.cpp \
diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk
index 8e6e260..abcc876 100644
--- a/lib/Target/Android.mk
+++ b/lib/Target/Android.mk
@@ -1,8 +1,8 @@
LOCAL_PATH:= $(call my-dir)
mcld_target_SRC_FILES := \
- AndroidSectLinker.cpp \
ELFDynamic.cpp \
+ ELFSectLinker.cpp \
GNULDBackend.cpp \
GOT.cpp \
OutputRelocSection.cpp \
diff --git a/lib/Target/Mips/Android.mk b/lib/Target/Mips/Android.mk
index cc5a211..4707c4b 100644
--- a/lib/Target/Mips/Android.mk
+++ b/lib/Target/Mips/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)
mcld_mips_target_SRC_FILES := \
- MipsAndroidSectLinker.cpp \
+ MipsDiagnostic.cpp \
MipsELFDynamic.cpp \
MipsELFSectLinker.cpp \
MipsGOT.cpp \
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index e9a051b..2272632 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)
mcld_x86_target_SRC_FILES := \
- X86AndroidSectLinker.cpp \
+ X86Diagnostic.cpp \
X86ELFDynamic.cpp \
X86ELFSectLinker.cpp \
X86GOT.cpp \
