diff options
| author | Matthias Klose <doko@ubuntu.com> | 2010-10-04 16:51:59 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2010-10-04 16:51:59 +0000 |
| commit | 6fda54ac811711b69895fde176881d26ec229d32 (patch) | |
| tree | 497140ae3db1671b3aecda32be674d18b18ac198 /gcc | |
| parent | b95ca5135eb61adb45e38d837808418ed9334b88 (diff) | |
| download | gcc-6fda54ac811711b69895fde176881d26ec229d32.zip gcc-6fda54ac811711b69895fde176881d26ec229d32.tar.gz gcc-6fda54ac811711b69895fde176881d26ec229d32.tar.bz2 | |
t-linux64 (MULTILIB_OSDIRNAMES): Use ../lib32 as the multilib osdirname if it exists.
2010-10-04 Matthias Klose <doko@ubuntu.com>
* config/sparc/t-linux64 (MULTILIB_OSDIRNAMES): Use ../lib32 as the
multilib osdirname if it exists.
* config/s390/t-linux64 (MULTILIB_OSDIRNAMES): Likewise.
From-SVN: r164947
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/s390/t-linux64 | 9 | ||||
| -rw-r--r-- | gcc/config/sparc/t-linux64 | 9 |
3 files changed, 22 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 147fdd1..98a614a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-10-04 Matthias Klose <doko@ubuntu.com> + + * config/sparc/t-linux64 (MULTILIB_OSDIRNAMES): Use ../lib32 as the + multilib osdirname if it exists. + * config/s390/t-linux64 (MULTILIB_OSDIRNAMES): Likewise. + 2010-10-04 Jakub Jelinek <jakub@redhat.com> PR middle-end/45876 diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64 index 36aced0..ede76a2 100644 --- a/gcc/config/s390/t-linux64 +++ b/gcc/config/s390/t-linux64 @@ -1,3 +1,10 @@ +# On Debian, Ubuntu and other derivative distributions, the 32bit libraries +# are found in /lib32 and /usr/lib32, /lib64 and /usr/lib64 are symlinks to +# /lib and /usr/lib, while other distributions install libraries into /lib64 +# and /usr/lib64. The LSB does not enforce the use of /lib64 and /usr/lib64, +# 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/m31 MULTILIB_DIRNAMES = 64 32 -MULTILIB_OSDIRNAMES = ../lib64 ../lib +MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) diff --git a/gcc/config/sparc/t-linux64 b/gcc/config/sparc/t-linux64 index 67acb7e..97c28ba 100644 --- a/gcc/config/sparc/t-linux64 +++ b/gcc/config/sparc/t-linux64 @@ -17,9 +17,16 @@ # along with GCC; see the file COPYING3. If not see # <http://www.gnu.org/licenses/>. +# On Debian, Ubuntu and other derivative distributions, the 32bit libraries +# are found in /lib32 and /usr/lib32, /lib64 and /usr/lib64 are symlinks to +# /lib and /usr/lib, while other distributions install libraries into /lib64 +# and /usr/lib64. The LSB does not enforce the use of /lib64 and /usr/lib64, +# 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_OSDIRNAMES = ../lib64 ../lib +MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib |