Apply mainline r202190, powerpc64le multilibs and multiarch dir 2013-09-03 Alan Modra...

[gcc]

2014-04-04  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>

	Apply mainline r202190, powerpc64le multilibs and multiarch dir
	2013-09-03  Alan Modra  <amodra@gmail.com>

	* config.gcc (powerpc*-*-linux*): Add support for little-endian
	multilibs to big-endian target and vice versa.
	* config/rs6000/t-linux64: Use := assignment on all vars.
	(MULTILIB_EXTRA_OPTS): Remove fPIC.
	(MULTILIB_OSDIRNAMES): Specify using mapping from multilib_options.
	* config/rs6000/t-linux64le: New file.
	* config/rs6000/t-linux64bele: New file.
	* config/rs6000/t-linux64lebe: New file.

[libsanitizer]

2014-04-04  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>

	Backport from mainline r208290
	2014-03-03  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>

	* configure.tgt: Unsupported for little endian PowerPC for now.

From-SVN: r209106

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 41054886c64f7d41ef315e3eff7dc982cd0d44d4..abe625efd3e008e9f2e43370b0a52a4c173c7614 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2014-04-04  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
+
+       Apply mainline r202190, powerpc64le multilibs and multiarch dir
+       2013-09-03  Alan Modra  <amodra@gmail.com>
+
+       * config.gcc (powerpc*-*-linux*): Add support for little-endian
+       multilibs to big-endian target and vice versa.
+       * config/rs6000/t-linux64: Use := assignment on all vars.
+       (MULTILIB_EXTRA_OPTS): Remove fPIC.
+       (MULTILIB_OSDIRNAMES): Specify using mapping from multilib_options.
+       * config/rs6000/t-linux64le: New file.
+       * config/rs6000/t-linux64bele: New file.
+       * config/rs6000/t-linux64lebe: New file.
+
 2014-04-04  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        Back port from mainline

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 2dd8881eca8cafd66bf93edf0f5966e62f0c36e4..a4fb77db7461aad3d0641df95a389e596ef14c6d 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2081,7 +2081,7 @@ powerpc*-*-linux*)
        tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
        case ${target} in
            powerpc*le-*-*)
-           tm_file="${tm_file} rs6000/sysv4le.h" ;;
+               tm_file="${tm_file} rs6000/sysv4le.h" ;;
        esac
        maybe_biarch=yes
        case ${target} in
@@ -2104,6 +2104,19 @@ powerpc*-*-linux*)
                fi
                tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h glibc-stdint.h"
                tmake_file="$tmake_file rs6000/t-linux64"
+               case ${target} in
+                   powerpc*le-*-*)
+                       tmake_file="$tmake_file rs6000/t-linux64le"
+                       case ${enable_targets} in
+                           all | *powerpc64-* | *powerpc-*)
+                               tmake_file="$tmake_file rs6000/t-linux64lebe" ;;
+                       esac ;;
+                   *)
+                       case ${enable_targets} in
+                           all | *powerpc64le-* | *powerpcle-*)
+                               tmake_file="$tmake_file rs6000/t-linux64bele" ;;
+                       esac ;;
+               esac
                extra_options="${extra_options} rs6000/linux64.opt"
                ;;
            *)

diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
index 9175de2ffe3cdd4c560b1e29aad70cee737f88a4..70e928dd7cdc49bf318c9d9f7ccc8412e857d13e 100644 (file)
--- a/gcc/config/rs6000/t-linux64
+++ b/gcc/config/rs6000/t-linux64
@@ -25,8 +25,8 @@
 # it doesn't tell anything about the 32bit libraries on those systems.  Set
 # MULTILIB_OSDIRNAMES according to what is found on the target.
 
-MULTILIB_OPTIONS        = m64/m32
-MULTILIB_DIRNAMES       = 64 32
-MULTILIB_EXTRA_OPTS     = fPIC
-MULTILIB_OSDIRNAMES    = ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
-MULTILIB_OSDIRNAMES    += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
+MULTILIB_OPTIONS    := m64/m32
+MULTILIB_DIRNAMES   := 64 32
+MULTILIB_EXTRA_OPTS := 
+MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)

diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele
new file mode 100644 (file)
index 0000000..97c1ee6
--- /dev/null
+++ b/gcc/config/rs6000/t-linux64bele
@@ -0,0 +1,7 @@
+#rs6000/t-linux64end
+
+MULTILIB_OPTIONS    += mlittle
+MULTILIB_DIRNAMES   += le
+MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
+MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
+MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}

diff --git a/gcc/config/rs6000/t-linux64le b/gcc/config/rs6000/t-linux64le
new file mode 100644 (file)
index 0000000..0cf38e1
--- /dev/null
+++ b/gcc/config/rs6000/t-linux64le
@@ -0,0 +1,3 @@
+#rs6000/t-linux64le
+
+MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))

diff --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe
new file mode 100644 (file)
index 0000000..2e63bdb
--- /dev/null
+++ b/gcc/config/rs6000/t-linux64lebe
@@ -0,0 +1,7 @@
+#rs6000/t-linux64leend
+
+MULTILIB_OPTIONS    += mbig
+MULTILIB_DIRNAMES   += be
+MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
+MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
+MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 11d22c0208b3d66a7db18edb207bb4d4bd72ebf6..482a6cd77e16cd4aaffec05e7bf1ed911c4a38e6 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-04  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
+
+       Backport from mainline r208290
+       2014-03-03  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
+
+       * configure.tgt: Unsupported for little endian PowerPC for now.
+
 2013-10-16  Release Manager
 
        * GCC 4.8.2 released.

diff --git a/libsanitizer/configure.tgt b/libsanitizer/configure.tgt
index 265da01a13c96179f8cf51eb0d1d14d12192bce5..01b76a898486bf94fcd74ec0752019963e5a4c60 100644 (file)
--- a/libsanitizer/configure.tgt
+++ b/libsanitizer/configure.tgt
@@ -25,6 +25,9 @@ case "${target}" in
                TSAN_SUPPORTED=yes
        fi
        ;;
+  powerpc*le-*-linux*)
+       UNSUPPORTED=1
+       ;;
   powerpc*-*-linux*)
        ;;
   sparc*-*-linux*)