This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-149-g92142c0
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Aug 2012 21:27:31 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-149-g92142c0
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 "GNU C Library master sources".
The branch, master has been updated
via 92142c0cfd69f7171695ca68f88fe8407aa8b7e5 (commit)
from 69a14aa48712cf436b3f31c59b3f9fcc71b5dbb4 (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 -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=92142c0cfd69f7171695ca68f88fe8407aa8b7e5
commit 92142c0cfd69f7171695ca68f88fe8407aa8b7e5
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Aug 8 14:19:57 2012 -0700
ARM: fix build breakage from sysdeps/unix/sysv/linux/arm/dl-machine.h addition.
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index b84f9eb..32e24ba 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,5 +1,8 @@
2012-08-08 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/unix/sysv/linux/arm/dl-machine.h: Move #include outside of
+ [!dl_machine_h].
+
* sysdeps/unix/sysv/linux/arm/nptl/bits/atomic.h
[!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]
(__arch_compare_and_exchange_val_32_acq): Use uint32_t rather than
diff --git a/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h b/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h
index 7c96cb7..68e8be9 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h
+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h
@@ -22,7 +22,9 @@
#define CLEAR_CACHE(BEG,END) \
INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0)
-/* The rest is just machine-specific. */
-#include <sysdeps/arm/dl-machine.h>
-
#endif
+
+/* The rest is just machine-specific.
+ This #include is outside the #ifndef because the parts of
+ dl-machine.h used only by dynamic-link.h are outside the guard. */
+#include <sysdeps/arm/dl-machine.h>
-----------------------------------------------------------------------
Summary of changes:
ports/ChangeLog.arm | 3 +++
ports/sysdeps/unix/sysv/linux/arm/dl-machine.h | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources