Author: mbanck
Date: 2007-10-30 17:51:13 + (Tue, 30 Oct 2007)
New Revision: 2637
Modified:
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/local-tls-support.diff
Log:
Removed .orig/.rej hunks
Modified:
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/local-tls-support.diff
===
---
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/local-tls-support.diff
2007-10-29 21:08:44 UTC (rev 2636)
+++
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/local-tls-support.diff
2007-10-30 17:51:13 UTC (rev 2637)
@@ -13,292 +13,6 @@
/* Set up the stack checker's canary. */
uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
csu/libc-start.c.orig.orig
-+++ csu/libc-start.c.orig
-@@ -0,0 +1,253 @@
-+/* Copyright (C) 1998-2006, 2007 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include stdlib.h
-+#include stdio.h
-+#include unistd.h
-+#include ldsodefs.h
-+#include bp-start.h
-+#include bp-sym.h
-+
-+extern void __libc_init_first (int argc, char **argv, char **envp);
-+
-+extern int __libc_multiple_libcs;
-+
-+#include tls.h
-+#ifndef SHARED
-+# include dl-osinfo.h
-+extern void __pthread_initialize_minimal (void);
-+# ifndef THREAD_SET_STACK_GUARD
-+/* Only exported for architectures that don't store the stack guard canary
-+ in thread local area. */
-+uintptr_t __stack_chk_guard attribute_relro;
-+# endif
-+#endif
-+
-+#ifdef HAVE_PTR_NTHREADS
-+/* We need atomic operations. */
-+# include atomic.h
-+#endif
-+
-+
-+#ifdef LIBC_START_MAIN
-+# ifdef LIBC_START_DISABLE_INLINE
-+# define STATIC static
-+# else
-+# define STATIC static inline __attribute__ ((always_inline))
-+# endif
-+#else
-+# define STATIC
-+# define LIBC_START_MAIN BP_SYM (__libc_start_main)
-+#endif
-+
-+#ifdef MAIN_AUXVEC_ARG
-+/* main gets passed a pointer to the auxiliary. */
-+# define MAIN_AUXVEC_DECL , void *
-+# define MAIN_AUXVEC_PARAM, auxvec
-+#else
-+# define MAIN_AUXVEC_DECL
-+# define MAIN_AUXVEC_PARAM
-+#endif
-+
-+STATIC int LIBC_START_MAIN (int (*main) (int, char **, char **
-+ MAIN_AUXVEC_DECL),
-+ int argc,
-+ char *__unbounded *__unbounded ubp_av,
-+#ifdef LIBC_START_MAIN_AUXVEC_ARG
-+ ElfW(auxv_t) *__unbounded auxvec,
-+#endif
-+ __typeof (main) init,
-+ void (*fini) (void),
-+ void (*rtld_fini) (void),
-+ void *__unbounded stack_end)
-+ __attribute__ ((noreturn));
-+
-+
-+/* Note: the fini parameter is ignored here for shared library. It
-+ is registered with __cxa_atexit. This had the disadvantage that
-+ finalizers were called in more than one place. */
-+STATIC int
-+LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
-+ int argc, char *__unbounded *__unbounded ubp_av,
-+#ifdef LIBC_START_MAIN_AUXVEC_ARG
-+ ElfW(auxv_t) *__unbounded auxvec,
-+#endif
-+ __typeof (main) init,
-+ void (*fini) (void),
-+ void (*rtld_fini) (void), void *__unbounded stack_end)
-+{
-+#if __BOUNDED_POINTERS__
-+ char **argv;
-+#else
-+# define argv ubp_av
-+#endif
-+
-+ /* Result of the 'main' function. */
-+ int result;
-+
-+ __libc_multiple_libcs = _dl_starting_up !_dl_starting_up;
-+
-+#ifndef SHARED
-+ char *__unbounded *__unbounded ubp_ev = ubp_av[argc + 1];
-+
-+ INIT_ARGV_and_ENVIRON;
-+
-+ /* Store the lowest stack address. This is done in ld.so if this is
-+ the code for the DSO. */
-+ __libc_stack_end = stack_end;
-+
-+# ifdef HAVE_AUX_VECTOR
-+ /* First process the auxiliary vector since we need to find the
-+ program header to locate an eventually present PT_TLS entry. */
-+# ifndef LIBC_START_MAIN_AUXVEC_ARG
-+ ElfW(auxv_t) *__unbounded auxvec;
-+ {
-+char *__unbounded *__unbounded evp = ubp_ev;
-+while (*evp++ != NULL)
-+ ;
-+auxvec = (ElfW(auxv_t) *__unbounded) evp;
-+ }
-+# endif
-+ _dl_aux_init (auxvec);
-+# endif
-+# ifdef
