patches/glibc/2.9/100-ssp-compat.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Apr 19 16:17:11 2009 +0000 (2009-04-19)
branchnewlib
changeset 1365 c4d124ed9f8e
permissions -rw-r--r--
Update the newlib devel branch with stuf from /trunk.

-------- diffstat follows --------
/devel/newlib/configure | 8 4 4 0
/devel/newlib/scripts/build/kernel/linux.sh | 2 1 1 0
/devel/newlib/scripts/build/cc/gcc.sh | 34 22 12 0 +
/devel/newlib/scripts/build/debug/300-gdb.sh | 52 45 7 0 +
/devel/newlib/scripts/build/libc/uClibc.sh | 6 3 3 0
/devel/newlib/scripts/build/mpfr.sh | 2 1 1 0
/devel/newlib/scripts/crosstool-NG.sh.in | 20 18 2 0 +
/devel/newlib/scripts/functions | 44 34 10 0 +
/devel/newlib/patches/glibc/2_9/500-ppc-glibc-2.9-atomic.patch | 414 0 414 0 ----------
/devel/newlib/patches/glibc/2_9/140-regex-BZ9697.patch | 111 0 111 0 ---
/devel/newlib/patches/glibc/2_9/190-queue-header-updates.patch | 89 0 89 0 --
/devel/newlib/patches/glibc/2_9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch | 249 0 249 0 ------
/devel/newlib/patches/glibc/2_9/450-alpha-glibc-2.5-no-page-header.patch | 32 0 32 0 -
/devel/newlib/patches/glibc/2_9/330-2.3.3-china.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/270-ldbl-nexttowardf.patch | 68 0 68 0 --
/devel/newlib/patches/glibc/2_9/410-2.9-fnmatch.patch | 64 0 64 0 --
/devel/newlib/patches/glibc/2_9/340-new-valencian-locale.patch | 120 0 120 0 ---
/devel/newlib/patches/glibc/2_9/350-2.4-undefine-__i686.patch | 47 0 47 0 -
/devel/newlib/patches/glibc/2_9/160-i386-x86_64-revert-clone-cfi.patch | 53 0 53 0 -
/devel/newlib/patches/glibc/2_9/150-regex-BZ697.patch | 28 0 28 0 -
/devel/newlib/patches/glibc/2_9/420-dont-build-timezone.patch | 19 0 19 0 -
/devel/newlib/patches/glibc/2_9/290-no-inline-gmon.patch | 38 0 38 0 -
/devel/newlib/patches/glibc/2_9/280-section-comments.patch | 29 0 29 0 -
/devel/newlib/patches/glibc/2_9/180-math-tests.patch | 72 0 72 0 --
/devel/newlib/patches/glibc/2_9/250-resolv-dynamic.patch | 44 0 44 0 -
/devel/newlib/patches/glibc/2_9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/300-2.9-check_native-headers.patch | 22 0 22 0 -
/devel/newlib/patches/glibc/2_9/130-add_prio-macros.patch | 26 0 26 0 -
/devel/newlib/patches/glibc/2_9/310-2.3.6-fix-pr631.patch | 50 0 50 0 -
/devel/newlib/patches/glibc/2_9/510-sh-no-asm-user-header.patch | 70 0 70 0 --
/devel/newlib/patches/glibc/2_9/260-fadvise64_64.patch | 30 0 30 0 -
/devel/newlib/patches/glibc/2_9/440-alpha-glibc-2.4-xstat.patch | 249 0 249 0 ------
/devel/newlib/patches/glibc/2_9/170-2.10-dns-no-gethostbyname4.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/230-2.3.3-localedef-fix-trampoline.patch | 74 0 74 0 --
/devel/newlib/patches/glibc/2_9/480-alpha-glibc-2.8-cache-shape.patch | 18 0 18 0 -
/devel/newlib/patches/glibc/2_9/360-2.8-nscd-one-fork.patch | 45 0 45 0 -
/devel/newlib/patches/glibc/2_9/210-2.9-strlen-hack.patch | 109 0 109 0 ---
/devel/newlib/patches/glibc/2_9/320-2.9-assume-pipe2.patch | 59 0 59 0 -
/devel/newlib/patches/glibc/2_9/100-ssp-compat.patch | 193 0 193 0 -----
/devel/newlib/patches/glibc/2_9/110-respect-env-CPPFLAGS.patch | 30 0 30 0 -
/devel/newlib/patches/glibc/2_9/220-manual-no-perl.patch | 29 0 29 0 -
/devel/newlib/patches/glibc/2_9/390-2.3.3_pre20040117-pt_pax.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/460-alpha-glibc-2.5-no-asm-elf-header.patch | 38 0 38 0 -
/devel/newlib/patches/glibc/2_9/400-tests-sandbox-libdl-paths.patch | 198 0 198 0 -----
/devel/newlib/patches/glibc/2_9/520-sh-no-asm-elf-header.patch | 27 0 27 0 -
/devel/newlib/patches/glibc/2_9/240-i386-LOAD_PIC_REG.patch | 23 0 23 0 -
/devel/newlib/patches/glibc/2_9/200-awk-in-C-locale.patch | 23 0 23 0 -
/devel/newlib/patches/glibc/2_9/430-2.7-cross-compile-nptl.patch | 57 0 57 0 -
/devel/newlib/patches/glibc/2_9/380-2.3.6-dl_execstack-PaX-support.patch | 71 0 71 0 --
/devel/newlib/patches/glibc/2_9/490-ptr-mangling.patch | 114 0 114 0 ---
/devel/newlib/patches/glibc/2_9/470-alpha-glibc-2.8-creat.patch | 19 0 19 0 -
/devel/newlib/patches/glibc/ports-2_9/100-arm_linux_tls.patch | 14 0 14 0 -
/devel/newlib/patches/uClibc/0.9.30.1/140-gnu89-inline.patch | 2 1 1 0
/devel/newlib/docs/known-issues.txt | 16 15 1 0 +
/devel/newlib/docs/overview.txt | 2 1 1 0
/devel/newlib/samples/armeb-unknown-linux-uclibc/uClibc-0.9.30.config | 243 0 243 0 ------
/devel/newlib/samples/armeb-unknown-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/sh4-unknown-linux-gnu/crosstool.config | 35 18 17 0 +
/devel/newlib/samples/x86_64-unknown-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/arm-unknown-elf/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/armeb-unknown-eabi/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/arm-unknown-linux-gnueabi/crosstool.config | 113 73 40 0 +--
/devel/newlib/samples/ia64-unknown-linux-gnu/crosstool.config | 91 61 30 0 +-
/devel/newlib/samples/x86_64-unknown-linux-uclibc/uClibc-0.9.30.config | 245 0 245 0 ------
/devel/newlib/samples/x86_64-unknown-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/armeb-unknown-linux-gnueabi/crosstool.config | 105 69 36 0 +--
/devel/newlib/samples/powerpc-e500v2-linux-gnuspe/crosstool.config | 96 63 33 0 +-
/devel/newlib/samples/i686-nptl-linux-gnu/crosstool.config | 78 48 30 0 +-
/devel/newlib/samples/arm-unknown-linux-gnu/crosstool.config | 105 69 36 0 +--
/devel/newlib/samples/powerpc-unknown-linux-gnu/crosstool.config | 103 67 36 0 +-
/devel/newlib/samples/mips-unknown-linux-uclibc/uClibc-0.9.30.config | 254 0 254 0 ------
/devel/newlib/samples/mips-unknown-linux-uclibc/crosstool.config | 77 54 23 0 +-
/devel/newlib/samples/arm-unknown-linux-uclibcgnueabi/uClibc-0.9.30.config | 253 0 253 0 ------
/devel/newlib/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/arm-iphone-linux-gnueabi/crosstool.config | 84 57 27 0 +-
/devel/newlib/samples/armeb-unknown-linux-gnu/crosstool.config | 105 69 36 0 +--
/devel/newlib/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/i586-geode-linux-uclibc/uClibc-0.9.30.config | 263 0 263 0 ------
/devel/newlib/samples/i586-geode-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/arm-unknown-linux-uclibc/uClibc-0.9.30.config | 253 0 253 0 ------
/devel/newlib/samples/arm-unknown-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/powerpc-unknown-linux-uclibc/uClibc-0.9.30.config | 248 0 248 0 ------
/devel/newlib/samples/powerpc-unknown-linux-uclibc/crosstool.config | 77 54 23 0 +-
/devel/newlib/samples/mips-unknown-elf/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/powerpc-405-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config | 26 13 13 0
/devel/newlib/samples/arm-unknown-eabi/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/mipsel-unknown-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/powerpc64-unknown-linux-gnu/crosstool.config | 75 49 26 0 +-
/devel/newlib/samples/alphaev56-unknown-linux-gnu/crosstool.config | 94 63 31 0 +-
/devel/newlib/samples/powerpc-860-linux-gnu/crosstool.config | 102 67 35 0 +-
/devel/newlib/config/kernel/linux.in | 87 46 41 0 +-
/devel/newlib/config/cc/gcc.in | 35 30 5 0 +
/devel/newlib/config/debug/gdb.in | 2 1 1 0
94 files changed, 1851 insertions(+), 5813 deletions(-)
yann@1365
     1
