no-lib64.patch 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. diff -Nur gcc-4.5.2.orig/gcc/config/i386/linux64.h gcc-4.5.2/gcc/config/i386/linux64.h
  2. --- gcc-4.5.2.orig/gcc/config/i386/linux64.h 2010-03-24 21:44:48.000000000 +0100
  3. +++ gcc-4.5.2/gcc/config/i386/linux64.h 2011-04-23 22:49:31.087660410 +0200
  4. @@ -59,7 +59,7 @@
  5. done. */
  6. #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
  7. -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
  8. +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
  9. #if TARGET_64BIT_DEFAULT
  10. #define SPEC_32 "m32"
  11. diff -Nur gcc-4.5.2.orig/gcc/config/i386/t-linux64 gcc-4.5.2/gcc/config/i386/t-linux64
  12. --- gcc-4.5.2.orig/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200
  13. +++ gcc-4.5.2/gcc/config/i386/t-linux64 2011-04-23 22:49:31.107660436 +0200
  14. @@ -25,7 +25,7 @@
  15. MULTILIB_OPTIONS = m64/m32
  16. MULTILIB_DIRNAMES = 64 32
  17. -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
  18. +MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
  19. LIBGCC = stmp-multilib
  20. INSTALL_LIBGCC = install-multilib
  21. diff -Nur gcc-4.5.2.orig/gcc/config/mips/linux64.h gcc-4.5.2/gcc/config/mips/linux64.h
  22. --- gcc-4.5.2.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100
  23. +++ gcc-4.5.2/gcc/config/mips/linux64.h 2011-04-23 22:50:17.267672629 +0200
  24. @@ -36,9 +36,9 @@
  25. %{profile:-lc_p} %{!profile:-lc}}"
  26. #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
  27. -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
  28. -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
  29. -#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
  30. +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
  31. +#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1"
  32. +#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0"
  33. #define LINUX_DYNAMIC_LINKERN32 \
  34. CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
  35. diff -Nur gcc-4.5.2.orig/gcc/config/mips/t-linux64 gcc-4.5.2/gcc/config/mips/t-linux64
  36. --- gcc-4.5.2.orig/gcc/config/mips/t-linux64 2009-04-21 21:03:23.000000000 +0200
  37. +++ gcc-4.5.2/gcc/config/mips/t-linux64 2011-04-23 22:49:31.207663770 +0200
  38. @@ -18,7 +18,7 @@
  39. MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
  40. MULTILIB_DIRNAMES = n32 32 64
  41. -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
  42. +MULTILIB_OSDIRNAMES = ../lib ../lib ../lib
  43. EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o