From: Arthur Loiret <aloiret@debian.org>
Date: Mon, 11 Jul 2011 11:41:56 +0000 (+0000)
Subject: config.gcc (s390-*-linux*): If 'enabled_targets' is 'all', build a bi-arch compiler... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f305422365c1f70e00ae6f5d9bc8bc8cad4928ed;p=gcc.git

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

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 59e1fde440e..0dadeefe87f 100644
--- 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 e51a44a8a78..1af4e52fe9d 100644
--- 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 833b4c935d7..9834728f838 100644
--- 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,