diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 4 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/memcmp.S | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-execstack.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/shm_open.c | 7 |
4 files changed, 10 insertions, 7 deletions
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index da631d2f54..5f39949c00 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -441,9 +441,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, { #if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP const Elf32_Sym *const refsym = sym; -#endif -#if defined USE_TLS && !defined RTLD_BOOTSTRAP +# ifdef USE_TLS struct link_map *sym_map; +# endif #endif Elf32_Addr value; #ifndef RESOLVE_CONFLICT_FIND_MAP diff --git a/sysdeps/sparc/sparc64/memcmp.S b/sysdeps/sparc/sparc64/memcmp.S index dbc9921769..074767b983 100644 --- a/sysdeps/sparc/sparc64/memcmp.S +++ b/sysdeps/sparc/sparc64/memcmp.S @@ -1,6 +1,6 @@ /* Compare two memory blocks for differences in the first COUNT bytes. For SPARC v9. - Copyright (C) 1998,1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jan Vondrak <jvon4518@ss1000.ms.mff.cuni.cz> and Jakub Jelinek <jj@ultra.linux.cz>. @@ -140,4 +140,4 @@ END(memcmp) #undef bcmp weak_alias(memcmp, bcmp) -libc_hidden_builtin_def (BP_SYM (memcmp)) +libc_hidden_builtin_def (memcmp) diff --git a/sysdeps/unix/sysv/linux/dl-execstack.c b/sysdeps/unix/sysv/linux/dl-execstack.c index 248196040a..3ca9b0b835 100644 --- a/sysdeps/unix/sysv/linux/dl-execstack.c +++ b/sysdeps/unix/sysv/linux/dl-execstack.c @@ -37,7 +37,7 @@ _dl_make_stack_executable (void **stack_endp) & -(intptr_t) GLRO(dl_pagesize)); /* Challenge the caller. */ - if (__builtin_expect (__check_caller (__builtin_return_address (0), + if (__builtin_expect (__check_caller (RETURN_ADDRESS (0), allow_ldso|allow_libpthread) != 0, 0) || __builtin_expect (*stack_endp != __libc_stack_end, 0)) return EPERM; diff --git a/sysdeps/unix/sysv/linux/shm_open.c b/sysdeps/unix/sysv/linux/shm_open.c index 73804f5349..2e94b76cdb 100644 --- a/sysdeps/unix/sysv/linux/shm_open.c +++ b/sysdeps/unix/sysv/linux/shm_open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2002, 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 @@ -227,7 +227,10 @@ shm_unlink (const char *name) name, namelen + 1); /* And remove the file. */ - return unlink (fname); + int ret = unlink (fname); + if (ret < 0 && errno == EPERM) + __set_errno (EACCES); + return ret; } |