ns32k: remove dupplicate definition of input_line_pointer

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

diff --git a/gold/configure.ac b/gold/configure.ac
index a2e58955a69fda62b8ebd31b821c093bed494709..695a2fdcc79152c27487fb759ad0e6b5e7ee5bc5 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-2015 Free Software Foundation, Inc.
+dnl   Copyright (C) 2006-2016 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
@@ -204,12 +204,14 @@ for targ in $target $canon_targets; do
        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_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
@@ -330,6 +332,7 @@ AM_CONDITIONAL(FN_PTRS_IN_SO_WITHOUT_PIC, [
     powerpc*) false;;
     x86_64) false;;
     sparc64) false;;
+    s390x) false;;
     *) true;;
   esac])
 
@@ -527,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