diff options
| author | bergner <bergner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-15 21:22:31 +0000 |
|---|---|---|
| committer | bergner <bergner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-15 21:22:31 +0000 |
| commit | 4ea7a0bf00907ce7ea42bcd5f9f6b64df9ea1524 (patch) | |
| tree | e546c1318d5b14dd09c204287ea73a8815b7bcd8 | |
| parent | a4b63c86be8fcd3a25fa0072d38350e4bc73eaad (diff) | |
* Revert OpenSUSE patch-012-gcc4-ppc64-m32-m64-multilib-only.patch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ibm/gcc-4_3-branch@155274 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog.ibm | 4 | ||||
| -rw-r--r-- | gcc/config/rs6000/t-linux64 | 8 | ||||
| -rw-r--r-- | patches/reverted-patch-012-gcc4-ppc64-m32-m64-multilib-only.patch (renamed from patches/patch-012-gcc4-ppc64-m32-m64-multilib-only.patch) | 0 |
3 files changed, 8 insertions, 4 deletions
diff --git a/gcc/ChangeLog.ibm b/gcc/ChangeLog.ibm index 1beccc82a11..7837a07e25b 100644 --- a/gcc/ChangeLog.ibm +++ b/gcc/ChangeLog.ibm @@ -1,3 +1,7 @@ +2009-12-15 Peter Bergner <bergner@vnet.ibm.com> + + * Revert OpenSUSE patch-012-gcc4-ppc64-m32-m64-multilib-only.patch. + 2009-12-03 Peter Bergner <bergner@vnet.ibm.com> * gcc/configure.ac: Move test for dci instruction to correct location. diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 index 48950c7b79b..2a2e7b0cdc0 100644 --- a/gcc/config/rs6000/t-linux64 +++ b/gcc/config/rs6000/t-linux64 @@ -14,11 +14,11 @@ TARGET_LIBGCC2_CFLAGS += -mno-minimal-toc # 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_OPTIONS = m64/m32 msoft-float +MULTILIB_DIRNAMES = 64 32 nof MULTILIB_EXTRA_OPTS = fPIC mstrict-align -MULTILIB_EXCEPTIONS = -MULTILIB_EXCLUSIONS = +MULTILIB_EXCEPTIONS = m64/msoft-float +MULTILIB_EXCLUSIONS = m64/!m32/msoft-float MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) diff --git a/patches/patch-012-gcc4-ppc64-m32-m64-multilib-only.patch b/patches/reverted-patch-012-gcc4-ppc64-m32-m64-multilib-only.patch index ffb57b2d2c7..ffb57b2d2c7 100644 --- a/patches/patch-012-gcc4-ppc64-m32-m64-multilib-only.patch +++ b/patches/reverted-patch-012-gcc4-ppc64-m32-m64-multilib-only.patch |