From 2f4eb16f388b75d16052b8f96ef7fb5c1a4a262c Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Sun, 29 Mar 2020 13:49:57 +0000
Subject: [PATCH] mips64: factor out frame management macros into
 arch/common/common-defs.h

---
 arch/common/common-defs.h | 28 ++++++++++++++++++++++++++++
 arch/mips64/defs.h        | 12 +-----------
 2 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 arch/common/common-defs.h

diff --git a/arch/common/common-defs.h b/arch/common/common-defs.h
new file mode 100644
index 0000000..0f3feea
--- /dev/null
+++ b/arch/common/common-defs.h
@@ -0,0 +1,28 @@
+#ifndef __ARCH_COMMON_COMMON_DEFS_H
+#define __ARCH_COMMON_COMMON_DEFS_H
+
+#ifndef SETUP_FRAME
+# define SETUP_FRAME(__proc)
+#endif
+
+#ifndef PUSH_FRAME
+# define PUSH_FRAME(__proc)
+#endif
+
+#ifndef POP_FRAME
+# define POP_FRAME(__proc)
+#endif
+
+#define FUNC(__proc)					\
+	.globl 	__proc;					\
+	.align  2;					\
+	.type   __proc, @function;			\
+	.ent    __proc, 0;				\
+__proc:							\
+	SETUP_FRAME(__proc)
+
+#define END(__proc)					\
+	.end	__proc;					\
+	.size	__proc,.-__proc;
+
+#endif
diff --git a/arch/mips64/defs.h b/arch/mips64/defs.h
index 3a9685d..cb2fdbd 100644
--- a/arch/mips64/defs.h
+++ b/arch/mips64/defs.h
@@ -85,16 +85,6 @@
 	.cpreturn;					\
 	daddiu		$sp, FRAMESZ
 
-#define FUNC(__proc)					\
-	.globl 	__proc;					\
-	.align  2;					\
-	.type   __proc, @function;			\
-	.ent    __proc, 0;				\
-__proc:							\
-	SETUP_FRAME(__proc)
-
-#define END(__proc)					\
-	.end	__proc;					\
-	.size	__proc,.-__proc;
+#include <common-defs.h>
 
 #endif