From: Niels Möller <nisse@lysator.liu.se>
Date: Thu, 12 Jul 2012 20:36:13 +0000 (+0200)
Subject: m4 portability fix for ALIGN macro.
X-Git-Tag: nettle_2.6_release_20130116~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5933421316cf047db0313f637097c69fb73f0661;p=thirdparty%2Fnettle.git

m4 portability fix for ALIGN macro.
---

diff --git a/ChangeLog b/ChangeLog
index c7f66ab3..88a767aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-12  Niels Möller  <nisse@lysator.liu.se>
+
+	* asm.m4 (ALIGN): Use << operator rather than **, with m4 eval.
+	The latter is not supported by BSD m4.
+
 2012-07-07  Niels Möller  <nisse@lysator.liu.se>
 
 	Copyright headers: Updated FSF address. Patch from David Woodhouse.
diff --git a/asm.m4 b/asm.m4
index e2721d4b..d632585b 100644
--- a/asm.m4
+++ b/asm.m4
@@ -23,9 +23,14 @@ define(<EPILOGUE>,
 <.size C_NAME($1), . - C_NAME($1)>,<>)>)
 
 dnl Argument to ALIGN is always logarithmic
-dnl Can't use << operator with our choice of quote characters...
+
+dnl Need changequote to be able to use the << operator (using **
+dnl instead is not portable, and is not supported by openbsd m4).
 define(<ALIGN>,
-<.align ifelse(ALIGN_LOG,yes,$1,eval(2 ** $1))>)
+<changequote([,])dnl
+.align ifelse(ALIGN_LOG,yes,$1,eval(1 << $1))dnl >> balance
+changequote(<,>)dnl
+>)
 
 dnl Struct defining macros