config.gcc (s390-*-linux*): If 'enabled_targets' is 'all', build a bi-arch compiler...

2011-07-11  Arthur Loiret  <aloiret@debian.org>

        * config.gcc (s390-*-linux*): If 'enabled_targets' is 'all', build
        a bi-arch compiler defaulting to 31-bit. In this case:
        (tmake_file): Add s390/t-linux64.
        * doc/install.texi: Add s390-linux to the list of targets supporting
        --enable-targets=all.

From-SVN: r176146

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 59e1fde440e7ffe8e1fbf251499a2ad7710b2d43..0dadeefe87f8e5bdcb85893b39a37cc1f387336f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-11  Arthur Loiret  <aloiret@debian.org>
+
+       * config.gcc (s390-*-linux*): If 'enabled_targets' is 'all', build
+       a bi-arch compiler defaulting to 31-bit. In this case:
+       (tmake_file): Add s390/t-linux64.
+       * doc/install.texi: Add s390-linux to the list of targets supporting
+       --enable-targets=all.
+
 2011-07-11  Arthur Loiret  <aloiret@debian.org>
            Matthias Klose <doko@debian.org>
 

diff --git a/gcc/config.gcc b/gcc/config.gcc
index e51a44a8a7816d8e50523286ef81257ac025b7b4..1af4e52fe9dfeb3f55245536df601621b72dcff7 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2249,6 +2249,9 @@ rx-*-elf*)
        ;;
 s390-*-linux*)
        tm_file="s390/s390.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h s390/linux.h"
+       if test x$enable_targets = xall; then
+               tmake_file="${tmake_file} s390/t-linux64"
+       fi
        ;;
 s390x-*-linux*)
        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h s390/linux.h"

diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 833b4c935d7505a3baf4a131d070767ad6a05f6c..9834728f838433418a6b9a5fa0f71587ed15ec18 100644 (file)
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -1403,8 +1403,8 @@ useful when you want a bi-arch compiler that defaults to 32-bit, and
 you are building a bi-arch or multi-arch binutils in a combined tree.
 On mips-linux, this will build a tri-arch compiler (ABI o32/n32/64),
 defaulted to o32.
-Currently, this option only affects sparc-linux, powerpc-linux, x86-linux
-and mips-linux.
+Currently, this option only affects sparc-linux, powerpc-linux, x86-linux,
+mips-linux and s390-linux.
 
 @item --enable-secureplt
 This option enables @option{-msecure-plt} by default for powerpc-linux.
@@ -1968,6 +1968,10 @@ Adds aot-compile-rpm to the list of installed scripts.
 @item --enable-browser-plugin
 Build the gcjwebplugin web browser plugin.
 
+@item --enable-static-libjava
+Build static libraries in libjava. The default is to only build shared
+libraries.
+
 @table @code
 @item ansi
 Use the single-byte @code{char} and the Win32 A functions natively,