1 Index: config.guess |
1 Index: config.guess |
2 diff -Nau config.guess.orig config.guess |
2 --- config.guess.orig 2011-06-06 12:34:35.000000000 +0200 |
3 --- config.guess.orig 2011-03-21 16:02:29.000000000 +0100 |
3 +++ config.guess 2012-07-21 09:15:05.000000000 +0200 |
4 +++ config.guess 2011-03-27 18:06:45.404612233 +0200 |
|
5 @@ -194,7 +194,7 @@ |
4 @@ -194,7 +194,7 @@ |
6 release='-gnu' |
5 release='-gnu' |
7 ;; |
6 ;; |
8 *) |
7 *) |
9 - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` |
8 - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` |
10 + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` |
9 + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` |
11 ;; |
10 ;; |
12 esac |
11 esac |
13 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
12 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
14 Index: gcc/config/alpha/osf5.h |
|
15 diff -Nau gcc/config/alpha/osf5.h.orig gcc/config/alpha/osf5.h |
|
16 --- gcc/config/alpha/osf5.h.orig 2010-11-21 01:54:14.000000000 +0100 |
|
17 +++ gcc/config/alpha/osf5.h 2011-03-27 18:06:45.432326155 +0200 |
|
18 @@ -94,7 +94,7 @@ |
|
19 constructor and call-frame data structures are not accidentally |
|
20 overridden. */ |
|
21 #define LINK_SPEC \ |
|
22 - "-G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \ |
|
23 + "-oldstyle_liblookup %{!o:-o a.out} -G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \ |
|
24 %{!static:%{shared:-shared -hidden_symbol _GLOBAL_*} \ |
|
25 %{!shared:-call_shared}} %{pg} %{taso} %{rpath*}" |
|
26 |
|
27 Index: gcc/config/i386/sol2-10.h |
|
28 diff -Nau gcc/config/i386/sol2-10.h.orig gcc/config/i386/sol2-10.h |
|
29 --- gcc/config/i386/sol2-10.h.orig 2011-01-26 21:23:17.000000000 +0100 |
|
30 +++ gcc/config/i386/sol2-10.h 2011-03-27 18:06:45.455032224 +0200 |
|
31 @@ -105,7 +105,7 @@ |
|
32 -R /usr/ucblib/64} \ |
|
33 %{!compat-bsd: \ |
|
34 %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64} \ |
|
35 - %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}}}" |
|
36 + %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}} -rpath-link /lib/64:/usr/lib/64}" |
|
37 |
|
38 #undef LINK_ARCH64_SPEC |
|
39 #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE |
|
40 @@ -122,7 +122,7 @@ |
|
41 #endif |
|
42 |
|
43 #define TARGET_LD_EMULATION "%{m64:-m " X86_64_EMULATION "}" \ |
|
44 - "%{!m64:-m " I386_EMULATION "} " |
|
45 + "%{!m64:} " |
|
46 #else |
|
47 #define TARGET_LD_EMULATION "" |
|
48 #endif |
|
49 Index: gcc/config/i386/sol2.h |
13 Index: gcc/config/i386/sol2.h |
50 diff -Nau gcc/config/i386/sol2.h.orig gcc/config/i386/sol2.h |
14 --- gcc/config/i386/sol2.h.orig 2011-08-01 14:14:21.000000000 +0200 |
51 --- gcc/config/i386/sol2.h.orig 2011-02-02 17:58:49.000000000 +0100 |
15 +++ gcc/config/i386/sol2.h 2012-07-21 09:15:05.000000000 +0200 |
52 +++ gcc/config/i386/sol2.h 2011-03-27 18:06:45.458713885 +0200 |
16 @@ -100,6 +100,9 @@ |
53 @@ -73,6 +73,9 @@ |
|
54 #undef ASM_QUAD |
17 #undef ASM_QUAD |
55 #endif |
18 #endif |
56 |
19 |
57 +#undef DEFAULT_PCC_STRUCT_RETURN |
20 +#undef DEFAULT_PCC_STRUCT_RETURN |
58 +#define DEFAULT_PCC_STRUCT_RETURN 1 |
21 +#define DEFAULT_PCC_STRUCT_RETURN 1 |
59 + |
22 + |
60 /* The Solaris assembler wants a .local for non-exported aliases. */ |
23 /* The Solaris assembler wants a .local for non-exported aliases. */ |
61 #define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET) \ |
24 #define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET) \ |
62 do { \ |
25 do { \ |
|
26 Index: gcc/config/sol2-bi.h |
|
27 --- gcc/config/sol2-bi.h.orig 2011-07-07 11:24:16.000000000 +0200 |
|
28 +++ gcc/config/sol2-bi.h 2012-07-21 09:31:52.000000000 +0200 |
|
29 @@ -75,7 +75,7 @@ |
|
30 %{YP,*} \ |
|
31 %{R*} \ |
|
32 %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "} \ |
|
33 - %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}}}" |
|
34 + %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}} -rpath-link %R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}" |
|
35 |
|
36 #undef LINK_ARCH64_SPEC |
|
37 #ifndef USE_GLD |
63 Index: gcc/config/sol2.h |
38 Index: gcc/config/sol2.h |
64 diff -Nau gcc/config/sol2.h.orig gcc/config/sol2.h |
39 --- gcc/config/sol2.h.orig 2011-08-18 16:47:46.000000000 +0200 |
65 --- gcc/config/sol2.h.orig 2011-01-26 21:23:17.000000000 +0100 |
40 +++ gcc/config/sol2.h 2012-07-21 09:15:05.000000000 +0200 |
66 +++ gcc/config/sol2.h 2011-03-27 18:06:45.477952967 +0200 |
41 @@ -171,8 +171,8 @@ |
67 @@ -181,8 +181,8 @@ |
|
68 "%{h*} %{v:-V} \ |
42 "%{h*} %{v:-V} \ |
69 %{!shared:%{!static:%{rdynamic: " RDYNAMIC_SPEC "}}} \ |
43 %{!shared:%{!static:%{rdynamic: " RDYNAMIC_SPEC "}}} \ |
70 %{static:-dn -Bstatic} \ |
44 %{static:-dn -Bstatic} \ |
71 - %{shared:-G -dy %{!mimpure-text:-z text}} \ |
45 - %{shared:-G -dy %{!mimpure-text:-z text}} \ |
72 - %{symbolic:-Bsymbolic -G -dy -z text} \ |
46 - %{symbolic:-Bsymbolic -G -dy -z text} \ |
73 + %{shared:-G -dy} \ |
47 + %{shared:-G -dy} \ |
74 + %{symbolic:-Bsymbolic -G -dy} \ |
48 + %{symbolic:-Bsymbolic -G -dy} \ |
75 %{pthreads|pthread|threads:" LIB_THREAD_LDFLAGS_SPEC "} \ |
49 %{pthreads|pthread|fprofile-generate*:" LIB_THREAD_LDFLAGS_SPEC "} \ |
76 %(link_arch) \ |
50 %(link_arch) \ |
77 %{Qy:} %{!Qn:-Qy}" |
51 %{Qy:} %{!Qn:-Qy}" |
78 Index: gcc/system.h |
52 Index: gcc/system.h |
79 diff -Nau gcc/system.h.orig gcc/system.h |
53 --- gcc/system.h.orig 2012-02-17 00:16:28.000000000 +0100 |
80 --- gcc/system.h.orig 2011-01-09 13:41:33.000000000 +0100 |
54 +++ gcc/system.h 2012-07-21 09:15:05.000000000 +0200 |
81 +++ gcc/system.h 2011-03-27 18:06:45.498233251 +0200 |
55 @@ -455,10 +455,6 @@ |
82 @@ -430,10 +430,6 @@ |
56 } |
83 extern char *strstr (const char *, const char *); |
|
84 #endif |
57 #endif |
85 |
58 |
86 -#ifdef HAVE_MALLOC_H |
59 -#ifdef HAVE_MALLOC_H |
87 -#include <malloc.h> |
60 -#include <malloc.h> |
88 -#endif |
61 -#endif |
89 - |
62 - |
90 #if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC |
63 #ifdef __cplusplus |
91 extern void *malloc (size_t); |
64 extern "C" { |
92 #endif |
65 #endif |
93 Index: libcpp/charset.c |
66 Index: libcpp/charset.c |
94 diff -Nau libcpp/charset.c.orig libcpp/charset.c |
|
95 --- libcpp/charset.c.orig 2011-01-03 21:52:22.000000000 +0100 |
67 --- libcpp/charset.c.orig 2011-01-03 21:52:22.000000000 +0100 |
96 +++ libcpp/charset.c 2011-03-27 18:06:45.522800310 +0200 |
68 +++ libcpp/charset.c 2012-07-21 09:15:05.000000000 +0200 |
97 @@ -75,6 +75,7 @@ |
69 @@ -75,6 +75,7 @@ |
98 #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1) |
70 #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1) |
99 #define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1) |
71 #define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1) |
100 #define iconv_close(x) (void)0 |
72 #define iconv_close(x) (void)0 |
101 +#undef ICONV_CONST |
73 +#undef ICONV_CONST |
102 #define ICONV_CONST |
74 #define ICONV_CONST |
103 #endif |
75 #endif |
104 |
76 |
105 Index: libcpp/internal.h |
77 Index: libcpp/internal.h |
106 diff -Nau libcpp/internal.h.orig libcpp/internal.h |
78 --- libcpp/internal.h.orig 2012-01-09 09:48:43.000000000 +0100 |
107 --- libcpp/internal.h.orig 2010-09-29 20:18:38.000000000 +0200 |
79 +++ libcpp/internal.h 2012-07-21 09:15:05.000000000 +0200 |
108 +++ libcpp/internal.h 2011-03-27 18:06:45.537431542 +0200 |
|
109 @@ -29,6 +29,7 @@ |
80 @@ -29,6 +29,7 @@ |
110 #if HAVE_ICONV |
81 #if HAVE_ICONV |
111 #include <iconv.h> |
82 #include <iconv.h> |
112 #else |
83 #else |
113 +#undef HAVE_ICONV |
84 +#undef HAVE_ICONV |