refactor headers, especially alltypes.h, and improve C++ ABI compat

[musl] / Makefile

diff --git a/Makefile b/Makefile
index 2fb1c99..b9b7807 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -73,10 +73,10 @@ include/bits:
        @test "$(ARCH)" || { echo "Please set ARCH in config.mak before running make." ; exit 1 ; }
        ln -sf ../arch/$(ARCH)/bits $@
 
        @test "$(ARCH)" || { echo "Please set ARCH in config.mak before running make." ; exit 1 ; }
        ln -sf ../arch/$(ARCH)/bits $@
 

-include/bits/alltypes.h.sh: include/bits
+include/bits/alltypes.h.in: include/bits

 
 

-include/bits/alltypes.h: include/bits/alltypes.h.sh
-       sh $< > $@
+include/bits/alltypes.h: include/bits/alltypes.h.in include/alltypes.h.in tools/mkalltypes.sed
+       sed -f tools/mkalltypes.sed include/bits/alltypes.h.in include/alltypes.h.in > $@

 
 src/ldso/dynlink.lo: arch/$(ARCH)/reloc.h
 
 
 src/ldso/dynlink.lo: arch/$(ARCH)/reloc.h