[git commit prelink] arm/bits/atomic.h: Include common/bit/atomic.h for thumb1

Khem Raj raj.khem at gmail.com
Wed Mar 30 11:53:36 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=e25a95a7a3c9f5bb3a38106422b12f83bf58d119
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/prelink

This restores the behavior for thumb1 builds and yet uses
the new atomic.h for arm and thumb2 modes.

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 libc/sysdeps/linux/arm/bits/atomic.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libc/sysdeps/linux/arm/bits/atomic.h b/libc/sysdeps/linux/arm/bits/atomic.h
index 07101fb..0b90330 100644
--- a/libc/sysdeps/linux/arm/bits/atomic.h
+++ b/libc/sysdeps/linux/arm/bits/atomic.h
@@ -16,6 +16,9 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#if defined __thumb__ && !defined __thumb2__
+#include_next <common/bits/atomic.h>
+#else
 #include <stdint.h>
 #include <sysdep.h>
 
@@ -129,3 +132,5 @@ void __arm_link_error (void);
 
 #define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
   ({ __arm_link_error (); oldval; })
+
+#endif
-- 
1.7.3.4



More information about the uClibc-cvs mailing list