svn commit: branches/uClibc_0_9_28/ldso: include ldso

vapier at uclibc.org vapier at uclibc.org
Sun Jan 28 05:51:32 UTC 2007


Author: vapier
Date: 2007-01-27 21:51:31 -0800 (Sat, 27 Jan 2007)
New Revision: 17575

Log:
backout ssp changes that leaked in from buildroot

Modified:
   branches/uClibc_0_9_28/ldso/include/dl-syscall.h
   branches/uClibc_0_9_28/ldso/ldso/ldso.c


Changeset:
Modified: branches/uClibc_0_9_28/ldso/include/dl-syscall.h
===================================================================
--- branches/uClibc_0_9_28/ldso/include/dl-syscall.h	2007-01-28 05:38:00 UTC (rev 17574)
+++ branches/uClibc_0_9_28/ldso/include/dl-syscall.h	2007-01-28 05:51:31 UTC (rev 17575)
@@ -119,18 +119,7 @@
 static inline _syscall3(int, _dl_readlink, const char *, path, char *, buf,
                         size_t, bufsiz);
 
-#ifdef __UCLIBC_HAS_SSP__
-# include <sys/time.h>
-# define __NR__dl_gettimeofday __NR_gettimeofday
-static inline _syscall2(int, _dl_gettimeofday, struct timeval *, tv,
-# ifdef __USE_BSD
-                        struct timezone *, tz);
-# else
-                        void *, tz);
-# endif
-#endif
 
-
 /* handle all the fun mmap intricacies */
 #if (defined(__UCLIBC_MMAP_HAS_6_ARGS__) && defined(__NR_mmap)) || !defined(__NR_mmap2)
 # define _dl_MAX_ERRNO 4096

Modified: branches/uClibc_0_9_28/ldso/ldso/ldso.c
===================================================================
--- branches/uClibc_0_9_28/ldso/ldso/ldso.c	2007-01-28 05:38:00 UTC (rev 17574)
+++ branches/uClibc_0_9_28/ldso/ldso/ldso.c	2007-01-28 05:51:31 UTC (rev 17575)
@@ -86,24 +86,6 @@
 static unsigned int nlist; /* # items in init_fini_list */
 extern void _start(void);
 
-#ifdef __UCLIBC_HAS_SSP__
-#ifndef __UCLIBC_HAS_SSP_COMPAT__
-#define __UCLIBC_HAS_SSP_COMPAT__ 1
-#endif
-# include <dl-osinfo.h>
-uintptr_t stack_chk_guard;
-# ifndef THREAD_SET_STACK_GUARD
-/* Only exported for architectures that don't store the stack guard canary
- * in local thread area.  */
-uintptr_t __stack_chk_guard attribute_relro;
-#  ifdef __UCLIBC_HAS_SSP_COMPAT__
-strong_alias(__stack_chk_guard,__guard)
-#  endif
-# elif __UCLIBC_HAS_SSP_COMPAT__
-uintptr_t __guard attribute_relro;
-# endif
-#endif
-
 static void _dl_run_array_forward(unsigned long array, unsigned long size,
 				  ElfW(Addr) loadaddr)
 {
@@ -269,20 +251,6 @@
 		unlazy = RTLD_NOW;
 	}
 
-	/* sjhill: your TLS init should go before this */
-#ifdef __UCLIBC_HAS_SSP__
-	/* Set up the stack checker's canary.  */
-	stack_chk_guard = _dl_setup_stack_chk_guard ();
-# ifdef THREAD_SET_STACK_GUARD
-	THREAD_SET_STACK_GUARD (stack_chk_guard);
-#  ifdef __UCLIBC_HAS_SSP_COMPAT__
-	__guard = stack_chk_guard;
-#  endif
-# else
-	__stack_chk_guard = stack_chk_guard;
-# endif
-#endif
-
 	/* At this point we are now free to examine the user application,
 	 * and figure out which libraries are supposed to be called.  Until
 	 * we have this list, we will not be completely ready for dynamic




More information about the uClibc-cvs mailing list