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.

122 lines
5.7 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../gcc/gcc-4.1.2-multilib-1.diff
  5. # Copyright (C) 2009 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. diff -Nur gcc-4.2.4-orig/gcc/config/i386/linux64.h gcc-4.2.4/gcc/config/i386/linux64.h
  17. --- gcc-4.2.4-orig/gcc/config/i386/linux64.h 2009-08-03 13:27:06.000000000 +0300
  18. +++ gcc-4.2.4/gcc/config/i386/linux64.h 2009-08-03 13:28:22.000000000 +0300
  19. @@ -48,7 +48,7 @@
  20. When the -shared link option is used a final link is not being
  21. done. */
  22. -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
  23. +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
  24. #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
  25. #undef LINK_SPEC
  26. diff -Nur gcc-4.2.4-orig/gcc/config/i386/t-linux64 gcc-4.2.4/gcc/config/i386/t-linux64
  27. --- gcc-4.2.4-orig/gcc/config/i386/t-linux64 2009-08-03 13:27:06.000000000 +0300
  28. +++ gcc-4.2.4/gcc/config/i386/t-linux64 2009-08-03 13:28:54.000000000 +0300
  29. @@ -13,7 +13,7 @@
  30. MULTILIB_OPTIONS = m64/m32
  31. MULTILIB_DIRNAMES = 64 32
  32. -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
  33. +MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)
  34. LIBGCC = stmp-multilib
  35. INSTALL_LIBGCC = install-multilib
  36. diff -Nur gcc-4.2.4-orig/gcc/config/mips/linux64.h gcc-4.2.4/gcc/config/mips/linux64.h
  37. --- gcc-4.2.4-orig/gcc/config/mips/linux64.h 2009-08-03 13:27:06.000000000 +0300
  38. +++ gcc-4.2.4/gcc/config/mips/linux64.h 2009-08-03 13:29:52.000000000 +0300
  39. @@ -35,9 +35,9 @@
  40. %{!shared: %{pthread:-lpthread} \
  41. %{profile:-lc_p} %{!profile: -lc}}"
  42. -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
  43. +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
  44. #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
  45. -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
  46. +#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
  47. #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
  48. #define LINUX_DYNAMIC_LINKERN32 \
  49. CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
  50. diff -Nur gcc-4.2.4-orig/gcc/config/mips/t-linux64 gcc-4.2.4/gcc/config/mips/t-linux64
  51. --- gcc-4.2.4-orig/gcc/config/mips/t-linux64 2009-08-03 13:27:06.000000000 +0300
  52. +++ gcc-4.2.4/gcc/config/mips/t-linux64 2009-08-03 13:30:25.000000000 +0300
  53. @@ -1,6 +1,6 @@
  54. MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
  55. MULTILIB_DIRNAMES = n32 32 64
  56. -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
  57. +MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib64
  58. EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
  59. diff -Nur gcc-4.2.4-orig/gcc/config/rs6000/linux64.h gcc-4.2.4/gcc/config/rs6000/linux64.h
  60. --- gcc-4.2.4-orig/gcc/config/rs6000/linux64.h 2009-08-03 13:27:06.000000000 +0300
  61. +++ gcc-4.2.4/gcc/config/rs6000/linux64.h 2009-08-03 13:31:28.000000000 +0300
  62. @@ -335,7 +335,7 @@
  63. #undef LINK_OS_DEFAULT_SPEC
  64. #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
  65. -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
  66. +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
  67. #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
  68. #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
  69. #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
  70. diff -Nur gcc-4.2.4-orig/gcc/config/rs6000/t-linux64 gcc-4.2.4/gcc/config/rs6000/t-linux64
  71. --- gcc-4.2.4-orig/gcc/config/rs6000/t-linux64 2009-08-03 13:27:06.000000000 +0300
  72. +++ gcc-4.2.4/gcc/config/rs6000/t-linux64 2009-08-03 13:31:46.000000000 +0300
  73. @@ -19,7 +19,7 @@
  74. MULTILIB_EXTRA_OPTS = fPIC mstrict-align
  75. MULTILIB_EXCEPTIONS = m64/msoft-float
  76. MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
  77. -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
  78. +MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32) nof
  79. MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
  80. softfp_wrap_start := '\#ifndef __powerpc64__'
  81. diff -Nur gcc-4.2.4-orig/gcc/config/sparc/linux64.h gcc-4.2.4/gcc/config/sparc/linux64.h
  82. --- gcc-4.2.4-orig/gcc/config/sparc/linux64.h 2009-08-03 13:27:06.000000000 +0300
  83. +++ gcc-4.2.4/gcc/config/sparc/linux64.h 2009-08-03 13:32:39.000000000 +0300
  84. @@ -143,7 +143,7 @@
  85. /* If ELF is the default format, we should not use /lib/elf. */
  86. -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
  87. +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
  88. #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
  89. #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
  90. #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
  91. @@ -166,7 +166,7 @@
  92. { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
  93. { "link_arch", LINK_ARCH_SPEC },
  94. -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
  95. +#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
  96. %{!shared: \
  97. %{!ibcs: \
  98. %{!static: \
  99. diff -Nur gcc-4.2.4-orig/gcc/config/sparc/t-linux64 gcc-4.2.4/gcc/config/sparc/t-linux64
  100. --- gcc-4.2.4-orig/gcc/config/sparc/t-linux64 2009-08-03 13:27:06.000000000 +0300
  101. +++ gcc-4.2.4/gcc/config/sparc/t-linux64 2009-08-03 13:32:55.000000000 +0300
  102. @@ -1,6 +1,6 @@
  103. MULTILIB_OPTIONS = m64/m32
  104. MULTILIB_DIRNAMES = 64 32
  105. -MULTILIB_OSDIRNAMES = ../lib64 ../lib
  106. +MULTILIB_OSDIRNAMES = ../lib64 ../lib32
  107. LIBGCC = stmp-multilib
  108. INSTALL_LIBGCC = install-multilib