This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch] [powerpc] add multiarch definitions for powerpc-linux-gnu
- From: Matthias Klose <doko at ubuntu dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Wed, 14 Nov 2012 23:35:14 +0100
- Subject: [patch] [powerpc] add multiarch definitions for powerpc-linux-gnu
The following patch adds the multiarch definitions for -linux-gnu. Tested using
a Debian/Ubuntu package build. Ok for the trunk?
Matthias
2012-11-14 Matthias Klose <doko@ubuntu.com>
* config/rs6000/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.
* config/rs6000/t-linux: New file; define MULTIARCH_DIRNAME.
* config/rs6000/t-spe: Define MULTIARCH_DIRNAME.
* config.gcc <powerpc-*-linux* | powerpc64-*-linux*> (tmake_file):
Include rs6000/t-linux for 32bit non-biarch configurations.
Index: config/rs6000/t-linux64
===================================================================
--- config/rs6000/t-linux64 (revision 193508)
+++ config/rs6000/t-linux64 (working copy)
@@ -29,4 +29,5 @@
MULTILIB_OPTIONS = m64/m32
MULTILIB_DIRNAMES = 64 32
MULTILIB_EXTRA_OPTS = fPIC
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+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)
Index: config/rs6000/t-spe
===================================================================
--- config/rs6000/t-spe (revision 193508)
+++ config/rs6000/t-spe (working copy)
@@ -71,3 +71,6 @@
mabi=altivec/mlittle \
maltivec/mlittle \
maltivec/mabi=altivec/mlittle
+
+MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file)),,v1)
+
Index: config/rs6000/t-linux
===================================================================
--- config/rs6000/t-linux (revision 0)
+++ config/rs6000/t-linux (revision 0)
@@ -0,0 +1 @@
+MULTIARCH_DIRNAME = powerpc-linux-gnu
Index: config.gcc
===================================================================
--- config.gcc (revision 193508)
+++ config.gcc (working copy)
@@ -2057,6 +2060,7 @@
;;
*)
tm_file="${tm_file} rs6000/linux.h glibc-stdint.h"
+ tmake_file="$tmake_file rs6000/t-linux"
;;
esac
case ${target} in