Original patch from: gentoo/src/patchsets/glibc/2.9/0010_all_glibc-2.7-ssp-compat.patch
yann@1365
     2
yann@1365
     3
-= BEGIN original header =-
yann@1365
     4
Add backwards compat support for gcc-3.x ssp ... older ssp versions
yann@1365
     5
used __guard and __stack_smash_handler symbols while gcc-4.1 and newer
yann@1365
     6
uses __stack_chk_guard and __stack_chk_fail.
yann@1365
     7
yann@1365
     8
-= END original header =-
yann@1365
     9
yann@1365
    10
diff -durN glibc-2_9.orig/Versions.def glibc-2_9/Versions.def
yann@1365
    11
--- glibc-2_9.orig/Versions.def	2008-08-01 19:13:40.000000000 +0200
yann@1365
    12
+++ glibc-2_9/Versions.def	2009-02-02 22:00:33.000000000 +0100
yann@1365
    13
@@ -113,6 +113,9 @@
yann@1365
    14
   GLIBC_2.0
yann@1365
    15
   GLIBC_2.1
yann@1365
    16
   GLIBC_2.3
yann@1365
    17
+%ifdef ENABLE_OLD_SSP_COMPAT
yann@1365
    18
+  GLIBC_2.3.2
yann@1365
    19
