summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2018-07-25 20:33:41 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2018-07-25 20:35:57 +0100
commit273644886b6c4a284d5e8e7788b9680f6ffec198 (patch)
tree87b8f621a018cc756ee347f0612b59f450669421 /sys-libs/libunwind/files
parentwww-apps/drupal: Bump to 8.5.5 release. (diff)
downloadgentoo-273644886b6c4a284d5e8e7788b9680f6ffec198.tar.gz
gentoo-273644886b6c4a284d5e8e7788b9680f6ffec198.tar.bz2
gentoo-273644886b6c4a284d5e8e7788b9680f6ffec198.zip
sys-libs/libunwind: use __asm__ instead of asm (bug #635674)
An upstream patch ca6b6f3ad9190 "libunwind-arm: fix build failure due to asm()" should improve support for building mesa on arm. Reported-by: Maciej S. Szmigiero Closes: https://bugs.gentoo.org/635674 Package-Manager: Portage-2.3.43, Repoman-2.3.10
Diffstat (limited to 'sys-libs/libunwind/files')
-rw-r--r--sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch b/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch
new file mode 100644
index 000000000000..4b6debabefcf
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/635674
+
+From ca6b6f3ad9190814ef7869e8c7e73dae0922f647 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@smile.fr>
+Date: Mon, 3 Jul 2017 15:31:10 +0200
+Subject: [PATCH] libunwind-arm: fix build failure due to asm()
+
+mesa3d on ARM build with libunwind support enabled fail to build due to asm()
+function used when building with -std=c99.
+The gcc documentation [1] suggest to use __asm__ instead of asm.
+
+Fixes:
+https://urldefense.proofpoint.com/v2/url?u=http-3A__autobuild.buildroot.net_results_3ef_3efe156b6494e4392b6c31de447ee2c72acc1a53&d=DwICAg&c=5VD0RTtNlTh3ycd41b3MUw&r=vou6lT5jmE_fWQWZZgNrsMWu4RT87QAB9V07tPHlP5U&m=BlAszRQ0vewy5vW7raCh9FmNOACKez_juz55zoiNfUs&s=4sXL6_rFriQz7qi5ygKXBIVHMc7YSdCBnkkHoi347CU&e=
+
+[1] https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
+
+Signed-off-by: Romain Naour <romain.naour@smile.fr>
+Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ include/libunwind-arm.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h
+index f208487a..1c856faf 100644
+--- a/include/libunwind-arm.h
++++ b/include/libunwind-arm.h
+@@ -265,7 +265,7 @@ unw_tdep_context_t;
+ #ifndef __thumb__
+ #define unw_tdep_getcontext(uc) (({ \
+ unw_tdep_context_t *unw_ctx = (uc); \
+- register unsigned long *unw_base asm ("r0") = unw_ctx->regs; \
++ register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs; \
+ __asm__ __volatile__ ( \
+ "stmia %[base], {r0-r15}" \
+ : : [base] "r" (unw_base) : "memory"); \
+@@ -273,7 +273,7 @@ unw_tdep_context_t;
+ #else /* __thumb__ */
+ #define unw_tdep_getcontext(uc) (({ \
+ unw_tdep_context_t *unw_ctx = (uc); \
+- register unsigned long *unw_base asm ("r0") = unw_ctx->regs; \
++ register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs; \
+ __asm__ __volatile__ ( \
+ ".align 2\nbx pc\nnop\n.code 32\n" \
+ "stmia %[base], {r0-r15}\n" \
+--
+2.18.0
+