diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-08-08 14:19:57 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-08-08 14:19:57 -0700 |
| commit | 92142c0cfd69f7171695ca68f88fe8407aa8b7e5 (patch) | |
| tree | 51929c583ac838bf0ddb62214494ae7d503b4ca6 | |
| parent | 69a14aa48712cf436b3f31c59b3f9fcc71b5dbb4 (diff) | |
| download | glibc-92142c0cfd69f7171695ca68f88fe8407aa8b7e5.tar.gz glibc-92142c0cfd69f7171695ca68f88fe8407aa8b7e5.tar.xz glibc-92142c0cfd69f7171695ca68f88fe8407aa8b7e5.zip | |
ARM: fix build breakage from sysdeps/unix/sysv/linux/arm/dl-machine.h addition.
| -rw-r--r-- | ports/ChangeLog.arm | 3 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/arm/dl-machine.h | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index b84f9eb482..32e24bafd7 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 7c96cb754f..68e8be9e61 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> |