X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=ed1d524f8fec9cf9f3026a1fe1ebb8290a9b1828;hb=2466d8183310cb2b3118a0cc9eb26189a900863e;hp=228337a965ffec2fd5059d775542e310e9633895;hpb=daa2dea5fb8276806608b514001246b14374e058;p=musl-tables

diff --git a/Makefile b/Makefile
index 228337a..ed1d524 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,19 @@
-MUSL=../musl
-
-all: tables sizeof abi
+all: tables abi
 
 clean:
 	rm -f sizeof*.o sizeof-glibc sizeof-musl sizeof.diff tab_*.html
 
 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
+
+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 >$@
+
 
 sizeof: sizeof-glibc sizeof-musl
 	./sizeof-glibc >data/sizeof.ARCH.glibc
@@ -33,16 +40,16 @@ sizeof-g++: sizeof.c
 	g++ -std=gnu99 -nostdinc -fno-stack-protector -isystem $(MUSL)/include -isystem $(LIBGCC) -isystem /usr/include -c -o $@.o $<
 	ld -o $@ $@.o -X -d -e _start -Bstatic $(MUSL)/lib/crti.o $(MUSL)/lib/crt1.o $(MUSL)/lib/crtn.o -L$(MUSL)/lib -lc -L$(LIBGCC) -lgcc -nostdlib
 
-abi: abi.ARCH.diff
-	cp abi.ARCH.* data/
-
-abi.cc:
-	./abi.sh
-abi.ARCH.glibc: abi.cc
-	g++ -c -o $@.o $<
-	nm $@.o |sed -n 's/^[[:xdigit:]]* T //p' |c++filt >$@
-abi.ARCH.musl: abi.cc
-	g++ -nostdinc -fno-stack-protector -isystem $(MUSL)/include -isystem $(LIBGCC) -isystem /usr/include -c -o $@.o $<
-	nm $@.o |sed -n 's/^[[:xdigit:]]* T //p' |c++filt >$@
+#abi: abi.ARCH.diff
+#	cp abi.ARCH.* data/
+
+#abi_type.cc:
+#	./abi_type.sh
+abi.ARCH.glibc: abi_type.cc
+	g++ -std=c++11 $(GLIBC_FLAGS) -c -o $@.o $<
+	nm -C $@.o |sed -n 's/^[[:xdigit:]]* T //p' |sort >$@
+abi.ARCH.musl: abi_type.cc
+	g++ -std=c++11 -nostdinc -fno-stack-protector -isystem $(MUSL)/include -isystem $(LIBGCC) -isystem /usr/include -c -o $@.o $<
+	nm -C $@.o |sed -n 's/^[[:xdigit:]]* T //p' |sort >$@
 abi.ARCH.diff:  abi.ARCH.glibc abi.ARCH.musl
 	diff -U0 $^ >$@ || true