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 b84f9eb4822eae5b23bab7262a73316f3c003ea5..32e24bafd7924bffb4a5d836d04bc9f201614b7c 100644 (file)
--- 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 7c96cb754fbe3df595b470598b5a314fa4932a69..68e8be9e61cf16ad320f68339dc60bfc497656e3 100644 (file)
--- 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>