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
Usermode/libc - Minor fix to memmove
[tpg/acess2.git]
/
Usermode
/
Libraries
/
ld-acess.so_src
/
Makefile
diff --git
a/Usermode/Libraries/ld-acess.so_src/Makefile
b/Usermode/Libraries/ld-acess.so_src/Makefile
index
d451b2c
..
4dc881c
100644
(file)
--- a/
Usermode/Libraries/ld-acess.so_src/Makefile
+++ b/
Usermode/Libraries/ld-acess.so_src/Makefile
@@
-8,19
+8,30
@@
OBJ := main.o lib.o loadlib.o export.o elf.o pe.o
OBJ += arch/$(ARCHDIR).ao_
BIN = ld-acess.so
EXTRABIN := libld-acess.so
OBJ += arch/$(ARCHDIR).ao_
BIN = ld-acess.so
EXTRABIN := libld-acess.so
-EXTRACLEAN
:
= $(_OBJPREFIX)_stublib.o
+EXTRACLEAN = $(_OBJPREFIX)_stublib.o
INCFILES := sys/sys.h
INCFILES := sys/sys.h
-CFLAGS = -g -Wall -fno-builtin -fno-leading-underscore -fno-stack-protector -fPIC
+CFLAGS = -g -Wall -fno-builtin -fno-stack-protector -fPIC -std=c99
+# -fno-leading-underscore
CFLAGS += $(CPPFLAGS)
LDFLAGS = -g -T arch/$(ARCHDIR).ld -Map map.txt --export-dynamic
CFLAGS += $(CPPFLAGS)
LDFLAGS = -g -T arch/$(ARCHDIR).ld -Map map.txt --export-dynamic
+ifeq ($(ARCH),native)
+XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
+$(XBIN): obj-$(ARCH)/_stublib.o
+all: $(XBIN)
+CFLAGS += -ffreestanding
+LDFLAGS :=
+BIN :=
+OBJ :=
+endif
+
include ../Makefile.tpl
# create libld-acess.so
$(_XBIN): $(_OBJPREFIX)_stublib.o
@echo [LD] -o -shared libld-acess.so
include ../Makefile.tpl
# create libld-acess.so
$(_XBIN): $(_OBJPREFIX)_stublib.o
@echo [LD] -o -shared libld-acess.so
- $(LD) -shared -o $@ $<
$(LDFLAGS)
+ $(LD) -shared -o $@ $<
# @$(LD) $(LDFLAGS) -o $@ $(OBJ)
# @$(LD) $(LDFLAGS) -o $@ $(OBJ)
@@
-38,5
+49,7
@@
$(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX): arch/$(ARCHDIR).$(ASSUFFIX).h arch/sys
@mkdir -p $(dir $@)
@$(CPP) $(CPPFLAGS) -P -D__ASSEMBLER__ $< -o $@
@mkdir -p $(dir $@)
@$(CPP) $(CPPFLAGS) -P -D__ASSEMBLER__ $< -o $@
+$(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX): $(ACESSDIR)/KernelLand/Kernel/include/syscalls.h
+
$(_OBJPREFIX)_stublib.o: arch/syscalls.s.h
$(_OBJPREFIX)_stublib.o: arch/syscalls.s.h
UCC
git Repository :: git.ucc.asn.au