Hi, I checked in this patch to rename config/i386/t-linuxx32 to config/i386/t-linux-x32.
H.J. commit 60e43edbb2ff0a35c9a7d8c6b0dd99944ad0a408 Author: H.J. Lu <hjl.to...@gmail.com> Date: Mon Jun 6 18:02:47 2011 -0700 Rename config/i386/t-linuxx32 to config/i386/t-linux-x32. diff --git a/gcc/ChangeLog.x32 b/gcc/ChangeLog.x32 index 8c52f9d..06d931a 100644 --- a/gcc/ChangeLog.x32 +++ b/gcc/ChangeLog.x32 @@ -1,3 +1,10 @@ +2011-06-06 H.J. Lu <hongjiu...@intel.com> + + * config.gcc: Replace i386/t-linuxx32 with i386/t-linux-x32. + + * config/i386/t-linuxx32: Renamed to ... + * config/i386/t-linux-x32: This. + 2011-06-05 H.J. Lu <hongjiu...@intel.com> * doc/invoke.texi: Document -mx32. diff --git a/gcc/config.gcc b/gcc/config.gcc index 24b4a57..678909c 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1234,7 +1234,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i tm_defines="${tm_defines} TARGET_BI_ARCH=1" case x${enable_x32}${enable_ia32} in xyesyes) - tmake_file="${tmake_file} i386/t-linuxx32" + tmake_file="${tmake_file} i386/t-linux-x32" ;; xyesno) tmake_file="${tmake_file} i386/t-linux64-x32" @@ -1282,7 +1282,7 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu) esac case x${enable_x32}${enable_ia32} in xyesyes) - tmake_file="${tmake_file} i386/t-linuxx32" + tmake_file="${tmake_file} i386/t-linux-x32" ;; xyesno) tmake_file="${tmake_file} i386/t-linux64-x32" diff --git a/gcc/config/i386/t-linux-x32 b/gcc/config/i386/t-linux-x32 new file mode 100644 index 0000000..92acf91 --- /dev/null +++ b/gcc/config/i386/t-linux-x32 @@ -0,0 +1,42 @@ +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# This file is part of GCC. +# +# GCC is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GCC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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. + +# To support i386, x86-64 and x32 libraries, the directory structrue +# should be: +# +# /lib has i386 libraries. +# /lib64 has x86-64 libraries. +# /libx32 has x32 libraries. +# +MULTILIB_OPTIONS = m64/m32/mx32 +MULTILIB_DIRNAMES = 64 32 x32 +MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ../libx32 + +LIBGCC = stmp-multilib +INSTALL_LIBGCC = install-multilib + +EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o \ + crtbeginT.o crtprec32.o crtprec64.o crtprec80.o \ + crtfastmath.o diff --git a/gcc/config/i386/t-linuxx32 b/gcc/config/i386/t-linuxx32 deleted file mode 100644 index 92acf91..0000000 --- a/gcc/config/i386/t-linuxx32 +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (C) 2011 Free Software Foundation, Inc. -# -# This file is part of GCC. -# -# GCC is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GCC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# 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. - -# To support i386, x86-64 and x32 libraries, the directory structrue -# should be: -# -# /lib has i386 libraries. -# /lib64 has x86-64 libraries. -# /libx32 has x32 libraries. -# -MULTILIB_OPTIONS = m64/m32/mx32 -MULTILIB_DIRNAMES = 64 32 x32 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ../libx32 - -LIBGCC = stmp-multilib -INSTALL_LIBGCC = install-multilib - -EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o \ - crtbeginT.o crtprec32.o crtprec64.o crtprec80.o \ - crtfastmath.o