11 Jul
2015
11 Jul
'15
8:51 a.m.
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 23424547146e9fd407af501c154656f0688862af (commit)
via 7ad3d87d74dfb9eff68ad1686be400154134a731 (commit)
via 590ae09af786be17812fffad0c43b4c6a1f697f8 (commit)
from 449109519492266410421310ee09ff4a10d7c175 (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 23424547146e9fd407af501c154656f0688862af
Merge: 7ad3d87 4491095
Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org>
Date: Sat Jul 11 10:51:46 2015 +0200
Merge branch '1.0' of git+ssh://uclibc-ng.org/git/uclibc-ng into 1.0
commit 7ad3d87d74dfb9eff68ad1686be400154134a731
Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org>
Date: Sat Jul 11 10:50:59 2015 +0200
tst-sscanf: fix linking for m68k
commit 590ae09af786be17812fffad0c43b4c6a1f697f8
Author: Waldemar Brodkorb <wbx(a)openadk.org>
Date: Wed Jul 8 21:51:48 2015 -0500
builtin_unreachable is not available for older gcc
-----------------------------------------------------------------------
Summary of changes:
ldso/include/dl-syscall.h | 2 +-
libpthread/nptl/forward.c | 4 ++++
test/locale/Makefile.in | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h
index 0acd2ba..46ba07e 100644
--- a/ldso/include/dl-syscall.h
+++ b/ldso/include/dl-syscall.h
@@ -51,7 +51,7 @@ extern int _dl_errno;
static __always_inline attribute_noreturn __cold void _dl_exit(int status)
{
INLINE_SYSCALL(_dl_exit, 1, status);
-#if defined __GNUC__ && !__GNUC_PREREQ (4, 4)
+#if defined __GNUC__ && (!__GNUC_PREREQ (4, 4) && !__GNUC_PREREQ (4, 2))
__builtin_unreachable(); /* shut up warning: 'noreturn' function does return*/
#else
while (1);
diff --git a/libpthread/nptl/forward.c b/libpthread/nptl/forward.c
index a5c97ba..48d38d9 100644
--- a/libpthread/nptl/forward.c
+++ b/libpthread/nptl/forward.c
@@ -160,6 +160,10 @@ FORWARD2(__pthread_unwind,
/* We cannot call abort() here. */
INTERNAL_SYSCALL_DECL (err);
INTERNAL_SYSCALL (kill, err, 1, SIGKILL);
+#if defined __GNUC__ && (!__GNUC_PREREQ (4, 4) && !__GNUC_PREREQ (4, 2))
__builtin_unreachable();
+#else
+ while(1);
+#endif
})
#undef return
diff --git a/test/locale/Makefile.in b/test/locale/Makefile.in
index 5a57ca5..806ea28 100644
--- a/test/locale/Makefile.in
+++ b/test/locale/Makefile.in
@@ -26,4 +26,6 @@ OPTS_dump-ctype = C
OPTS_tst-ctype = < tst-ctype-de_DE.ISO-8859-1.in
OPTS_tst-langinfo = < tst-langinfo.input
+CFLAGS_tst-sscanf = -fPIC
+
EXTRA_DIRS := C
hooks/post-receive
--
uClibc-ng - small C library for embedded systems