summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm.m44
-rw-r--r--config.m4.in7
2 files changed, 8 insertions, 3 deletions
diff --git a/asm.m4 b/asm.m4
index 99c72c01..199f0882 100644
--- a/asm.m4
+++ b/asm.m4
@@ -23,6 +23,10 @@ define(<EPILOGUE>,
<.L$1end:
.size C_NAME($1), .L$1end - C_NAME($1)>,)>)
+dnl Argument to ALIGN is always logarithmic
+dnl Can't use << operator with our choice of quote characters...
+define(<ALIGN>,
+<.align ifelse(ALIGN_LOG,yes,$1,eval(2 ** $1))>)
dnl Struct defining macros
diff --git a/config.m4.in b/config.m4.in
index e7e3ae29..ec625731 100644
--- a/config.m4.in
+++ b/config.m4.in
@@ -1,7 +1,8 @@
define(<srcdir>, <<@srcdir@>>)dnl
-define(<C_NAME>, <@ASM_SYMBOL_PREFIX@><$1>)
-define(<ELF_STYLE>, <@ASM_ELF_STYLE@>)
-define(<TYPE_FUNCTION>, <@ASM_TYPE_FUNCTION@>)
+define(<C_NAME>, <@ASM_SYMBOL_PREFIX@><$1>)dnl
+define(<ELF_STYLE>, <@ASM_ELF_STYLE@>)dnl
+define(<TYPE_FUNCTION>, <@ASM_TYPE_FUNCTION@>)dnl
+define(<ALIGN_LOG>, <@ASM_ALIGN_LOG@>)dnl
divert(1)
@ASM_MARK_NOEXEC_STACK@
divert