1.1 --- a/gcc/gcc.patch Sat Aug 04 14:16:14 2012 +0200
1.2 +++ b/gcc/gcc.patch Sat Aug 04 22:02:31 2012 +0200
1.3 @@ -1,7 +1,6 @@
1.4 Index: config.guess
1.5 -diff -Nau config.guess.orig config.guess
1.6 ---- config.guess.orig 2011-03-21 16:02:29.000000000 +0100
1.7 -+++ config.guess 2011-03-27 18:06:45.404612233 +0200
1.8 +--- config.guess.orig 2011-06-06 12:34:35.000000000 +0200
1.9 ++++ config.guess 2012-07-21 09:15:05.000000000 +0200
1.10 @@ -194,7 +194,7 @@
1.11 release='-gnu'
1.12 ;;
1.13 @@ -11,46 +10,10 @@
1.14 ;;
1.15 esac
1.16 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
1.17 -Index: gcc/config/alpha/osf5.h
1.18 -diff -Nau gcc/config/alpha/osf5.h.orig gcc/config/alpha/osf5.h
1.19 ---- gcc/config/alpha/osf5.h.orig 2010-11-21 01:54:14.000000000 +0100
1.20 -+++ gcc/config/alpha/osf5.h 2011-03-27 18:06:45.432326155 +0200
1.21 -@@ -94,7 +94,7 @@
1.22 - constructor and call-frame data structures are not accidentally
1.23 - overridden. */
1.24 - #define LINK_SPEC \
1.25 -- "-G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
1.26 -+ "-oldstyle_liblookup %{!o:-o a.out} -G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
1.27 - %{!static:%{shared:-shared -hidden_symbol _GLOBAL_*} \
1.28 - %{!shared:-call_shared}} %{pg} %{taso} %{rpath*}"
1.29 -
1.30 -Index: gcc/config/i386/sol2-10.h
1.31 -diff -Nau gcc/config/i386/sol2-10.h.orig gcc/config/i386/sol2-10.h
1.32 ---- gcc/config/i386/sol2-10.h.orig 2011-01-26 21:23:17.000000000 +0100
1.33 -+++ gcc/config/i386/sol2-10.h 2011-03-27 18:06:45.455032224 +0200
1.34 -@@ -105,7 +105,7 @@
1.35 - -R /usr/ucblib/64} \
1.36 - %{!compat-bsd: \
1.37 - %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64} \
1.38 -- %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}}}"
1.39 -+ %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}} -rpath-link /lib/64:/usr/lib/64}"
1.40 -
1.41 - #undef LINK_ARCH64_SPEC
1.42 - #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE
1.43 -@@ -122,7 +122,7 @@
1.44 - #endif
1.45 -
1.46 - #define TARGET_LD_EMULATION "%{m64:-m " X86_64_EMULATION "}" \
1.47 -- "%{!m64:-m " I386_EMULATION "} "
1.48 -+ "%{!m64:} "
1.49 - #else
1.50 - #define TARGET_LD_EMULATION ""
1.51 - #endif
1.52 Index: gcc/config/i386/sol2.h
1.53 -diff -Nau gcc/config/i386/sol2.h.orig gcc/config/i386/sol2.h
1.54 ---- gcc/config/i386/sol2.h.orig 2011-02-02 17:58:49.000000000 +0100
1.55 -+++ gcc/config/i386/sol2.h 2011-03-27 18:06:45.458713885 +0200
1.56 -@@ -73,6 +73,9 @@
1.57 +--- gcc/config/i386/sol2.h.orig 2011-08-01 14:14:21.000000000 +0200
1.58 ++++ gcc/config/i386/sol2.h 2012-07-21 09:15:05.000000000 +0200
1.59 +@@ -100,6 +100,9 @@
1.60 #undef ASM_QUAD
1.61 #endif
1.62
1.63 @@ -60,11 +23,22 @@
1.64 /* The Solaris assembler wants a .local for non-exported aliases. */
1.65 #define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET) \
1.66 do { \
1.67 +Index: gcc/config/sol2-bi.h
1.68 +--- gcc/config/sol2-bi.h.orig 2011-07-07 11:24:16.000000000 +0200
1.69 ++++ gcc/config/sol2-bi.h 2012-07-21 09:31:52.000000000 +0200
1.70 +@@ -75,7 +75,7 @@
1.71 + %{YP,*} \
1.72 + %{R*} \
1.73 + %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "} \
1.74 +- %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}}}"
1.75 ++ %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}} -rpath-link %R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}"
1.76 +
1.77 + #undef LINK_ARCH64_SPEC
1.78 + #ifndef USE_GLD
1.79 Index: gcc/config/sol2.h
1.80 -diff -Nau gcc/config/sol2.h.orig gcc/config/sol2.h
1.81 ---- gcc/config/sol2.h.orig 2011-01-26 21:23:17.000000000 +0100
1.82 -+++ gcc/config/sol2.h 2011-03-27 18:06:45.477952967 +0200
1.83 -@@ -181,8 +181,8 @@
1.84 +--- gcc/config/sol2.h.orig 2011-08-18 16:47:46.000000000 +0200
1.85 ++++ gcc/config/sol2.h 2012-07-21 09:15:05.000000000 +0200
1.86 +@@ -171,8 +171,8 @@
1.87 "%{h*} %{v:-V} \
1.88 %{!shared:%{!static:%{rdynamic: " RDYNAMIC_SPEC "}}} \
1.89 %{static:-dn -Bstatic} \
1.90 @@ -72,28 +46,26 @@
1.91 - %{symbolic:-Bsymbolic -G -dy -z text} \
1.92 + %{shared:-G -dy} \
1.93 + %{symbolic:-Bsymbolic -G -dy} \
1.94 - %{pthreads|pthread|threads:" LIB_THREAD_LDFLAGS_SPEC "} \
1.95 + %{pthreads|pthread|fprofile-generate*:" LIB_THREAD_LDFLAGS_SPEC "} \
1.96 %(link_arch) \
1.97 %{Qy:} %{!Qn:-Qy}"
1.98 Index: gcc/system.h
1.99 -diff -Nau gcc/system.h.orig gcc/system.h
1.100 ---- gcc/system.h.orig 2011-01-09 13:41:33.000000000 +0100
1.101 -+++ gcc/system.h 2011-03-27 18:06:45.498233251 +0200
1.102 -@@ -430,10 +430,6 @@
1.103 - extern char *strstr (const char *, const char *);
1.104 +--- gcc/system.h.orig 2012-02-17 00:16:28.000000000 +0100
1.105 ++++ gcc/system.h 2012-07-21 09:15:05.000000000 +0200
1.106 +@@ -455,10 +455,6 @@
1.107 + }
1.108 #endif
1.109
1.110 -#ifdef HAVE_MALLOC_H
1.111 -#include <malloc.h>
1.112 -#endif
1.113 -
1.114 - #if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
1.115 - extern void *malloc (size_t);
1.116 + #ifdef __cplusplus
1.117 + extern "C" {
1.118 #endif
1.119 Index: libcpp/charset.c
1.120 -diff -Nau libcpp/charset.c.orig libcpp/charset.c
1.121 --- libcpp/charset.c.orig 2011-01-03 21:52:22.000000000 +0100
1.122 -+++ libcpp/charset.c 2011-03-27 18:06:45.522800310 +0200
1.123 ++++ libcpp/charset.c 2012-07-21 09:15:05.000000000 +0200
1.124 @@ -75,6 +75,7 @@
1.125 #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1)
1.126 #define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1)
1.127 @@ -103,9 +75,8 @@
1.128 #endif
1.129
1.130 Index: libcpp/internal.h
1.131 -diff -Nau libcpp/internal.h.orig libcpp/internal.h
1.132 ---- libcpp/internal.h.orig 2010-09-29 20:18:38.000000000 +0200
1.133 -+++ libcpp/internal.h 2011-03-27 18:06:45.537431542 +0200
1.134 +--- libcpp/internal.h.orig 2012-01-09 09:48:43.000000000 +0100
1.135 ++++ libcpp/internal.h 2012-07-21 09:15:05.000000000 +0200
1.136 @@ -29,6 +29,7 @@
1.137 #if HAVE_ICONV
1.138 #include <iconv.h>
