From 343be0b5877bd7773fe684b1fd913c241b48d75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Mon, 12 Jan 2015 19:06:03 +0100
Subject: [PATCH] Refactor PROLOGUE macro in asm.m4.

---
 ChangeLog |  3 +++
 asm.m4    | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9de966e..291b97d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-12  Niels Möller  <nisse@lysator.liu.se>
 
+	* asm.m4 (DECLARE_FUNC): New macro, extracted from PROLOGUE.
+	(PROLOGUE): Use it.
+
 	* configure.ac (OPT_NETTLE_OBJS, OPT_HOGWEED_OBJS): Renamed
 	substituted variables, and list the object files rather than
 	source files.
diff --git a/asm.m4 b/asm.m4
index d59191e1..68ec6f59 100644
--- a/asm.m4
+++ b/asm.m4
@@ -13,21 +13,20 @@ dnl Including files from the srcdir
 define(<include_src>, <include(srcdir/$1)>)dnl
 
 dnl Pseudo ops
-
-define(<PROLOGUE>,
+define(<DECLARE_FUNC>,
 <ifelse(ELF_STYLE,yes,
-<.globl C_NAME($1)
-.type C_NAME($1),TYPE_FUNCTION
-C_NAME($1):>,
-COFF_STYLE, <yes>,
-<.globl C_NAME($1)
-.def C_NAME($1)
+<.type $1,TYPE_FUNCTION>,
+COFF_STYLE, yes,
+<.def $1
 .scl 2
 .type 32
-.endef
-C_NAME($1):>,
+.endef>,
+<>)>)
+
+define(<PROLOGUE>,
 <.globl C_NAME($1)
-C_NAME($1):>)>)
+DECLARE_FUNC(C_NAME($1))
+C_NAME($1):>)
 
 define(<EPILOGUE>,
 <ifelse(ELF_STYLE,yes,
-- 
GitLab