From 237277e9a8133c64026b736b1427141e71655330 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Thu, 27 Oct 2005 22:58:52 +0000 Subject: Moved guard_setup to dl-osinfo.h (used commonly by ldso and libc). Renamed to _dl_setup_stack_chk_guard, as in glibc. SSP requires now binutils-2.16.1 and newer. Add NOT_IN_libc/IS_IN_libc. Began using -DSHARED in uClibc_main.c, there are more candidates in there. Move back dl_protect_relro to it's earlier place. --- include/libc-internal.h | 4 ++++ include/ssp-internal.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/libc-internal.h b/include/libc-internal.h index f5bc9bb0c..b00a8775c 100644 --- a/include/libc-internal.h +++ b/include/libc-internal.h @@ -70,6 +70,10 @@ # define internal_function /* empty */ #endif +#ifndef NOT_IN_libc +# define IS_IN_libc 1 +#endif + /* Prepare for the case that `__builtin_expect' is not available. */ #if __GNUC__ == 2 && __GNUC_MINOR__ < 96 #define __builtin_expect(x, expected_value) (x) diff --git a/include/ssp-internal.h b/include/ssp-internal.h index bff304fe1..81a83f70c 100644 --- a/include/ssp-internal.h +++ b/include/ssp-internal.h @@ -23,8 +23,8 @@ #ifndef __SSP_QUICK_CANARY__ #define __NR___kernel_open __NR_open -static __always_inline _syscall2(int,__kernel_open,const char *,path,int,flags); -#define OPEN(path, flags) __kernel_open(path, flags) +static __always_inline _syscall3(int,__kernel_open,const char *,path,int,flags,__kernel_mode_t,mode); +#define OPEN(path, flags, mode) __kernel_open(path, flags, mode) /* void * = __ptr_t */ #define __NR___kernel_read __NR_read -- cgit v1.2.3