am 591d7abc: am df45c6fa: Merge "Add platform support for building LLVMgold.so in LLVM."

* commit '591d7abca716eab9ceb4535592aff3724be1e21e':
  Add platform support for building LLVMgold.so in LLVM.

4 files changed, 52 insertions, 3 deletions

diff --git a/Android.mk b/Android.mk
index b7b8f0023cb7..dc97ee841060 100644
--- a/Android.mk
+++ b/Android.mk
@@ -128,6 +128,7 @@ subdirs += \
   tools/llvm-size \
   tools/llvm-symbolizer \
   tools/lto \
+  tools/gold \
   tools/macho-dump \
   tools/obj2yaml \
   tools/opt \
diff --git a/test/lit.site.cfg b/test/lit.site.cfg
index 9ecc813f87c2..dbc10544e900 100644
--- a/test/lit.site.cfg
+++ b/test/lit.site.cfg
@@ -7,7 +7,7 @@ aosp_dir = os.getenv("ANDROID_BUILD_TOP")
 # Do not edit!
 config.enable_ffi = ""
 config.go_executable = ""
-config.gold_executable = "ld"
+config.gold_executable = "ld.gold"
 config.ld64_executable = "ld"
 config.have_ocamlopt = ""
 config.have_ocaml_ounit = ""
diff --git a/tools/gold/Android.mk b/tools/gold/Android.mk
new file mode 100644
index 000000000000..cc76c8a12c3c
--- /dev/null
+++ b/tools/gold/Android.mk
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH:= $(call my-dir)
+
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../../
+include $(LLVM_ROOT_PATH)/llvm.mk
+
+# For the host only
+# =====================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+LOCAL_MODULE := LLVMgold
+
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+
+llvm_gold_SRC_FILES := \
+  gold-plugin.cpp
+
+LOCAL_SRC_FILES := $(llvm_gold_SRC_FILES)
+
+LOCAL_SHARED_LIBRARIES := libLLVM
+
+ifndef USE_MINGW
+LOCAL_LDLIBS += -lpthread -ldl
+endif
+
+LOCAL_C_INCLUDES += toolchain/binutils/binutils-2.25/include
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/tools/lto/Android.mk b/tools/lto/Android.mk
index 1699c1b95b84..922c46167315 100644
--- a/tools/lto/Android.mk
+++ b/tools/lto/Android.mk
@@ -34,7 +34,7 @@ llvm_lto_SRC_FILES := \
 
 LOCAL_SRC_FILES := $(llvm_lto_SRC_FILES)
 
-LOCAL_STATIC_LIBRARIES := \
+llvm_lto_STATIC_LIBRARIES := \
   libLLVMLinker \
   libLLVMipo \
   libLLVMDebugInfoDWARF \
@@ -82,6 +82,7 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVMTransformObjCARC \
   libLLVMTransformUtils \
   libLLVMipa \
+  libLLVMVectorize \
   libLLVMAnalysis \
   libLLVMTarget \
   libLLVMMCDisassembler \
@@ -92,11 +93,12 @@ LOCAL_STATIC_LIBRARIES := \
   libLLVMOption \
   libLLVMLTO \
   libLLVMSupport \
-  libLLVMVectorize \
   libLLVMProfileData
 
 LOCAL_LDLIBS_darwin := -lpthread -ldl
 LOCAL_LDLIBS_linux := -lpthread -ldl
 
+LOCAL_STATIC_LIBRARIES := $(llvm_lto_STATIC_LIBRARIES) $(llvm_lto_STATIC_LIBRARIES)
+
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_SHARED_LIBRARY)