+%endif
yann@1365
    20
   GLIBC_2.4
yann@1365
    21
   GLIBC_PRIVATE
yann@1365
    22
 }
yann@1365
    23
diff -durN glibc-2_9.orig/config.h.in glibc-2_9/config.h.in
yann@1365
    24
--- glibc-2_9.orig/config.h.in	2007-03-26 22:40:08.000000000 +0200
yann@1365
    25
+++ glibc-2_9/config.h.in	2009-02-02 22:00:32.000000000 +0100
yann@1365
    26
@@ -42,6 +42,9 @@
yann@1365
    27
    assembler instructions per line.  Default is `;'  */
yann@1365
    28
 #undef ASM_LINE_SEP
yann@1365
    29
 
yann@1365
    30
+/* Define if we want to enable support for old ssp symbols */
yann@1365
    31
+#undef	ENABLE_OLD_SSP_COMPAT
yann@1365
    32
+
yann@1365
    33
 /* Define if not using ELF, but `.init' and `.fini' sections are available.  */
yann@1365
    34
 #undef	HAVE_INITFINI
yann@1365
    35
 
yann@1365
    36
diff -durN glibc-2_9.orig/configure glibc-2_9/configure
yann@1365
    37
--- glibc-2_9.orig/configure	2008-11-11 10:50:11.000000000 +0100
yann@1365
    38
+++ glibc-2_9/configure	2009-02-02 22:00:32.000000000 +0100
yann@1365
    39
@@ -1380,6 +1380,9 @@
yann@1365
    40
   --enable-kernel=VERSION compile for compatibility with kernel not older than
yann@1365
    41
                           VERSION
yann@1365
    42
   --enable-all-warnings   enable all useful warnings gcc can issue
yann@1365
    43
+  --disable-old-ssp-compat
yann@1365
    44
+                          enable support for older ssp symbols
yann@1365
    45
+                          [default=no]
yann@1365
    46
 
yann@1365
    47
 Optional Packages:
yann@1365
    48
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
yann@1365
    49
@@ -6470,6 +6473,20 @@
yann@1365
    50
 echo "${ECHO_T}$libc_cv_ssp" >&6; }
yann@1365
    51
 
yann@1365
    52
 
yann@1365
    53
+# Check whether --enable-old-ssp-compat or --disable-old-ssp-compat was given.
yann@1365
    54
+if test "${enable_old_ssp_compat+set}" = set; then
yann@1365
    55
+  enableval="$enable_old_ssp_compat"
yann@1365
    56
+  enable_old_ssp_compat=$enableval
yann@1365
    57
+else
yann@1365
    58
+  enable_old_ssp_compat=no
yann@1365
    59
+fi;
yann@1365
    60
+if test "x$enable_old_ssp_compat" = "xyes"; then
yann@1365
    61
+  cat >>confdefs.h <<\_ACEOF
yann@1365
    62
+#define ENABLE_OLD_SSP_COMPAT 1
yann@1365
    63
