gcc/gcc.patch@9dacbd1d1aa2 (annotated)
gcc/gcc.patch
Fri, 07 Sep 2012 19:08:07 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 07 Sep 2012 19:08:07 +0200
- changeset 667
- 9dacbd1d1aa2
- parent 406
- cd6aad0e0d4e
- child 771
- 7173ebcfc87e
- permissions
- -rw-r--r--
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
| michael@320 | 1 | Index: config.guess |
| michael@473 | 2 | --- config.guess.orig 2011-06-06 12:34:35.000000000 +0200 |
| michael@473 | 3 | +++ config.guess 2012-07-21 09:15:05.000000000 +0200 |
| michael@320 | 4 | @@ -194,7 +194,7 @@ |
| michael@320 | 5 | release='-gnu' |
| michael@320 | 6 | ;; |
| michael@320 | 7 | *) |
| michael@320 | 8 | - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` |
| michael@320 | 9 | + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` |
| michael@320 | 10 | ;; |
| michael@320 | 11 | esac |
| michael@320 | 12 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
| michael@320 | 13 | Index: gcc/config/i386/sol2.h |
| michael@473 | 14 | --- gcc/config/i386/sol2.h.orig 2011-08-01 14:14:21.000000000 +0200 |
| michael@473 | 15 | +++ gcc/config/i386/sol2.h 2012-07-21 09:15:05.000000000 +0200 |
| michael@473 | 16 | @@ -100,6 +100,9 @@ |
| michael@320 | 17 | #undef ASM_QUAD |
| michael@320 | 18 | #endif |
| michael@320 | 19 | |
| michael@320 | 20 | +#undef DEFAULT_PCC_STRUCT_RETURN |
| michael@320 | 21 | +#define DEFAULT_PCC_STRUCT_RETURN 1 |
| michael@320 | 22 | + |
| michael@320 | 23 | /* The Solaris assembler wants a .local for non-exported aliases. */ |
| michael@320 | 24 | #define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET) \ |
| michael@320 | 25 | do { \ |
| michael@473 | 26 | Index: gcc/config/sol2-bi.h |
| michael@473 | 27 | --- gcc/config/sol2-bi.h.orig 2011-07-07 11:24:16.000000000 +0200 |
| michael@473 | 28 | +++ gcc/config/sol2-bi.h 2012-07-21 09:31:52.000000000 +0200 |
| michael@473 | 29 | @@ -75,7 +75,7 @@ |
| michael@473 | 30 | %{YP,*} \ |
| michael@473 | 31 | %{R*} \ |
| michael@473 | 32 | %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "} \ |
| michael@473 | 33 | - %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}}}" |
| michael@473 | 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 "}" |
| michael@473 | 35 | |
| michael@473 | 36 | #undef LINK_ARCH64_SPEC |
| michael@473 | 37 | #ifndef USE_GLD |
| michael@320 | 38 | Index: gcc/config/sol2.h |
| michael@473 | 39 | --- gcc/config/sol2.h.orig 2011-08-18 16:47:46.000000000 +0200 |
| michael@473 | 40 | +++ gcc/config/sol2.h 2012-07-21 09:15:05.000000000 +0200 |
| michael@473 | 41 | @@ -171,8 +171,8 @@ |
| michael@332 | 42 | "%{h*} %{v:-V} \ |
| michael@320 | 43 | %{!shared:%{!static:%{rdynamic: " RDYNAMIC_SPEC "}}} \ |
| michael@320 | 44 | %{static:-dn -Bstatic} \ |
| michael@320 | 45 | - %{shared:-G -dy %{!mimpure-text:-z text}} \ |
| michael@320 | 46 | - %{symbolic:-Bsymbolic -G -dy -z text} \ |
| michael@320 | 47 | + %{shared:-G -dy} \ |
| michael@320 | 48 | + %{symbolic:-Bsymbolic -G -dy} \ |
| michael@473 | 49 | %{pthreads|pthread|fprofile-generate*:" LIB_THREAD_LDFLAGS_SPEC "} \ |
| michael@320 | 50 | %(link_arch) \ |
| michael@320 | 51 | %{Qy:} %{!Qn:-Qy}" |
| michael@320 | 52 | Index: gcc/system.h |
| michael@473 | 53 | --- gcc/system.h.orig 2012-02-17 00:16:28.000000000 +0100 |
| michael@473 | 54 | +++ gcc/system.h 2012-07-21 09:15:05.000000000 +0200 |
| michael@473 | 55 | @@ -455,10 +455,6 @@ |
| michael@473 | 56 | } |
| michael@320 | 57 | #endif |
| michael@320 | 58 | |
| michael@320 | 59 | -#ifdef HAVE_MALLOC_H |
| michael@320 | 60 | -#include <malloc.h> |
| michael@320 | 61 | -#endif |
| michael@320 | 62 | - |
| michael@473 | 63 | #ifdef __cplusplus |
| michael@473 | 64 | extern "C" { |
| michael@320 | 65 | #endif |
| michael@320 | 66 | Index: libcpp/charset.c |
| michael@332 | 67 | --- libcpp/charset.c.orig 2011-01-03 21:52:22.000000000 +0100 |
| michael@473 | 68 | +++ libcpp/charset.c 2012-07-21 09:15:05.000000000 +0200 |
| michael@320 | 69 | @@ -75,6 +75,7 @@ |
| michael@320 | 70 | #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1) |
| michael@320 | 71 | #define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1) |
| michael@320 | 72 | #define iconv_close(x) (void)0 |
| michael@320 | 73 | +#undef ICONV_CONST |
| michael@320 | 74 | #define ICONV_CONST |
| michael@320 | 75 | #endif |
| michael@320 | 76 | |
| michael@320 | 77 | Index: libcpp/internal.h |
| michael@473 | 78 | --- libcpp/internal.h.orig 2012-01-09 09:48:43.000000000 +0100 |
| michael@473 | 79 | +++ libcpp/internal.h 2012-07-21 09:15:05.000000000 +0200 |
| michael@320 | 80 | @@ -29,6 +29,7 @@ |
| michael@320 | 81 | #if HAVE_ICONV |
| michael@320 | 82 | #include <iconv.h> |
| michael@320 | 83 | #else |
| michael@320 | 84 | +#undef HAVE_ICONV |
| michael@320 | 85 | #define HAVE_ICONV 0 |
| michael@320 | 86 | typedef int iconv_t; /* dummy */ |
| michael@320 | 87 | #endif |
