OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
3330 Commits
49 Branches
0 Tags
34 MiB
Tree: 763d3d69bd
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '763d3d69bd'
${ noResults }
package-nopast/base/gcc/gcc-4.1.2-multilib-1.diff

103 lines
4.6 KiB
Raw Normal View History

Included multilib patch for gcc 4.1.2 - This patch has to be applied while building a multilib target to get the right library locations we want. (lib32/lib64)
17 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. diff -ruN gcc-4.1.2/gcc/config/i386/linux64.h gcc-4.1.2-multilib/gcc/config/i386/linux64.h
  2. --- gcc-4.1.2/gcc/config/i386/linux64.h 2005-08-10 20:53:01.000000000 +0300
  3. +++ gcc-4.1.2-multilib/gcc/config/i386/linux64.h 2007-10-01 00:37:19.000000000 +0300
  4. @@ -60,7 +60,7 @@
  5. %{!shared: \
  6. %{!static: \
  7. %{rdynamic:-export-dynamic} \
  8. - %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
  9. + %{m32:%{!dynamic-linker:-dynamic-linker /lib32/ld-linux.so.2}} \
  10. %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
  11. %{static:-static}}"
  13. diff -ruN gcc-4.1.2/gcc/config/i386/t-linux64 gcc-4.1.2-multilib/gcc/config/i386/t-linux64
  14. --- gcc-4.1.2/gcc/config/i386/t-linux64 2005-08-10 20:53:01.000000000 +0300
  15. +++ gcc-4.1.2-multilib/gcc/config/i386/t-linux64 2007-10-01 00:37:40.000000000 +0300
  16. @@ -6,7 +6,7 @@
  18. MULTILIB_OPTIONS = m64/m32
  19. MULTILIB_DIRNAMES = 64 32
  20. -MULTILIB_OSDIRNAMES = ../lib64 ../lib
  21. +MULTILIB_OSDIRNAMES = ../lib64 ../lib32
  23. LIBGCC = stmp-multilib
  24. INSTALL_LIBGCC = install-multilib
  25. diff -ruN gcc-4.1.2/gcc/config/mips/linux64.h gcc-4.1.2-multilib/gcc/config/mips/linux64.h
  26. --- gcc-4.1.2/gcc/config/mips/linux64.h 2005-06-25 04:22:41.000000000 +0300
  27. +++ gcc-4.1.2-multilib/gcc/config/mips/linux64.h 2007-10-01 00:40:25.000000000 +0300
  28. @@ -47,9 +47,9 @@
  29. %{!static: \
  30. %{rdynamic:-export-dynamic} \
  31. %{!dynamic-linker: \
  32. - %{mabi=n32: -dynamic-linker /lib32/ld.so.1} \
  33. + %{mabi=n32: -dynamic-linker /lib64/ld.so.1} \
  34. %{mabi=64: -dynamic-linker /lib64/ld.so.1} \
  35. - %{mabi=32: -dynamic-linker /lib/ld.so.1}}} \
  36. + %{mabi=32: -dynamic-linker /lib32/ld.so.1}}} \
  37. %{static:-static}}} \
  38. %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32} \
  39. %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip} \
  40. diff -ruN gcc-4.1.2/gcc/config/mips/t-linux64 gcc-4.1.2-multilib/gcc/config/mips/t-linux64
  41. --- gcc-4.1.2/gcc/config/mips/t-linux64 2006-09-10 10:13:12.000000000 +0300
  42. +++ gcc-4.1.2-multilib/gcc/config/mips/t-linux64 2007-10-01 00:40:59.000000000 +0300
  43. @@ -1,6 +1,6 @@
  44. MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
  45. MULTILIB_DIRNAMES = n32 32 64
  46. -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
  47. +MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib64
  49. EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
  51. diff -ruN gcc-4.1.2/gcc/config/rs6000/linux64.h gcc-4.1.2-multilib/gcc/config/rs6000/linux64.h
  52. --- gcc-4.1.2/gcc/config/rs6000/linux64.h 2006-02-10 22:58:33.000000000 +0200
  53. +++ gcc-4.1.2-multilib/gcc/config/rs6000/linux64.h 2007-10-01 00:42:07.000000000 +0300
  54. @@ -339,7 +339,7 @@
  56. #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
  57. %{rdynamic:-export-dynamic} \
  58. - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
  59. + %{!dynamic-linker:-dynamic-linker /lib32/ld.so.1}}}"
  61. #define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
  62. %{rdynamic:-export-dynamic} \
  63. diff -ruN gcc-4.1.2/gcc/config/rs6000/t-linux64 gcc-4.1.2-multilib/gcc/config/rs6000/t-linux64
  64. --- gcc-4.1.2/gcc/config/rs6000/t-linux64 2007-10-01 00:44:58.000000000 +0300
  65. +++ gcc-4.1.2-multilib/gcc/config/rs6000/t-linux64 2007-10-01 00:43:54.000000000 +0300
  66. @@ -11,7 +11,7 @@
  67. MULTILIB_EXTRA_OPTS = fPIC mstrict-align
  68. MULTILIB_EXCEPTIONS =
  69. MULTILIB_EXCLUSIONS =
  70. -MULTILIB_OSDIRNAMES = ../lib64 ../lib
  71. +MULTILIB_OSDIRNAMES = ../lib64 ../lib32
  72. MULTILIB_MATCHES =
  74. # We want fine grained libraries, so use the new code to build the
  75. diff -ruN gcc-4.1.2/gcc/config/sparc/linux64.h gcc-4.1.2-multilib/gcc/config/sparc/linux64.h
  76. --- gcc-4.1.2/gcc/config/sparc/linux64.h 2006-02-11 10:38:51.000000000 +0200
  77. +++ gcc-4.1.2-multilib/gcc/config/sparc/linux64.h 2007-10-01 00:46:56.000000000 +0300
  78. @@ -162,12 +162,12 @@
  79. { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
  80. { "link_arch", LINK_ARCH_SPEC },
  82. -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
  83. +#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
  84. %{!shared: \
  85. %{!ibcs: \
  86. %{!static: \
  87. %{rdynamic:-export-dynamic} \
  88. - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
  89. + %{!dynamic-linker:-dynamic-linker /lib32/ld-linux.so.2}} \
  90. %{static:-static}}} \
  91. "
  93. diff -ruN gcc-4.1.2/gcc/config/sparc/t-linux64 gcc-4.1.2-multilib/gcc/config/sparc/t-linux64
  94. --- gcc-4.1.2/gcc/config/sparc/t-linux64 2004-04-01 19:05:22.000000000 +0300
  95. +++ gcc-4.1.2-multilib/gcc/config/sparc/t-linux64 2007-10-01 00:47:58.000000000 +0300
  96. @@ -1,6 +1,6 @@
  97. MULTILIB_OPTIONS = m64/m32
  98. MULTILIB_DIRNAMES = 64 32
  99. -MULTILIB_OSDIRNAMES = ../lib64 ../lib
  100. +MULTILIB_OSDIRNAMES = ../lib64 ../lib32
  102. LIBGCC = stmp-multilib
  103. INSTALL_LIBGCC = install-multilib