X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=afb6f3d8d15c8cdd7d0dc6f2994b16868f9af94d;hb=69c32b809237fd0b2881401d6bf5ee25fc7d3032;hp=d108ee2aa58d4a11c5e13522cfb6f4116934a0ab;hpb=03f81c7c806f629e8f9fd844732cdce2eb23db92;p=musl-tables

diff --git a/Makefile b/Makefile
index d108ee2..afb6f3d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,29 +5,30 @@ all: tables sizeof
 clean:
 	rm -f sizeof*.o sizeof-glibc sizeof-musl sizeof.diff tab_*.html
 
-tables: tags syms
-	MUSL=$(MUSL) ./tab_c99.sh
-	MUSL=$(MUSL) ./tab_posix.sh
-
-tags:
-	MUSL=$(MUSL) ./maketags.sh
-
-syms:
-	MUSL=$(MUSL) ./makesyms.sh
+tables:
+	MUSL=$(MUSL) ./update.sh
 
 sizeof: sizeof-glibc sizeof-musl
 	./sizeof-glibc >data/glibc.sizeof
 	./sizeof-musl >data/musl.sizeof
-	diff -u data/glibc.sizeof data/musl.sizeof >sizeof.diff || true
+	diff -U1 data/glibc.sizeof data/musl.sizeof >data/sizeof.diff || true
 
 LIBGCC=`gcc -print-file-name=libgcc.a |sed 's,/libgcc.a$$,,'`
 # when compiling with pcc
 #PCC=`pcc -v foobar.o 2>&1 |sed -n 's,.* \([^ ]*\)/lib/crtbegin.o.*,\1,p'`
 
+sizeof.c:
+	./sizeof.sh
+
 sizeof-glibc: sizeof.c
-	gcc -o $@ $<
+	gcc -std=gnu99 -o $@ $<
 sizeof-musl: sizeof.c
-	gcc -std=gnu99 -nostdinc -fno-stack-protector -isystem $(MUSL)/include -isystem $(LIBGCC) -c -o $@.o $<
-	ld -o $@ $@.o $(MUSL)/lib/crti.o $(MUSL)/lib/crt1.o $(MUSL)/lib/crtn.o -L$(MUSL)/lib -lc -L$(LIBGCC) -lgcc -nostdlib
+	gcc -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
+#	ld -o $@ $@.o $(MUSL)/lib/crti.o $(MUSL)/lib/crt1.o $(MUSL)/lib/crtn.o -L$(MUSL)/lib -lc -dynamic-linker $(MUSL)/lib/libc.so -L$(LIBGCC) -lgcc -nostdlib
 #	pcc -nostdinc -isystem $(MUSL)/include -isystem $(PCC)/include -c -o $@.o $<
 #	ld -X -d -e _start -Bstatic -o $@ $@.o $(MUSL)/lib/crti.o $(MUSL)/lib/crt1.o $(PCC)/lib/crtbegin.o $(PCC)/lib/crtend.o -L$(MUSL)/lib -lc -L$(PCC)/lib -lpcc -nostdlib
+
+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