+_ACEOF
yann@1365
    64
+
yann@1365
    65
+fi
yann@1365
    66
+
yann@1365
    67
 { echo "$as_me:$LINENO: checking for -fgnu89-inline" >&5
yann@1365
    68
 echo $ECHO_N "checking for -fgnu89-inline... $ECHO_C" >&6; }
yann@1365
    69
 if test "${libc_cv_gnu89_inline+set}" = set; then
yann@1365
    70
diff -durN glibc-2_9.orig/configure.in glibc-2_9/configure.in
yann@1365
    71
--- glibc-2_9.orig/configure.in	2008-11-11 10:50:11.000000000 +0100
yann@1365
    72
+++ glibc-2_9/configure.in	2009-02-02 22:00:32.000000000 +0100
yann@1365
    73
@@ -1647,6 +1647,15 @@
yann@1365
    74
 rm -f conftest*])
yann@1365
    75
 AC_SUBST(libc_cv_ssp)
yann@1365
    76
 
yann@1365
    77
+AC_ARG_ENABLE([old-ssp-compat],
yann@1365
    78
+	      AC_HELP_STRING([--enable-old-ssp-compat],
yann@1365
    79
+	                     [enable support for older ssp symbols @<:@default=no@:>@]),
yann@1365
    80
+	      [enable_old_ssp_compat=$enableval],
yann@1365
    81
+	      [enable_old_ssp_compat=no])
yann@1365
    82
+if test "x$enable_old_ssp_compat" = "xyes"; then
yann@1365
    83
+  AC_DEFINE(ENABLE_OLD_SSP_COMPAT)
yann@1365
    84
+fi
yann@1365
    85
+
yann@1365
    86
 AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl
yann@1365
    87
 cat > conftest.c <<EOF
yann@1365
    88
 int foo;
yann@1365
    89
diff -durN glibc-2_9.orig/csu/Versions glibc-2_9/csu/Versions
yann@1365
    90
--- glibc-2_9.orig/csu/Versions	2006-10-28 01:11:41.000000000 +0200
yann@1365
    91
+++ glibc-2_9/csu/Versions	2009-02-02 22:00:32.000000000 +0100
yann@1365
    92
@@ -17,6 +17,12 @@
yann@1365
    93
     # New special glibc functions.
yann@1365
    94
     gnu_get_libc_release; gnu_get_libc_version;
yann@1365
    95
   }
yann@1365
    96
+  GLIBC_2.3.2 {
yann@1365
    97
+%ifdef ENABLE_OLD_SSP_COMPAT
yann@1365
    98
+    # global objects and functions for the old propolice patch in gcc
yann@1365
    99
+    __guard;
yann@1365
   100
+%endif
yann@1365
   101
+  }
yann@1365
   102
   GLIBC_PRIVATE {
yann@1365
   103
 %if HAVE___THREAD
yann@1365
   104
     # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
yann@1365
   105
diff -durN glibc-2_9.orig/csu/libc-start.c glibc-2_9/csu/libc-start.c
yann@1365
   106
--- glibc-2_9.orig/csu/libc-start.c	2007-08-21 00:27:50.000000000 +0200
yann@1365
   107
+++ glibc-2_9/csu/libc-start.c	2009-02-02 22:00:32.000000000 +0100
yann@1365
   108
@@ -37,6 +37,9 @@
yann@1365
   109
 uintptr_t __stack_chk_guard attribute_relro;
yann@1365
   110
 # endif
yann@1365
   111
 #endif
yann@1365
   112
+#ifdef ENABLE_OLD_SSP_COMPAT
yann@1365
   113
+uintptr_t __guard attribute_relro;
yann@1365
   114
+#endif
yann@1365
   115
 
yann@1365
   116
 #ifdef HAVE_PTR_NTHREADS
yann@1365
   117
 /* We need atomic operations.  */
yann@1365
   118
@@ -141,6 +144,9 @@
yann@1365
   119
 
yann@1365
   120
   /* Set up the stack checker's canary.  */
yann@1365
   121
   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
yann@1365
   122
+#ifdef ENABLE_OLD_SSP_COMPAT
yann@1365
   123
+  __guard = stack_chk_guard;
yann@1365
   124
+#endif
yann@1365
   125
 # ifdef THREAD_SET_STACK_GUARD
yann@1365
   126
   THREAD_SET_STACK_GUARD (stack_chk_guard);
yann@1365
   127
 # else
yann@1365
   128
diff -durN glibc-2_9.orig/debug/Versions glibc-2_9/debug/Versions
yann@1365
   129
--- glibc-2_9.orig/debug/Versions	2008-03-05 07:53:41.000000000 +0100
yann@1365
   130
+++ glibc-2_9/debug/Versions	2009-02-02 22:00:32.000000000 +0100
yann@1365
   131
@@ -10,6 +10,12 @@
yann@1365
   132
     # These are to support some gcc features.
yann@1365
   133
     __cyg_profile_func_enter; __cyg_profile_func_exit;
yann@1365
   134
   }
