aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Mike Frysinger <vapier@gentoo.org>2007-01-28 05:51:31 +0000
committerGravatar Mike Frysinger <vapier@gentoo.org>2007-01-28 05:51:31 +0000
commit69b4382f84fe4bef88c41818d0cc19bf322de324 (patch)
treee907465b62f9016b064c4b331e33a3d0086b4c7c
parent737f5aba25d64e2eb6e8fd095ee14c285908e5ad (diff)
downloaduClibc-69b4382f84fe4bef88c41818d0cc19bf322de324.tar.gz
uClibc-69b4382f84fe4bef88c41818d0cc19bf322de324.tar.bz2
backout ssp changes that leaked in from buildroot
-rw-r--r--ldso/include/dl-syscall.h11
-rw-r--r--ldso/ldso/ldso.c32
2 files changed, 0 insertions, 43 deletions
diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h
index 5b85fd230..7305d387e 100644
--- a/ldso/include/dl-syscall.h
+++ b/ldso/include/dl-syscall.h
@@ -119,17 +119,6 @@ static inline _syscall0(gid_t, _dl_getpid);
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)
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index bf939df12..aaf496c90 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -86,24 +86,6 @@ static struct elf_resolve **init_fini_list;
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 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr,
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