From 7317cc3345e033d52594fb934d922514a49e8ff6 Mon Sep 17 00:00:00 2001
From: nsz <nsz@port70.net>
Date: Mon, 28 Oct 2019 20:04:48 +0000
Subject: [PATCH] update makefile

---
 Makefile     | 23 +++++++++++++++++------
 abi_type.sh  |  1 +
 makedecls.sh |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ed1d524..fec8438 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,26 @@ clean:
 
 tables:
 	MUSL=$(MUSL) ./update.sh
-abi: data/abi_type.x86_64.musl data/abi_func.x86_64.musl
 
-abi_type.x86_64.cc abi_func.cc: tables
+ARCH = x86_64 i386 arm mips m68k powerpc sh x32
 
-data/abi_type.x86_64.musl: abi_type.x86_64.cc
-	CXX='g++ -nostdinc -isystem /tmp/T.x86_64/include' ./abi_type_data.sh >$@
-data/abi_func.x86_64.musl: abi_func.cc
-	CXX='g++ -nostdinc -isystem /tmp/T.x86_64/include' ./abi_func_data.sh >$@
+abi: $(ARCH:%=data/abi_type.%.musl) $(ARCH:%=data/abi_func.%.musl)
 
+$(ARCH:%=abi_type.%.cc) abi_func.cc: tables
+
+T-x86_64 = x86_64-linux-musl
+T-i386 = i486-linux-musl
+T-arm = arm-linux-musleabi
+T-mips = mips-linux-musl
+T-m68k = m68k-linux-musl
+T-powerpc = powerpc-linux-musl
+T-sh = sh4-linux-musl
+T-x32 = x86_64-linux-muslx32
+
+data/abi_type.%.musl: abi_type.%.cc
+	ARCH=$* CXX='$(T-$*)-g++ -nostdinc -isystem /tmp/T.$*/include' ./abi_type_data.sh >$@
+data/abi_func.%.musl: abi_func.cc
+	CXX='$(T-$*)-g++ -nostdinc -isystem /tmp/T.$*/include' ./abi_func_data.sh >$@
 
 sizeof: sizeof-glibc sizeof-musl
 	./sizeof-glibc >data/sizeof.ARCH.glibc
diff --git a/abi_type.sh b/abi_type.sh
index 50d283a..9120c3f 100755
--- a/abi_type.sh
+++ b/abi_type.sh
@@ -6,6 +6,7 @@ ALL='
 aarch64
 arm
 i386
+m68k
 microblaze
 mips
 mips64
diff --git a/makedecls.sh b/makedecls.sh
index db5938b..ca99085 100755
--- a/makedecls.sh
+++ b/makedecls.sh
@@ -11,6 +11,7 @@ ALL='
 aarch64
 arm
 i386
+m68k
 microblaze
 mips
 mips64
-- 
2.20.1