Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / Makefile

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index c615b6e..64749b3 100644 (file)
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -4,9 +4,11 @@
 -include ../Makefile.cfg\r
 \r
 CPPFLAGS += \r
-CFLAGS   += -Wall -Werror -Wextra\r
+CFLAGS   += -nostdlib -Wall -Werror -Wextra\r
 ASFLAGS  +=\r
-LDFLAGS  += -Map map.txt\r
+LDFLAGS  += -nostdlib\r
+PRELINK  := $(CRTI) $(CRTBEGINS) $(CRT0S)\r
+LIBS     += $(LIBGCC_PATH) $(CRTENDS) $(CRTN)\r
 \r
 INCFILES := stdio.h stdlib.h\r
 \r
@@ -19,7 +21,7 @@ OBJ += arch/$(ARCHDIR).ao
 DEPFILES := $(OBJ:%.o=%.d)\r
 BIN = libc.so\r
 ifeq ($(ARCHDIR),native)\r
- OBJ := $(filter-out heap.o,$(OBJ))\r
+ OBJ := $(filter-out heap.o,$(OBJ)) heap_native.o\r
  #LDFLAGS += -l c\r
  BIN = libc_acess.so\r
 endif\r
@@ -27,8 +29,8 @@ endif
 include ../Makefile.tpl\r
 \r
 EXP_%.txt: TEST_%.native\r
-       ./$< > $@\r
-       rm $<\r
+       @./$< > $@\r
+       @rm $<\r
 EXP_strtoi.txt:\r
        echo -n "" > $@\r
 \r