m4 portability fix for ALIGN macro.

59334213 · Niels Möller · ee6ff2cc · 59334213 · 59334213
Commit 59334213 authored Jul 12, 2012 by Niels Möller
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

ChangeLog ChangeLog +5 -0

asm.m4 asm.m4 +7 -2

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+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.

--- 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