From 8bfb6b2bf11cfbc445239158ec28d0988f8fa947 Mon Sep 17 00:00:00 2001
From: Han Shen <shenhan@google.com>
Date: Tue, 17 Nov 2015 16:29:47 -0800
Subject: Create an unified binutils source tree for both Android and
 ChromiumOS.

About source code - The base version of this binutils is newer than that
of aosp/binutils-2.25, it is based on the binutils that is used to build
google products and ChromiumOS. And it contains *all* local Android
patches as well as all patches that are cherry-picked from upstream for
aosp/binutils-2.25 tree (up to Nov. 5 - 932d71b85). You may find the
detailed development history for this binutils tree here -
https://chromium.googlesource.com/chromiumos/third_party/binutils/+log/unification
(This CL is a combination of all the CLs in it. After this CL is
submitted the tree will be identical to
https://chromium.googlesource.com/chromiumos/third_party/binutils/+log/unification
at 2865a3615d80bd5f82d14d7e0484e84dc052596a)

About testing - We tested this binutils for both ChromiumOS and
Android. For android, we tested building N4, N5X, N6, N7, N9 using new
binutils, we also did a full-build of toolchain (by build.py) and built
a N5X image; for ChromiumOS - it passed ChromiumOS toolchain release
tests on all 4 platforms (x86, x86_64, arm32 and arm64).

Change-Id: I2bb2cf579f9458d0a8bc9612331dc7d5043e3d82
---
 binutils-2.25/gold/configure | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

(limited to 'binutils-2.25/gold/configure')

diff --git a/binutils-2.25/gold/configure b/binutils-2.25/gold/configure
index 34270746..1edd5abc 100755
--- a/binutils-2.25/gold/configure
+++ b/binutils-2.25/gold/configure
@@ -635,8 +635,8 @@ NATIVE_OR_CROSS_LINKER_FALSE
 NATIVE_OR_CROSS_LINKER_TRUE
 GCC_FALSE
 GCC_TRUE
-NATIVE_LINKER_FALSE
-NATIVE_LINKER_TRUE
+TEST_AS_NATIVE_LINKER_FALSE
+TEST_AS_NATIVE_LINKER_TRUE
 MSGMERGE
 MSGFMT
 MKINSTALLDIRS
@@ -789,6 +789,7 @@ enable_gold
 enable_threads
 enable_plugins
 enable_targets
+enable_test_as_native
 with_lib_path
 enable_dependency_tracking
 enable_nls
@@ -1438,6 +1439,7 @@ Optional Features:
   --enable-threads        multi-threaded linking
   --enable-plugins        linker plugins
   --enable-targets        alternative target configurations
+  --enable-test-as-native  test as though linker is native
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-nls           do not use Native Language Support
@@ -3382,6 +3384,26 @@ if test -n "$enable_targets"; then
   done
 fi
 
+# Check whether --enable-test-as-native was given.
+if test "${enable_test_as_native+set}" = set; then :
+  enableval=$enable_test_as_native; case "${enableval}" in
+  no)
+    test_as_native=no
+    ;;
+  *)
+    test_as_native=yes
+    ;;
+esac
+else
+  if test "x$target_alias" = "x" -o "x$host_alias" = "x$target_alias"; then
+  test_as_native=yes
+else
+  test_as_native=no
+fi
+fi
+
+
+
 # See which specific instantiations we need.
 targetobjs=
 all_targets=
@@ -6258,12 +6280,12 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
 
 
- if test "x$target_alias" = "x" -o "x$host_alias" = "x$target_alias"; then
-  NATIVE_LINKER_TRUE=
-  NATIVE_LINKER_FALSE='#'
+ if test "x$test_as_native" = "xyes"; then
+  TEST_AS_NATIVE_LINKER_TRUE=
+  TEST_AS_NATIVE_LINKER_FALSE='#'
 else
-  NATIVE_LINKER_TRUE='#'
-  NATIVE_LINKER_FALSE=
+  TEST_AS_NATIVE_LINKER_TRUE='#'
+  TEST_AS_NATIVE_LINKER_FALSE=
 fi
 
  if test "$GCC" = yes; then
@@ -7859,8 +7881,8 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-if test -z "${NATIVE_LINKER_TRUE}" && test -z "${NATIVE_LINKER_FALSE}"; then
-  as_fn_error "conditional \"NATIVE_LINKER\" was never defined.
+if test -z "${TEST_AS_NATIVE_LINKER_TRUE}" && test -z "${TEST_AS_NATIVE_LINKER_FALSE}"; then
+  as_fn_error "conditional \"TEST_AS_NATIVE_LINKER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then
-- 
cgit v1.2.3