Browse Source

gcc: adapted patch for "pure64" builds to be usable with gcc 4.4.2

user/karasz/test/ecn
Christian Wiese 15 years ago committed by Alejandro Mery
parent
commit
e22dac2ba6
  1. 97
      base/gcc/gcc-4.4.2-pure64-1.diff

97
base/gcc/gcc-4.1.2-pure64-1.diff → base/gcc/gcc-4.4.2-pure64-1.diff

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../gcc/gcc-4.1.2-pure64-1.diff
# Copyright (C) 2009 The OpenSDE Project
# Filename: package/.../gcc/gcc-4.4.2-pure64-1.diff
# Copyright (C) 2009 - 2010 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,10 +14,10 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur gcc-4.2.4-orig/gcc/config/i386/linux64.h gcc-4.2.4/gcc/config/i386/linux64.h
--- gcc-4.2.4-orig/gcc/config/i386/linux64.h 2009-08-02 19:04:12.000000000 +0300
+++ gcc-4.2.4/gcc/config/i386/linux64.h 2009-08-02 19:47:53.000000000 +0300
@@ -48,8 +48,8 @@
diff -ruN gcc-4.4.2-orig/gcc/config/i386/linux64.h gcc-4.4.2/gcc/config/i386/linux64.h
--- gcc-4.4.2-orig/gcc/config/i386/linux64.h 2009-04-10 01:23:07.000000000 +0200
+++ gcc-4.4.2/gcc/config/i386/linux64.h 2009-12-31 11:20:50.000000000 +0100
@@ -58,8 +58,8 @@
When the -shared link option is used a final link is not being
done. */
@ -26,12 +26,12 @@ diff -Nur gcc-4.2.4-orig/gcc/config/i386/linux64.h gcc-4.2.4/gcc/config/i386/lin
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
#undef LINK_SPEC
#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
diff -Nur gcc-4.2.4-orig/gcc/config/i386/t-linux64 gcc-4.2.4/gcc/config/i386/t-linux64
--- gcc-4.2.4-orig/gcc/config/i386/t-linux64 2009-08-02 19:04:12.000000000 +0300
+++ gcc-4.2.4/gcc/config/i386/t-linux64 2009-08-02 19:48:56.000000000 +0300
@@ -13,7 +13,7 @@
#undef ASM_SPEC
#define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
diff -ruN gcc-4.4.2-orig/gcc/config/i386/t-linux64 gcc-4.4.2/gcc/config/i386/t-linux64
--- gcc-4.4.2-orig/gcc/config/i386/t-linux64 2008-07-02 17:59:19.000000000 +0200
+++ gcc-4.4.2/gcc/config/i386/t-linux64 2009-12-31 11:20:50.000000000 +0100
@@ -7,7 +7,7 @@
MULTILIB_OPTIONS = m64/m32
MULTILIB_DIRNAMES = 64 32
@ -40,12 +40,12 @@ diff -Nur gcc-4.2.4-orig/gcc/config/i386/t-linux64 gcc-4.2.4/gcc/config/i386/t-l
LIBGCC = stmp-multilib
INSTALL_LIBGCC = install-multilib
diff -Nur gcc-4.2.4-orig/gcc/config/mips/linux64.h gcc-4.2.4/gcc/config/mips/linux64.h
--- gcc-4.2.4-orig/gcc/config/mips/linux64.h 2009-08-02 19:04:12.000000000 +0300
+++ gcc-4.2.4/gcc/config/mips/linux64.h 2009-08-02 19:52:22.000000000 +0300
diff -ruN gcc-4.4.2-orig/gcc/config/mips/linux64.h gcc-4.4.2/gcc/config/mips/linux64.h
--- gcc-4.4.2-orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100
+++ gcc-4.4.2/gcc/config/mips/linux64.h 2009-12-31 11:20:50.000000000 +0100
@@ -35,9 +35,9 @@
%{!shared: %{pthread:-lpthread} \
%{profile:-lc_p} %{!profile: -lc}}"
%{!shared: \
%{profile:-lc_p} %{!profile:-lc}}"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
@ -56,9 +56,9 @@ diff -Nur gcc-4.2.4-orig/gcc/config/mips/linux64.h gcc-4.2.4/gcc/config/mips/lin
#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
#define LINUX_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
diff -Nur gcc-4.2.4-orig/gcc/config/mips/t-linux64 gcc-4.2.4/gcc/config/mips/t-linux64
--- gcc-4.2.4-orig/gcc/config/mips/t-linux64 2009-08-02 19:04:12.000000000 +0300
+++ gcc-4.2.4/gcc/config/mips/t-linux64 2009-08-02 19:53:22.000000000 +0300
diff -ruN gcc-4.4.2-orig/gcc/config/mips/t-linux64 gcc-4.4.2/gcc/config/mips/t-linux64
--- gcc-4.4.2-orig/gcc/config/mips/t-linux64 2006-06-06 14:51:24.000000000 +0200
+++ gcc-4.4.2/gcc/config/mips/t-linux64 2009-12-31 11:20:50.000000000 +0100
@@ -1,6 +1,6 @@
MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
MULTILIB_DIRNAMES = n32 32 64
@ -67,10 +67,10 @@ diff -Nur gcc-4.2.4-orig/gcc/config/mips/t-linux64 gcc-4.2.4/gcc/config/mips/t-l
EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
diff -Nur gcc-4.2.4-orig/gcc/config/rs6000/linux64.h gcc-4.2.4/gcc/config/rs6000/linux64.h
--- gcc-4.2.4-orig/gcc/config/rs6000/linux64.h 2009-08-02 19:04:12.000000000 +0300
+++ gcc-4.2.4/gcc/config/rs6000/linux64.h 2009-08-02 19:55:36.000000000 +0300
@@ -335,8 +335,8 @@
diff -ruN gcc-4.4.2-orig/gcc/config/rs6000/linux64.h gcc-4.4.2/gcc/config/rs6000/linux64.h
--- gcc-4.4.2-orig/gcc/config/rs6000/linux64.h 2009-04-10 01:23:07.000000000 +0200
+++ gcc-4.4.2/gcc/config/rs6000/linux64.h 2009-12-31 11:20:50.000000000 +0100
@@ -342,8 +342,8 @@
#undef LINK_OS_DEFAULT_SPEC
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
@ -81,9 +81,9 @@ diff -Nur gcc-4.2.4-orig/gcc/config/rs6000/linux64.h gcc-4.2.4/gcc/config/rs6000
#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
#if UCLIBC_DEFAULT
diff -Nur gcc-4.2.4-orig/gcc/config/rs6000/t-linux64 gcc-4.2.4/gcc/config/rs6000/t-linux64
--- gcc-4.2.4-orig/gcc/config/rs6000/t-linux64 2009-08-02 19:04:12.000000000 +0300
+++ gcc-4.2.4/gcc/config/rs6000/t-linux64 2009-08-02 20:07:36.000000000 +0300
diff -ruN gcc-4.4.2-orig/gcc/config/rs6000/t-linux64 gcc-4.4.2/gcc/config/rs6000/t-linux64
--- gcc-4.4.2-orig/gcc/config/rs6000/t-linux64 2007-09-27 21:56:06.000000000 +0200
+++ gcc-4.4.2/gcc/config/rs6000/t-linux64 2009-12-31 11:20:50.000000000 +0100
@@ -19,7 +19,7 @@
MULTILIB_EXTRA_OPTS = fPIC mstrict-align
MULTILIB_EXCEPTIONS = m64/msoft-float
@ -93,30 +93,23 @@ diff -Nur gcc-4.2.4-orig/gcc/config/rs6000/t-linux64 gcc-4.2.4/gcc/config/rs6000
MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
softfp_wrap_start := '\#ifndef __powerpc64__'
diff -Nur gcc-4.2.4-orig/gcc/config/sparc/linux64.h gcc-4.2.4/gcc/config/sparc/linux64.h
--- gcc-4.2.4-orig/gcc/config/sparc/linux64.h 2009-08-02 19:04:12.000000000 +0300
+++ gcc-4.2.4/gcc/config/sparc/linux64.h 2009-08-02 19:58:14.000000000 +0300
@@ -166,7 +166,7 @@
{ "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
{ "link_arch", LINK_ARCH_SPEC },
diff -ruN gcc-4.4.2-orig/gcc/config/sparc/linux64.h gcc-4.4.2/gcc/config/sparc/linux64.h
--- gcc-4.4.2-orig/gcc/config/sparc/linux64.h 2009-02-20 16:20:38.000000000 +0100
+++ gcc-4.4.2/gcc/config/sparc/linux64.h 2009-12-31 11:22:47.000000000 +0100
@@ -109,8 +109,8 @@
-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
%{!shared: \
%{!ibcs: \
%{!static: \
@@ -175,7 +175,7 @@
%{static:-static}}} \
"
/* If ELF is the default format, we should not use /lib/elf. */
-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
%{!shared: \
%{!ibcs: \
%{!static: \
diff -Nur gcc-4.2.4-orig/gcc/config/sparc/t-linux64 gcc-4.2.4/gcc/config/sparc/t-linux64
--- gcc-4.2.4-orig/gcc/config/sparc/t-linux64 2009-08-02 19:04:12.000000000 +0300
+++ gcc-4.2.4/gcc/config/sparc/t-linux64 2009-08-02 19:59:16.000000000 +0300
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
#ifdef SPARC_BI_ARCH
diff -ruN gcc-4.4.2-orig/gcc/config/sparc/t-linux64 gcc-4.4.2/gcc/config/sparc/t-linux64
--- gcc-4.4.2-orig/gcc/config/sparc/t-linux64 2006-02-08 08:19:43.000000000 +0100
+++ gcc-4.4.2/gcc/config/sparc/t-linux64 2009-12-31 11:24:07.000000000 +0100
@@ -1,6 +1,6 @@
MULTILIB_OPTIONS = m64/m32
MULTILIB_DIRNAMES = 64 32
@ -125,9 +118,3 @@ diff -Nur gcc-4.2.4-orig/gcc/config/sparc/t-linux64 gcc-4.2.4/gcc/config/sparc/t
LIBGCC = stmp-multilib
INSTALL_LIBGCC = install-multilib
@@ -10,4 +10,4 @@
CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \
-print-multi-os-directory) \
- = x../lib64; then echo -mcmodel=medany; fi`
+ = x../lib; then echo -mcmodel=medany; fi`
Loading…
Cancel
Save