From: Niels Möller <nisse@lysator.liu.se>
Date: Wed, 26 Apr 2006 20:05:45 +0000 (+0200)
Subject: * config.m4.in (ASM_ALIGN_LOG): Substitute.
X-Git-Tag: head_before_experimental_merge_20060516~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b86fb5790c31ac02daf7ec1821a8a424ce0476c9;p=thirdparty%2Fnettle.git

* config.m4.in (ASM_ALIGN_LOG): Substitute.
* configure.ac (ASM_ALIGN_LOG): Check if .align directive is
logarithmic.
* asm.m4 (ALIGN): New macro. Takes a logarithmic argument, and
expands to a .align directive.

Rev: src/nettle/asm.m4:1.16
Rev: src/nettle/config.m4.in:1.6
---

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