aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2022-11-17 11:55:43 +0000
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2022-11-17 12:08:41 +0000
commit9ace52019cab223febddb3fcd166b6b4ba64081f (patch)
tree7449af41545a5fc0192feaf25b8fcd922abf4580
parentdf9815ceabe700880890ab7baf00ba0d853f3b57 (diff)
downloadarm-optimized-routines-9ace52019cab223febddb3fcd166b6b4ba64081f.tar.gz
string: arm: Refactor ENTRY/END macros
The .fnstart/.fnend directives can be inlined now that asmdefs.h is arm specific.
-rw-r--r--string/arm/asmdefs.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/string/arm/asmdefs.h b/string/arm/asmdefs.h
index 8f21a78..e311888 100644
--- a/string/arm/asmdefs.h
+++ b/string/arm/asmdefs.h
@@ -8,15 +8,6 @@
#ifndef _ASMDEFS_H
#define _ASMDEFS_H
-#define ARM_FNSTART .fnstart
-#if defined (IS_LEAF)
-# define ARM_FNEND \
- .cantunwind \
- .fnend
-#else
-# define ARM_FNEND .fnend
-#endif
-
/* Check whether leaf function PAC signing has been requested in the
-mbranch-protect compile-time option. */
#define LEAF_PROTECT_BIT 2
@@ -454,13 +445,12 @@
.endif
.endm
-
#define ENTRY_ALIGN(name, alignment) \
.global name; \
.type name,%function; \
.align alignment; \
name: \
- ARM_FNSTART; \
+ .fnstart; \
.cfi_startproc;
#define ENTRY(name) ENTRY_ALIGN(name, 6)
@@ -470,9 +460,16 @@
.type name,%function; \
name:
+#if defined (IS_LEAF)
+# define END_UNWIND .cantunwind;
+#else
+# define END_UNWIND
+#endif
+
#define END(name) \
.cfi_endproc; \
- ARM_FNEND; \
+ END_UNWIND \
+ .fnend; \
.size name, .-name;
#define L(l) .L ## l