[commit: ghc] ghc-7.10: Use the gold linker for aarch64/linux (#9673) (96c99d5)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/96c99d5cb38e16c7b81b5efc73caedd174e4e4bd/ghc

>---------------------------------------------------------------

commit 96c99d5cb38e16c7b81b5efc73caedd174e4e4bd
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Mon Apr 20 20:22:44 2015 +0000

    Use the gold linker for aarch64/linux (#9673)
    
    Like 32 bit Arm, Aarch64 requires use of the gold linker.
    
    Signed-off-by: Erik de Castro Lopo <erikd at mega-nerd.com>
    
    Test Plan: 'make install' on aarch64, validate elsewhere
    
    Reviewers: rwbarton, bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D858
    
    GHC Trac Issues: #9673
    
    (cherry picked from commit 0bbc2ac6dae9ce2838f23a75a6a989826c06f3f5)


>---------------------------------------------------------------

96c99d5cb38e16c7b81b5efc73caedd174e4e4bd
 aclocal.m4 | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 63e21e5..c08a28e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -565,9 +565,11 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         $3="$$3 -D_HPUX_SOURCE"
         $5="$$5 -D_HPUX_SOURCE"
         ;;
-    arm*linux*)
-        # On arm/linux and arm/android, tell gcc to link using the gold linker.
-        # Forcing LD to be ld.gold is done in configre.ac.
+    arm*linux*       | \
+    aarch64*linux*   )
+        # On arm/linux, aarch64/linux, arm/android and aarch64/android, tell
+        # gcc to link using the gold linker.
+        # Forcing LD to be ld.gold is done in FIND_LD m4 macro.
         $3="$$3 -fuse-ld=gold"
         ;;
     esac
@@ -2123,10 +2125,12 @@ AC_DEFUN([FIND_LLVM_PROG],[
 AC_DEFUN([FIND_LD],[
     FP_ARG_WITH_PATH_GNU_PROG([LD], [ld], [ld])
     case $target in
-        arm*linux*)
-            # Arm requires use of the binutils ld.gold linker.
-            # This case should catch at least arm-unknown-linux-gnueabihf and
-            # arm-linux-androideabi.
+        arm*linux*       | \
+        aarch64*linux*   )
+            # Arm and Aarch64 requires use of the binutils ld.gold linker.
+            # This case should catch at least arm-unknown-linux-gnueabihf,
+            # arm-linux-androideabi, arm64-unknown-linux and
+            # aarch64-linux-android
             FP_ARG_WITH_PATH_GNU_PROG([LD_GOLD], [ld.gold], [ld.gold])
             $1="$LD_GOLD"
             ;;