summaryrefslogtreecommitdiffstats
path: root/sys/arm/include
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-09-09 22:24:01 +0000
committerian <ian@FreeBSD.org>2014-09-09 22:24:01 +0000
commit8a1958876831eb70c472ced915114915eafb844a (patch)
treee54bc1142cf9ebc5791f625d6b51d3604bdf427e /sys/arm/include
parent30e366f556dde8950782845d6a3bdbc2c5a84b6f (diff)
downloadFreeBSD-src-8a1958876831eb70c472ced915114915eafb844a.zip
FreeBSD-src-8a1958876831eb70c472ced915114915eafb844a.tar.gz
MFC r270882, r270930:
In ARM asm code, ensure that every ENTRY(foo) has a matching END(foo). The EABI unwind info requires a .fnend for every .fnstart, and newer binutils will complain about seeing two .fnstart in a row. This change allows newer tools to compile our code. Do not generate unwind info in asm functions if _STANDALONE is defined. The .fnend op causes the assembler to emit RELOC references to unwind support functions that don't exist in libstand. Approved by: re(gjb)
Diffstat (limited to 'sys/arm/include')
-rw-r--r--sys/arm/include/asm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
index 1229c1c..231d559 100644
--- a/sys/arm/include/asm.h
+++ b/sys/arm/include/asm.h
@@ -53,7 +53,7 @@
# define _ALIGN_TEXT .align 0
#endif
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) && !defined(_STANDALONE)
#define STOP_UNWINDING .cantunwind
#define _FNSTART .fnstart
#define _FNEND .fnend
OpenPOWER on IntegriCloud