This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via 474700954dda085369a77e76c1c13a2c93b0a7e1 (commit) via 8e5113112ae7d3402e2afb01c8cee18d3beb0f2e (commit) via b4e091562671505b8cf23288b06001a46f5fa3ef (commit) via cb5af0bed860aac12b87b2044f6f519deded40f9 (commit) via 0544e23925edab56a765d67324325938fd4074fc (commit) from 885d9c24d4c21da941603baf555fc72a3765bbe3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 474700954dda085369a77e76c1c13a2c93b0a7e1 Merge: 885d9c2 8e51131 Author: Waldemar Brodkorb &lt;wbx(a)openadk.org&gt; Date: Wed Mar 4 13:37:16 2015 -0600 Merge remote-tracking branch 'origin/upstream' into 1.0 ----------------------------------------------------------------------- Summary of changes: Makerules | 2 +- ldso/ldso/dl-debug.c | 11 +++-------- ldso/ldso/dl-startup.c | 6 +++--- libc/signal/sigaddset.c | 3 ++- libc/signal/sigdelset.c | 3 ++- libc/sysdeps/linux/common/bits/sigset.h | 21 +++++++++++---------- libc/sysdeps/linux/sparc/clone.S | 2 ++ 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Makerules b/Makerules index 87e3c19..1596988 100644 --- a/Makerules +++ b/Makerules @@ -330,7 +330,7 @@ define create-lds -Wl,-z,relro -Wl,--hash-style=gnu -Wl,-z,defs \ -Wl,--verbose 2>&1 | LC_ALL=C \ $(SED) -e '/^=========/,/^=========/!d;/^=========/d' \ - -e 's/\. = .* + SIZEOF_HEADERS;/& $(SYMBOL_PREFIX)_begin = . - SIZEOF_HEADERS;/' > $@.lds + -e 's/^\([ ]*\)\. = .* + SIZEOF_HEADERS;/&\n\1$(SYMBOL_PREFIX)_begin = . - SIZEOF_HEADERS;/' > $@.lds endef define link.so diff --git a/ldso/ldso/dl-debug.c b/ldso/ldso/dl-debug.c index 1758bc3..88a4893 100644 --- a/ldso/ldso/dl-debug.c +++ b/ldso/ldso/dl-debug.c @@ -112,8 +112,6 @@ _dl_debug_lookup (const char *undef_name, struct elf_resolve *undef_map, const ElfW(Sym) *ref, struct symbol_ref *value, int type_class) { #ifdef SHARED - unsigned long symbol_addr; - if (_dl_trace_prelink) { int conflict = 0; @@ -123,17 +121,14 @@ _dl_debug_lookup (const char *undef_name, struct elf_resolve *undef_map, || _dl_trace_prelink_map == _dl_loaded_modules) && undef_map != _dl_loaded_modules) { - symbol_addr = (unsigned long) - _dl_find_hash(undef_name, &undef_map->symbol_scope, - undef_map, type_class, &val); + _dl_find_hash(undef_name, &undef_map->symbol_scope, + undef_map, type_class, &val); if (val.sym != value->sym || val.tpnt != value->tpnt) conflict = 1; } - if (value->sym - && (__builtin_expect (ELF_ST_TYPE(value->sym->st_info) - == STT_TLS, 0))) + if (unlikely(value->sym && ELF_ST_TYPE(value->sym->st_info) == STT_TLS)) type_class = 4; if (conflict diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c index 4893409..18a39ce 100644 --- a/ldso/ldso/dl-startup.c +++ b/ldso/ldso/dl-startup.c @@ -95,8 +95,8 @@ #include "dl-startup.h" #ifdef __LDSO_PRELINK_SUPPORT__ -/* These defined magically in the linker script. */ -extern char _begin[] attribute_hidden; +/* This is defined by the linker script. */ +extern ElfW(Addr) _begin[] attribute_hidden; #endif /* Static declarations */ @@ -181,7 +181,7 @@ DL_START(unsigned long args) */ if (!auxvt[AT_BASE].a_un.a_val) - auxvt[AT_BASE].a_un.a_val = (Elf32_Addr) &_begin; + auxvt[AT_BASE].a_un.a_val = (ElfW(Addr)) &_begin; /* Note: if the dynamic linker itself is prelinked, the load_addr is 0 */ DL_INIT_LOADADDR_BOOT(load_addr, elf_machine_load_address()); #else diff --git a/libc/signal/sigaddset.c b/libc/signal/sigaddset.c index 7e800a7..837f653 100644 --- a/libc/signal/sigaddset.c +++ b/libc/signal/sigaddset.c @@ -30,6 +30,7 @@ sigaddset (sigset_t *set, int signo) return -1; } - return __sigaddset (set, signo); + __sigaddset (set, signo); + return 0; } libc_hidden_def(sigaddset) diff --git a/libc/signal/sigdelset.c b/libc/signal/sigdelset.c index de3b12f..9f3ab66 100644 --- a/libc/signal/sigdelset.c +++ b/libc/signal/sigdelset.c @@ -29,6 +29,7 @@ int sigdelset (sigset_t *set, int signo) return -1; } - return __sigdelset (set, signo); + __sigdelset (set, signo); + return 0; } libc_hidden_def(sigdelset) diff --git a/libc/sysdeps/linux/common/bits/sigset.h b/libc/sysdeps/linux/common/bits/sigset.h index beb8598..f220e81 100644 --- a/libc/sysdeps/linux/common/bits/sigset.h +++ b/libc/sysdeps/linux/common/bits/sigset.h @@ -154,9 +154,9 @@ typedef struct { # if !defined __USE_EXTERN_INLINES || defined __PROVIDE_OUT_OF_LINE_SIGSETFN extern int __sigismember (const __sigset_t *, int); libc_hidden_proto(__sigismember) -extern int __sigaddset (__sigset_t *, int); +extern void __sigaddset (__sigset_t *, int); libc_hidden_proto(__sigaddset) -extern int __sigdelset (__sigset_t *, int); +extern void __sigdelset (__sigset_t *, int); libc_hidden_proto(__sigdelset) # endif @@ -169,18 +169,19 @@ libc_hidden_proto(__sigdelset) * will have its own copy of out-of line function emitted. */ # define _EXTERN_INLINE /*extern*/ __always_inline # endif -# define __SIGSETFN(NAME, BODY, CONST) \ -_EXTERN_INLINE int \ +# define __SIGSETFN(RET_TYPE, NAME, BODY, CONST) \ +_EXTERN_INLINE RET_TYPE \ NAME (CONST __sigset_t *__set, int __sig) \ { \ unsigned long __mask = __sigmask (__sig); \ unsigned __word = __sigword (__sig); \ - return BODY; \ + BODY; \ } -__SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, const) -__SIGSETFN (__sigaddset, ((__set->__val[__word] |= __mask), 0), ) -__SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), ) +__SIGSETFN (int, __sigismember, return (__set->__val[__word] & __mask) ? 1 : 0, + const) +__SIGSETFN (void, __sigaddset, (__set->__val[__word] |= __mask), ) +__SIGSETFN (void, __sigdelset, (__set->__val[__word] &= ~__mask), ) # undef __SIGSETFN # endif @@ -207,7 +208,7 @@ const_sigaddset(__sigset_t *set, int sig) set->__val[word] |= mask; } # define __sigaddset(set, sig) \ - (__builtin_constant_p(sig) ? (const_sigaddset(set, sig), 0) : __sigaddset(set, sig)) + (__builtin_constant_p(sig) ? const_sigaddset(set, sig) : __sigaddset(set, sig)) static __always_inline void const_sigdelset(__sigset_t *set, int sig) { @@ -216,7 +217,7 @@ const_sigdelset(__sigset_t *set, int sig) set->__val[word] &= ~mask; } # define __sigdelset(set, sig) \ - (__builtin_constant_p(sig) ? (const_sigdelset(set, sig), 0) : __sigdelset(set, sig)) + (__builtin_constant_p(sig) ? const_sigdelset(set, sig) : __sigdelset(set, sig)) # endif #endif /* ! _SIGSET_H_fns. */ diff --git a/libc/sysdeps/linux/sparc/clone.S b/libc/sysdeps/linux/sparc/clone.S index 8d9da5a..1d0e3e6 100644 --- a/libc/sysdeps/linux/sparc/clone.S +++ b/libc/sysdeps/linux/sparc/clone.S @@ -22,7 +22,9 @@ #include <asm/errno.h> #include <asm/unistd.h> +#ifdef RESET_PID #include <tcb-offsets.h> +#endif #include <sysdep.h> #define CLONE_VM 0x00000100 hooks/post-receive -- uClibc-ng - small C library for embedded systems