no-lib64.patch 4.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100
  1. diff -Nur gcc-4.6.3.orig/gcc/config/i386/linux64.h gcc-4.6.3/gcc/config/i386/linux64.h
  2. --- gcc-4.6.3.orig/gcc/config/i386/linux64.h 2011-09-08 11:12:35.000000000 +0200
  3. +++ gcc-4.6.3/gcc/config/i386/linux64.h 2012-03-21 13:30:49.125903065 +0100
  4. @@ -63,7 +63,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.6.3.orig/gcc/config/i386/t-linux64 gcc-4.6.3/gcc/config/i386/t-linux64
  12. --- gcc-4.6.3.orig/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200
  13. +++ gcc-4.6.3/gcc/config/i386/t-linux64 2012-03-21 13:30:49.125903065 +0100
  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.6.3.orig/gcc/config/mips/linux64.h gcc-4.6.3/gcc/config/mips/linux64.h
  22. --- gcc-4.6.3.orig/gcc/config/mips/linux64.h 2011-01-19 21:39:09.000000000 +0100
  23. +++ gcc-4.6.3/gcc/config/mips/linux64.h 2012-03-21 13:31:26.549903066 +0100
  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 BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
  34. #define LINUX_DYNAMIC_LINKERN32 \
  35. CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
  36. diff -Nur gcc-4.6.3.orig/gcc/config/mips/t-linux64 gcc-4.6.3/gcc/config/mips/t-linux64
  37. --- gcc-4.6.3.orig/gcc/config/mips/t-linux64 2009-04-21 21:03:23.000000000 +0200
  38. +++ gcc-4.6.3/gcc/config/mips/t-linux64 2012-03-21 13:30:51.685903041 +0100
  39. @@ -18,7 +18,7 @@
  40. MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
  41. MULTILIB_DIRNAMES = n32 32 64
  42. -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
  43. +MULTILIB_OSDIRNAMES = ../lib ../lib ../lib
  44. EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
  45. diff -Nur gcc-4.6.3.orig/gcc/config/rs6000/linux64.h gcc-4.6.3/gcc/config/rs6000/linux64.h
  46. --- gcc-4.6.3.orig/gcc/config/rs6000/linux64.h 2011-03-07 08:50:23.000000000 +0100
  47. +++ gcc-4.6.3/gcc/config/rs6000/linux64.h 2012-03-21 13:30:51.685903041 +0100
  48. @@ -373,7 +373,7 @@
  49. #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
  50. #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
  51. -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
  52. +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
  53. #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
  54. #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
  55. #if DEFAULT_LIBC == LIBC_UCLIBC
  56. diff -Nur gcc-4.6.3.orig/gcc/config/rs6000/t-linux64 gcc-4.6.3/gcc/config/rs6000/t-linux64
  57. --- gcc-4.6.3.orig/gcc/config/rs6000/t-linux64 2009-04-21 21:03:23.000000000 +0200
  58. +++ gcc-4.6.3/gcc/config/rs6000/t-linux64 2012-03-21 13:30:51.685903041 +0100
  59. @@ -36,7 +36,7 @@
  60. MULTILIB_EXTRA_OPTS = fPIC mstrict-align
  61. MULTILIB_EXCEPTIONS = m64/msoft-float
  62. MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
  63. -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
  64. +MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
  65. MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
  66. softfp_wrap_start := '\#ifndef __powerpc64__'
  67. diff -Nur gcc-4.6.3.orig/gcc/config/sparc/linux64.h gcc-4.6.3/gcc/config/sparc/linux64.h
  68. --- gcc-4.6.3.orig/gcc/config/sparc/linux64.h 2011-09-08 11:12:35.000000000 +0200
  69. +++ gcc-4.6.3/gcc/config/sparc/linux64.h 2012-03-21 13:30:51.685903041 +0100
  70. @@ -102,7 +102,7 @@
  71. done. */
  72. #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
  73. -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
  74. +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
  75. #ifdef SPARC_BI_ARCH
  76. diff -Nur gcc-4.6.3.orig/gcc/config/sparc/t-linux64 gcc-4.6.3/gcc/config/sparc/t-linux64
  77. --- gcc-4.6.3.orig/gcc/config/sparc/t-linux64 2011-05-22 22:03:43.000000000 +0200
  78. +++ gcc-4.6.3/gcc/config/sparc/t-linux64 2012-03-21 13:30:51.685903041 +0100
  79. @@ -26,7 +26,7 @@
  80. MULTILIB_OPTIONS = m64/m32
  81. MULTILIB_DIRNAMES = 64 32
  82. -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
  83. +MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
  84. LIBGCC = stmp-multilib
  85. INSTALL_LIBGCC = install-multilib