gcc-4.7.3-multilib-dirs.patch 1.4 KB

123456789101112131415161718192021222324
  1. diff -Nru gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/linux64.h
  2. --- gcc-4.7.3.orig/gcc/config/i386/linux64.h 2013-04-13 18:33:41.015109554 +0200
  3. +++ gcc-4.7.3/gcc/config/i386/linux64.h 2013-04-13 18:34:01.147713013 +0200
  4. @@ -28,6 +28,6 @@
  5. #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
  6. #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
  7. -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
  8. -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
  9. +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
  10. +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
  11. #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
  12. diff -Nru gcc-4.7.3.orig/gcc/config/i386/t-linux64 gcc-4.7.3/gcc/config/i386/t-linux64
  13. --- gcc-4.7.3.orig/gcc/config/i386/t-linux64 2013-04-13 18:33:41.015109554 +0200
  14. +++ gcc-4.7.3/gcc/config/i386/t-linux64 2013-04-13 18:39:13.269752565 +0200
  15. @@ -34,6 +34,6 @@
  16. comma=,
  17. MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
  18. MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
  19. -MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
  20. +MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
  21. MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
  22. MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)