git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://localhost/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
3dfe1fb
..
4dc43e1
100644
(file)
--- a/
Usermode/Libraries/libc.so_src/Makefile
+++ b/
Usermode/Libraries/libc.so_src/Makefile
@@
-4,18
+4,35
@@
-include ../Makefile.cfg
\r
\r
CPPFLAGS +=
\r
-include ../Makefile.cfg
\r
\r
CPPFLAGS +=
\r
-CFLAGS += -Werror -Wextra
\r
+CFLAGS += -
nostdlib -Wall -
Werror -Wextra
\r
ASFLAGS +=
\r
ASFLAGS +=
\r
-LDFLAGS += -soname libc.so -Map map.txt -lgcc
\r
+LDFLAGS += -nostdlib
\r
+PRELINK := $(CRTI) $(CRTBEGINS) $(CRTS)
\r
+LIBS += $(LIBGCC_PATH) $(CRTENDS) $(CRTN)
\r
\r
INCFILES := stdio.h stdlib.h
\r
\r
\r
INCFILES := stdio.h stdlib.h
\r
\r
-OBJ = stub.o heap.o stdlib.o env.o fileIO.o string.o select.o rand.o
\r
-OBJ += perror.o scanf.o
\r
+OBJ = stub.o heap.o stdlib.o env.o string.o rand.o
\r
+OBJ += scanf.o signals.o strtoi.o strtof.o
\r
+OBJ += printf.o time.o timeconv.o errno.o ctype.o
\r
+OBJ += stdio.o stdio_files.o
\r
OBJ += arch/$(ARCHDIR).ao
\r
# signals.o
\r
DEPFILES := $(OBJ:%.o=%.d)
\r
BIN = libc.so
\r
OBJ += arch/$(ARCHDIR).ao
\r
# signals.o
\r
DEPFILES := $(OBJ:%.o=%.d)
\r
BIN = libc.so
\r
+ifeq ($(ARCHDIR),native)
\r
+ OBJ := $(filter-out heap.o,$(OBJ)) heap_native.o
\r
+ #LDFLAGS += -l c
\r
+ BIN = libc_acess.so
\r
+endif
\r
\r
include ../Makefile.tpl
\r
\r
\r
include ../Makefile.tpl
\r
\r
+EXP_%.txt: TEST_%.native
\r
+ ./$< > $@
\r
+ rm $<
\r
+EXP_strtoi.txt:
\r
+ echo -n "" > $@
\r
+
\r
+%.native: %.c
\r
+ $(NCC) $< -o $@ -Wall -std=gnu99
\r
UCC
git Repository :: git.ucc.asn.au