49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
|
From bbd7151f7980c7d075fe652331f01d3aadc73e42 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||
|
|
Date: Mon, 8 Aug 2016 06:41:03 +0200
|
||
|
|
Subject: [PATCH] arm: fix compile in thumb mode
|
||
|
|
|
||
|
|
Fix a regression introduced by commit
|
||
|
|
0550ecce0e6580c5ad34e9a9a39ff18ccf8774f9
|
||
|
|
|
||
|
|
Reported by Buildroot developers.
|
||
|
|
|
||
|
|
Embedded test must be extented to ARMv7 thumb2 builds to
|
||
|
|
find such regressions next time. It wasn't triggered by a
|
||
|
|
cortex-m4 ARM noMMU build.
|
||
|
|
|
||
|
|
[yann.morin.1998@free.fr: backport from upstream]
|
||
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||
|
|
---
|
||
|
|
libc/sysdeps/linux/arm/bits/syscalls.h | 7 +++----
|
||
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libc/sysdeps/linux/arm/bits/syscalls.h b/libc/sysdeps/linux/arm/bits/syscalls.h
|
||
|
|
index 5b30564..6c62a9e 100644
|
||
|
|
--- a/libc/sysdeps/linux/arm/bits/syscalls.h
|
||
|
|
+++ b/libc/sysdeps/linux/arm/bits/syscalls.h
|
||
|
|
@@ -43,6 +43,9 @@
|
||
|
|
}) \
|
||
|
|
)
|
||
|
|
|
||
|
|
+#define INTERNAL_SYSCALL_ARM(name, err, nr, args...) \
|
||
|
|
+ INTERNAL_SYSCALL_NCS(__ARM_NR_##name, err, nr, args)
|
||
|
|
+
|
||
|
|
#if defined(__thumb__)
|
||
|
|
/* We can't use push/pop inside the asm because that breaks
|
||
|
|
unwinding (ie. thread cancellation).
|
||
|
|
@@ -83,10 +86,6 @@
|
||
|
|
} \
|
||
|
|
(int) __internal_sys_result; }) \
|
||
|
|
)
|
||
|
|
-
|
||
|
|
-#undef INTERNAL_SYSCALL_ARM
|
||
|
|
-#define INTERNAL_SYSCALL_ARM(name, err, nr, args...) \
|
||
|
|
- INTERNAL_SYSCALL_NCS(__ARM_NR_##name, err, nr, args)
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#define INTERNAL_SYSCALL_ERROR_P(val, err) \
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|