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(-)
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/0010_all_glibc-2.7-ssp-compat.patch
     2 
     3 -= BEGIN original header =-
     4 Add backwards compat support for gcc-3.x ssp ... older ssp versions
     5 used __guard and __stack_smash_handler symbols while gcc-4.1 and newer
     6 uses __stack_chk_guard and __stack_chk_fail.
     7 
     8 -= END original header =-
     9 
    10 diff -durN glibc-2_9.orig/Versions.def glibc-2_9/Versions.def
    11 --- glibc-2_9.orig/Versions.def	2008-08-01 19:13:40.000000000 +0200
    12 +++ glibc-2_9/Versions.def	2009-02-02 22:00:33.000000000 +0100
    13 @@ -113,6 +113,9 @@
    14    GLIBC_2.0
    15    GLIBC_2.1
    16    GLIBC_2.3
    17 +%ifdef ENABLE_OLD_SSP_COMPAT
    18 +  GLIBC_2.3.2
    19 +%endif
    20    GLIBC_2.4
    21    GLIBC_PRIVATE
    22  }
    23 diff -durN glibc-2_9.orig/config.h.in glibc-2_9/config.h.in
    24 --- glibc-2_9.orig/config.h.in	2007-03-26 22:40:08.000000000 +0200
    25 +++ glibc-2_9/config.h.in	2009-02-02 22:00:32.000000000 +0100
    26 @@ -42,6 +42,9 @@
    27     assembler instructions per line.  Default is `;'  */
    28  #undef ASM_LINE_SEP
    29  
    30 +/* Define if we want to enable support for old ssp symbols */
    31 +#undef	ENABLE_OLD_SSP_COMPAT
    32 +
    33  /* Define if not using ELF, but `.init' and `.fini' sections are available.  */
    34  #undef	HAVE_INITFINI
    35  
    36 diff -durN glibc-2_9.orig/configure glibc-2_9/configure
    37 --- glibc-2_9.orig/configure	2008-11-11 10:50:11.000000000 +0100
    38 +++ glibc-2_9/configure	2009-02-02 22:00:32.000000000 +0100
    39 @@ -1380,6 +1380,9 @@
    40    --enable-kernel=VERSION compile for compatibility with kernel not older than
    41                            VERSION
    42    --enable-all-warnings   enable all useful warnings gcc can issue
    43 +  --disable-old-ssp-compat
    44 +                          enable support for older ssp symbols
    45 +                          [default=no]
    46  
    47  Optional Packages:
    48    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    49 @@ -6470,6 +6473,20 @@
    50  echo "${ECHO_T}$libc_cv_ssp" >&6; }
    51  
    52  
    53 +# Check whether --enable-old-ssp-compat or --disable-old-ssp-compat was given.
    54 +if test "${enable_old_ssp_compat+set}" = set; then
    55 +  enableval="$enable_old_ssp_compat"
    56 +  enable_old_ssp_compat=$enableval
    57 +else
    58 +  enable_old_ssp_compat=no
    59 +fi;
    60 +if test "x$enable_old_ssp_compat" = "xyes"; then
    61 +  cat >>confdefs.h <<\_ACEOF
    62 +#define ENABLE_OLD_SSP_COMPAT 1
    63 +_ACEOF
    64 +
    65 +fi
    66 +
    67  { echo "$as_me:$LINENO: checking for -fgnu89-inline" >&5
    68  echo $ECHO_N "checking for -fgnu89-inline... $ECHO_C" >&6; }
    69  if test "${libc_cv_gnu89_inline+set}" = set; then
    70 diff -durN glibc-2_9.orig/configure.in glibc-2_9/configure.in
    71 --- glibc-2_9.orig/configure.in	2008-11-11 10:50:11.000000000 +0100
    72 +++ glibc-2_9/configure.in	2009-02-02 22:00:32.000000000 +0100
    73 @@ -1647,6 +1647,15 @@
    74  rm -f conftest*])
    75  AC_SUBST(libc_cv_ssp)
    76  
    77 +AC_ARG_ENABLE([old-ssp-compat],
    78 +	      AC_HELP_STRING([--enable-old-ssp-compat],
    79 +	                     [enable support for older ssp symbols @<:@default=no@:>@]),
    80 +	      [enable_old_ssp_compat=$enableval],
    81 +	      [enable_old_ssp_compat=no])
    82 +if test "x$enable_old_ssp_compat" = "xyes"; then
    83 +  AC_DEFINE(ENABLE_OLD_SSP_COMPAT)
    84 +fi
    85 +
    86  AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl
    87  cat > conftest.c <<EOF
    88  int foo;
    89 diff -durN glibc-2_9.orig/csu/Versions glibc-2_9/csu/Versions
    90 --- glibc-2_9.orig/csu/Versions	2006-10-28 01:11:41.000000000 +0200
    91 +++ glibc-2_9/csu/Versions	2009-02-02 22:00:32.000000000 +0100
    92 @@ -17,6 +17,12 @@
    93      # New special glibc functions.
    94      gnu_get_libc_release; gnu_get_libc_version;
    95    }
    96 +  GLIBC_2.3.2 {
    97 +%ifdef ENABLE_OLD_SSP_COMPAT
    98 +    # global objects and functions for the old propolice patch in gcc
    99 +    __guard;
   100 +%endif
   101 +  }
   102    GLIBC_PRIVATE {
   103  %if HAVE___THREAD
   104      # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
   105 diff -durN glibc-2_9.orig/csu/libc-start.c glibc-2_9/csu/libc-start.c
   106 --- glibc-2_9.orig/csu/libc-start.c	2007-08-21 00:27:50.000000000 +0200
   107 +++ glibc-2_9/csu/libc-start.c	2009-02-02 22:00:32.000000000 +0100
   108 @@ -37,6 +37,9 @@
   109  uintptr_t __stack_chk_guard attribute_relro;
   110  # endif
   111  #endif
   112 +#ifdef ENABLE_OLD_SSP_COMPAT
   113 +uintptr_t __guard attribute_relro;
   114 +#endif
   115  
   116  #ifdef HAVE_PTR_NTHREADS
   117  /* We need atomic operations.  */
   118 @@ -141,6 +144,9 @@
   119  
   120    /* Set up the stack checker's canary.  */
   121    uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
   122 +#ifdef ENABLE_OLD_SSP_COMPAT
   123 +  __guard = stack_chk_guard;
   124 +#endif
   125  # ifdef THREAD_SET_STACK_GUARD
   126    THREAD_SET_STACK_GUARD (stack_chk_guard);
   127  # else
   128 diff -durN glibc-2_9.orig/debug/Versions glibc-2_9/debug/Versions
   129 --- glibc-2_9.orig/debug/Versions	2008-03-05 07:53:41.000000000 +0100
   130 +++ glibc-2_9/debug/Versions	2009-02-02 22:00:32.000000000 +0100
   131 @@ -10,6 +10,12 @@
   132      # These are to support some gcc features.
   133      __cyg_profile_func_enter; __cyg_profile_func_exit;
   134    }
   135 +%ifdef ENABLE_OLD_SSP_COMPAT
   136 +  GLIBC_2.3.2 {
   137 +    # backwards ssp compat support; alias to __stack_chk_fail
   138 +    __stack_smash_handler;
   139 +  }
   140 +%endif
   141    GLIBC_2.3.4 {
   142      __chk_fail;
   143      __memcpy_chk; __memmove_chk; __mempcpy_chk; __memset_chk; __stpcpy_chk;
   144 diff -durN glibc-2_9.orig/debug/stack_chk_fail.c glibc-2_9/debug/stack_chk_fail.c
   145 --- glibc-2_9.orig/debug/stack_chk_fail.c	2007-05-25 01:47:08.000000000 +0200
   146 +++ glibc-2_9/debug/stack_chk_fail.c	2009-02-02 22:00:32.000000000 +0100
   147 @@ -28,3 +28,7 @@
   148  {
   149    __fortify_fail ("stack smashing detected");
   150  }
   151 +
   152 +#ifdef ENABLE_OLD_SSP_COMPAT
   153 +strong_alias (__stack_chk_fail, __stack_smash_handler)
   154 +#endif
   155 diff -durN glibc-2_9.orig/elf/Versions glibc-2_9/elf/Versions
   156 --- glibc-2_9.orig/elf/Versions	2008-03-08 06:42:26.000000000 +0100
   157 +++ glibc-2_9/elf/Versions	2009-02-02 22:00:33.000000000 +0100
   158 @@ -43,6 +43,12 @@
   159      # runtime interface to TLS
   160      __tls_get_addr;
   161    }
   162 +%ifdef ENABLE_OLD_SSP_COMPAT
   163 +  GLIBC_2.3.2 {
   164 +    # backwards ssp compat support
   165 +    __guard;
   166 +  }
   167 +%endif
   168    GLIBC_2.4 {
   169      # stack canary
   170      __stack_chk_guard;
   171 diff -durN glibc-2_9.orig/elf/rtld.c glibc-2_9/elf/rtld.c
   172 --- glibc-2_9.orig/elf/rtld.c	2008-08-14 19:01:56.000000000 +0200
   173 +++ glibc-2_9/elf/rtld.c	2009-02-02 22:00:32.000000000 +0100
   174 @@ -89,6 +89,9 @@
   175     in thread local area.  */
   176  uintptr_t __stack_chk_guard attribute_relro;
   177  #endif
   178 +#ifdef ENABLE_OLD_SSP_COMPAT
   179 +uintptr_t __guard attribute_relro;
   180 +#endif
   181  
   182  /* Only exported for architectures that don't store the pointer guard
   183     value in thread local area.  */
   184 @@ -842,6 +845,9 @@
   185  {
   186    /* Set up the stack checker's canary.  */
   187    uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
   188 +#ifdef ENABLE_OLD_SSP_COMPAT
   189 +  __guard = stack_chk_guard;
   190 +#endif
   191  #ifdef THREAD_SET_STACK_GUARD
   192    THREAD_SET_STACK_GUARD (stack_chk_guard);
   193  #else