diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | elf/rtld.c | 4 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_barrier_wait.c | 2 | ||||
| -rw-r--r-- | sysdeps/alpha/dl-machine.h | 4 | ||||
| -rw-r--r-- | sysdeps/generic/libc-start.c | 6 | ||||
| -rw-r--r-- | sysdeps/ia64/dl-machine.h | 6 | ||||
| -rw-r--r-- | sysdeps/powerpc/elf/libc-start.c | 1 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 6 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 6 |
11 files changed, 57 insertions, 7 deletions
@@ -1,7 +1,27 @@ +2004-02-19 Steven Munroe <sjmunroe@us.ibm.com> + + * 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 <sjmunroe@us.ibm.com> + + * sysdeps/powerpc/powerpc64/Makefile: Use -finline-limit. + +2004-02-19 Jakub Jelinek <jakub@redhat.com> + + * 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. + 2004-02-19 Ulrich Drepper <drepper@redhat.com> * libio/iopopen.c (_IO_new_proc_open): It's not kosher to use - cfork instead of fork. + vfork instead of fork. * libio/oldiopopen.c (_IO_old_proc_open): Likewise. * sysdeps/unix/clock_settime.c (clock_settime): Fix typo which diff --git a/elf/rtld.c b/elf/rtld.c index f988dd4519..0ce1fda229 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -68,7 +68,11 @@ enum mode { normal, list, verify, trace }; static void process_envvars (enum mode *modep); int _dl_argc attribute_relro attribute_hidden; +#ifdef DL_ARGV_NOT_RELRO +char **_dl_argv = NULL; +#else char **_dl_argv attribute_relro = NULL; +#endif INTDEF(_dl_argv) /* Nonzero if we were run directly. */ diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 43107a38c7..9a3b463e6b 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2004-02-19 Andreas Schwab <schwab@suse.de> + + * sysdeps/pthread/pthread_barrier_wait.c (pthread_barrier_wait): + Fix last change. + 2004-02-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S diff --git a/nptl/sysdeps/pthread/pthread_barrier_wait.c b/nptl/sysdeps/pthread/pthread_barrier_wait.c index f6dc3e5f16..f0f65b05c7 100644 --- a/nptl/sysdeps/pthread/pthread_barrier_wait.c +++ b/nptl/sysdeps/pthread/pthread_barrier_wait.c @@ -73,7 +73,7 @@ pthread_barrier_wait (barrier) unsigned int init_count = ibarrier->init_count; /* If this was the last woken thread, unlock. */ - if (atomic_exchange_and_add (ibarrier->left, 1) == init_count - 1) + if (atomic_exchange_and_add (&ibarrier->left, 1) == init_count - 1) /* We are done. */ lll_unlock (ibarrier->lock); 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. */ |