yann@1365
   135
+%ifdef ENABLE_OLD_SSP_COMPAT
yann@1365
   136
+  GLIBC_2.3.2 {
yann@1365
   137
+    # backwards ssp compat support; alias to __stack_chk_fail
yann@1365
   138
+    __stack_smash_handler;
yann@1365
   139
+  }
yann@1365
   140
+%endif
yann@1365
   141
   GLIBC_2.3.4 {
yann@1365
   142
     __chk_fail;
yann@1365
   143
     __memcpy_chk; __memmove_chk; __mempcpy_chk; __memset_chk; __stpcpy_chk;
yann@1365
   144
diff -durN glibc-2_9.orig/debug/stack_chk_fail.c glibc-2_9/debug/stack_chk_fail.c
yann@1365
   145
--- glibc-2_9.orig/debug/stack_chk_fail.c	2007-05-25 01:47:08.000000000 +0200
yann@1365
   146
+++ glibc-2_9/debug/stack_chk_fail.c	2009-02-02 22:00:32.000000000 +0100
yann@1365
   147
@@ -28,3 +28,7 @@
yann@1365
   148
 {
yann@1365
   149
   __fortify_fail ("stack smashing detected");
yann@1365
   150
 }
yann@1365
   151
+
yann@1365
   152
+#ifdef ENABLE_OLD_SSP_COMPAT
yann@1365
   153
+strong_alias (__stack_chk_fail, __stack_smash_handler)
yann@1365
   154
+#endif
yann@1365
   155
diff -durN glibc-2_9.orig/elf/Versions glibc-2_9/elf/Versions
yann@1365
   156
--- glibc-2_9.orig/elf/Versions	2008-03-08 06:42:26.000000000 +0100
yann@1365
   157
+++ glibc-2_9/elf/Versions	2009-02-02 22:00:33.000000000 +0100
yann@1365
   158
@@ -43,6 +43,12 @@
yann@1365
   159
     # runtime interface to TLS
yann@1365
   160
     __tls_get_addr;
yann@1365
   161
   }
yann@1365
   162
+%ifdef ENABLE_OLD_SSP_COMPAT
yann@1365
   163
+  GLIBC_2.3.2 {
yann@1365
   164
+    # backwards ssp compat support
yann@1365
   165
+    __guard;
yann@1365
   166
+  }
yann@1365
   167
+%endif
yann@1365
   168
   GLIBC_2.4 {
yann@1365
   169
     # stack canary
yann@1365
   170
     __stack_chk_guard;
yann@1365
   171
diff -durN glibc-2_9.orig/elf/rtld.c glibc-2_9/elf/rtld.c
yann@1365
   172
--- glibc-2_9.orig/elf/rtld.c	2008-08-14 19:01:56.000000000 +0200
yann@1365
   173
+++ glibc-2_9/elf/rtld.c	2009-02-02 22:00:32.000000000 +0100
yann@1365
   174
@@ -89,6 +89,9 @@
yann@1365
   175
    in thread local area.  */
yann@1365
   176
 uintptr_t __stack_chk_guard attribute_relro;
yann@1365
   177
 #endif
yann@1365
   178
+#ifdef ENABLE_OLD_SSP_COMPAT
yann@1365
   179
+uintptr_t __guard attribute_relro;
yann@1365
   180
+#endif
yann@1365
   181
 
yann@1365
   182
 /* Only exported for architectures that don't store the pointer guard
yann@1365
   183
    value in thread local area.  */
yann@1365
   184
@@ -842,6 +845,9 @@
yann@1365
   185
 {
yann@1365
   186
   /* Set up the stack checker's canary.  */
yann@1365
   187
   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
yann@1365
   188
+#ifdef ENABLE_OLD_SSP_COMPAT
yann@1365
   189
+  __guard = stack_chk_guard;
yann@1365
   190
+#endif
yann@1365
   191
 #ifdef THREAD_SET_STACK_GUARD
yann@1365
   192
   THREAD_SET_STACK_GUARD (stack_chk_guard);
yann@1365
   193
 #else