From 11986c680d9ff586617955fc6b05c27f027baeaf Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 20 Feb 2004 06:07:55 +0000 Subject: Update. 2004-02-19 Steven Munroe * sysdeps/generic/libc-start.c [LIBC_START_DISABLE_INLINE] (STATIC): Define as static. * sysdeps/powerpc/elf/libc-start.c: Define LIBC_START_DISABLE_INLINE because gcc does not allow inline of functions that call setjmp. 2004-02-19 Steven Munroe * sysdeps/powerpc/powerpc64/Makefile: Use -finline-limit. 2004-02-19 Jakub Jelinek * elf/rtld.c (_dl_argv): If DL_ARGV_NOT_RELRO defined, don't use attribute_relro for _dl_argv. * sysdeps/alpha/dl-machine.h (DL_ARGV_NOT_RELRO): Define. * sysdeps/ia64/dl-machine.h (DL_ARGV_NOT_RELRO): Define. * sysdeps/sparc/sparc32/dl-machine.h (DL_ARGV_NOT_RELRO): Define. * sysdeps/sparc/sparc64/dl-machine.h (DL_ARGV_NOT_RELRO): Define. vfork instead of fork. --- sysdeps/alpha/dl-machine.h | 4 ++++ sysdeps/generic/libc-start.c | 6 +++++- sysdeps/ia64/dl-machine.h | 6 +++++- sysdeps/powerpc/elf/libc-start.c | 1 + sysdeps/powerpc/powerpc64/Makefile | 2 +- sysdeps/sparc/sparc32/dl-machine.h | 6 +++++- sysdeps/sparc/sparc64/dl-machine.h | 6 +++++- 7 files changed, 26 insertions(+), 5 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index 3616faedbf..cf96b778bd 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -293,6 +293,10 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) strong_alias (_dl_runtime_resolve, _dl_runtime_profile); #endif +/* _dl_argv cannot be attribute_relro, because _dl_start_user below + might write into it after _dl_start returns. */ +#define DL_ARGV_NOT_RELRO 1 + /* Initial entry point code for the dynamic linker. The C function `_dl_start' is the real entry point; its return value is the user program's entry point. */ diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index 582ae0b6a2..0708c91cfc 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -44,7 +44,11 @@ extern void __pthread_initialize_minimal (void) #ifdef LIBC_START_MAIN -# define STATIC static inline __attribute__ ((always_inline)) +# 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) diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h index 5c0ff9f20c..50a8822105 100644 --- a/sysdeps/ia64/dl-machine.h +++ b/sysdeps/ia64/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. IA-64 version. - Copyright (C) 1995-1997, 2000-2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2003, 2004 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 @@ -272,6 +272,10 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) #define DL_STACK_END(cookie) \ ((void *) (((long) (cookie)) - 16)) +/* _dl_argv cannot be attribute_relro, because _dl_start_user below + might write into it after _dl_start returns. */ +#define DL_ARGV_NOT_RELRO 1 + /* Initial entry point code for the dynamic linker. The C function `_dl_start' is the real entry point; its return value is the user program's entry point. */ diff --git a/sysdeps/powerpc/elf/libc-start.c b/sysdeps/powerpc/elf/libc-start.c index bbc4eeb3b8..1e1d68297e 100644 --- a/sysdeps/powerpc/elf/libc-start.c +++ b/sysdeps/powerpc/elf/libc-start.c @@ -49,6 +49,7 @@ __aux_init_cache (ElfW(auxv_t) *av) /* The main work is done in the generic function. */ #define LIBC_START_MAIN generic_start_main +#define LIBC_START_DISABLE_INLINE #define LIBC_START_MAIN_AUXVEC_ARG #define MAIN_AUXVEC_ARG #define INIT_MAIN_ARGS diff --git a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile index 97c7cde129..758b856854 100644 --- a/sysdeps/powerpc/powerpc64/Makefile +++ b/sysdeps/powerpc/powerpc64/Makefile @@ -20,5 +20,5 @@ endif ifeq ($(subdir),elf) # help gcc inline asm code from dl-machine.h -+cflags += --param max-inline-insns=2000 ++cflags += -finline-limit=2000 endif diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index cd409ae57c..70ba0ae76f 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. SPARC version. - Copyright (C) 1996-2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1996-2003, 2004 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 @@ -253,6 +253,10 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) #define DL_STACK_END(cookie) \ ((void *) (((long) (cookie)) - (22 - 6) * 4)) +/* _dl_argv cannot be attribute_relro, because _dl_start_user below + might write into it after _dl_start returns. */ +#define DL_ARGV_NOT_RELRO 1 + /* Initial entry point code for the dynamic linker. The C function `_dl_start' is the real entry point; its return value is the user program's entry point. */ diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index ad27e732bf..b40d2fbd57 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. Sparc64 version. - Copyright (C) 1997,1998,1999,2000,2001,2002, 2003 + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -671,6 +671,10 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) #define DL_STACK_END(cookie) \ ((void *) (((long) (cookie)) - (22 - 6) * 8 - STACK_BIAS)) +/* _dl_argv cannot be attribute_relro, because _dl_start_user below + might write into it after _dl_start returns. */ +#define DL_ARGV_NOT_RELRO 1 + /* Initial entry point code for the dynamic linker. The C function `_dl_start' is the real entry point; its return value is the user program's entry point. */ -- cgit v1.2.3