no-lib64.patch 2.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. diff -Nur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
  2. --- gcc-4.4.0.orig/gcc/config/i386/linux64.h 2009-04-10 01:23:07.000000000 +0200
  3. +++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-06-19 15:43:10.419891589 +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.so.2"
  9. #undef ASM_SPEC
  10. #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
  11. diff -Nur gcc-4.4.0.orig/gcc/config/i386/t-linux64 gcc-4.4.0/gcc/config/i386/t-linux64
  12. --- gcc-4.4.0.orig/gcc/config/i386/t-linux64 2008-07-02 17:59:19.000000000 +0200
  13. +++ gcc-4.4.0/gcc/config/i386/t-linux64 2009-06-19 15:43:10.419891589 +0200
  14. @@ -7,7 +7,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.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h
  22. --- gcc-4.4.0.orig/gcc/config/linux.h 2009-04-10 01:23:07.000000000 +0200
  23. +++ gcc-4.4.0/gcc/config/linux.h 2009-06-19 15:42:51.508828335 +0200
  24. @@ -119,7 +119,7 @@
  25. supporting both 32-bit and 64-bit compilation. */
  26. #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
  27. #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
  28. -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
  29. +#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld-uClibc.so.0"
  30. #define LINUX_DYNAMIC_LINKER \
  31. CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
  32. #define LINUX_DYNAMIC_LINKER32 \
  33. diff -Nur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h
  34. --- gcc-4.4.0.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100
  35. +++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-06-19 15:43:10.419891589 +0200
  36. @@ -36,7 +36,7 @@
  37. %{profile:-lc_p} %{!profile:-lc}}"
  38. #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
  39. -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
  40. +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
  41. #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
  42. #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
  43. #define LINUX_DYNAMIC_LINKERN32 \
  44. diff -Nur gcc-4.4.0.orig/gcc/config/mips/t-linux64 gcc-4.4.0/gcc/config/mips/t-linux64
  45. --- gcc-4.4.0.orig/gcc/config/mips/t-linux64 2006-06-06 14:51:24.000000000 +0200
  46. +++ gcc-4.4.0/gcc/config/mips/t-linux64 2009-06-19 15:43:10.419891589 +0200
  47. @@ -1,6 +1,6 @@
  48. MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
  49. MULTILIB_DIRNAMES = n32 32 64
  50. -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
  51. +MULTILIB_OSDIRNAMES = ../lib ../lib ../lib
  52. EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o