Add markers for release 2.26

[deliverable/binutils-gdb.git] / gold / configure.ac

diff --git a/gold/configure.ac b/gold/configure.ac
index 7ad730297931d725cd69823357af49c36dd99dd8..89f6c53b92270653baf517f7e979666c8d0faea1 100644 (file)
--- a/gold/configure.ac
+++ b/gold/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2006-2014 Free Software Foundation, Inc.
+dnl   Copyright (C) 2006-2015 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -199,12 +199,29 @@ for targ in $target $canon_targets; do
        default_big_endian=$targ_big_endian
        default_osabi=$targ_osabi
 
+       AM_CONDITIONAL(DEFAULT_TARGET_AARCH64, test "$targ_obj" = "aarch64")
        AM_CONDITIONAL(DEFAULT_TARGET_ARM, test "$targ_obj" = "arm")
        AM_CONDITIONAL(DEFAULT_TARGET_I386, test "$targ_obj" = "i386")
        AM_CONDITIONAL(DEFAULT_TARGET_POWERPC, test "$targ_obj" = "powerpc")
        AM_CONDITIONAL(DEFAULT_TARGET_SPARC, test "$targ_obj" = "sparc")
-       AM_CONDITIONAL(DEFAULT_TARGET_X86_64, test "$targ_obj" = "x86_64")
+       AM_CONDITIONAL(DEFAULT_TARGET_S390, test "$targ_obj" = "s390")
+       target_x86_64=no
+       target_x32=no
+       if test "$targ_obj" = "x86_64"; then
+         case "$target" in
+         x86_64*-linux-gnux32)
+           target_x32=yes
+           default_size=32
+           ;;
+         *)
+           target_x86_64=yes
+           ;;
+         esac
+       fi
+       AM_CONDITIONAL(DEFAULT_TARGET_X86_64, test "$target_x86_64" = "yes")
+       AM_CONDITIONAL(DEFAULT_TARGET_X32, test "$target_x32" = "yes")
        AM_CONDITIONAL(DEFAULT_TARGET_TILEGX, test "$targ_obj" = "tilegx")
+        AM_CONDITIONAL(DEFAULT_TARGET_MIPS, test "$targ_obj" = "mips")
        DEFAULT_TARGET=${targ_obj}
        AC_SUBST(DEFAULT_TARGET)
       fi
@@ -315,6 +332,7 @@ AM_CONDITIONAL(FN_PTRS_IN_SO_WITHOUT_PIC, [
     powerpc*) false;;
     x86_64) false;;
     sparc64) false;;
+    s390x) false;;
     *) true;;
   esac])
 
@@ -512,7 +530,6 @@ fi
 
 # Link in zlib if we can.  This allows us to write compressed sections.
 AM_ZLIB
-AM_CONDITIONAL(HAVE_ZLIB, test "$ac_cv_header_zlib_h" = "yes")
 
 dnl We have to check these in C, not C++, because autoconf generates
 dnl tests which have no type information, and current glibc provides