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
Kernel - Added a per-thread timer object to reduce malloc use
[tpg/acess2.git]
/
AcessNative
/
ld-acess_src
/
Makefile
diff --git
a/AcessNative/ld-acess_src/Makefile
b/AcessNative/ld-acess_src/Makefile
index
5a604a3
..
af7f8c8
100644
(file)
--- a/
AcessNative/ld-acess_src/Makefile
+++ b/
AcessNative/ld-acess_src/Makefile
@@
-5,8
+5,8
@@
ifeq ($(PLATFORM),)
PLATFORM := lin
endif
PLATFORM := lin
endif
-OBJ := main.o syscalls.o request.o binary.o memory.o
-OBJ += elf.o
+OBJ := main.o syscalls.o request.o binary.o memory.o
exports.o
+OBJ += elf.o
elf_load.o
OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))
ifeq ($(PLATFORM),win)
OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))
ifeq ($(PLATFORM),win)
@@
-14,10
+14,15
@@
ifeq ($(PLATFORM),win)
endif
ifeq ($(PLATFORM),lin)
BIN := ../ld-acess
endif
ifeq ($(PLATFORM),lin)
BIN := ../ld-acess
- LD += -m elf_i386
+ LINKADDR := 0x200000
+# LD += -m elf_i386
endif
endif
-CFLAGS += -Wall -Werror -g -m32
+CFLAGS += -Wall
+CFLAGS += -Werror
+CFLAGS += -g
+CPPFLAGS += -DARCHDIR_is_x86_64=1
+LDFLAGS += -g -Wl,-T,obj-$(PLATFORM)/link.ld
DEPFILES = $(filter %.o,$(OBJ))
DEPFILES := $(DEPFILES:%=%.dep)
DEPFILES = $(filter %.o,$(OBJ))
DEPFILES := $(DEPFILES:%=%.dep)
@@
-27,10
+32,10
@@
DEPFILES := $(DEPFILES:%=%.dep)
all: $(BIN)
clean:
all: $(BIN)
clean:
- $(RM) $(BIN) $(OBJ) $(DEPFILES)
+ $(RM) $(BIN) $(OBJ) $(DEPFILES)
obj-$(PLATFORM)/link.ld
$(BIN): obj-$(PLATFORM)/link.ld $(OBJ)
$(BIN): obj-$(PLATFORM)/link.ld $(OBJ)
- $(CC)
-g -o $@ $(OBJ) -m32 -Wl,-T,obj-$(PLATFORM)/link.ld
+ $(CC)
$(LDFLAGS) -o $@ $(OBJ)
obj-$(PLATFORM)/%.o: %.c
@mkdir -p $(dir $@)
obj-$(PLATFORM)/%.o: %.c
@mkdir -p $(dir $@)
@@
-42,7
+47,7
@@
obj-$(PLATFORM)/%.o: %.c
obj-lin/link.ld:
@mkdir -p $(dir $@)
@echo "Making Linker Script ($@)"
obj-lin/link.ld:
@mkdir -p $(dir $@)
@echo "Making Linker Script ($@)"
-
@$(LD) --verbose | awk '{ if( substr($$0,0,5) == "====="){ bPrint = !bPrint; } else { if(bPrint){ print $$0;} } }' | sed 's/\b0x0[08][0-9]*\b/0x00100
000/g' > $@
+
$(LD) --verbose | awk '{ if( substr($$0,0,5) == "====="){ bPrint = !bPrint; } else { if(bPrint){ print $$0;} } }' | sed 's/\b0x[048][0-9]*\b/$(LINKADDR)/g' | sed 's/CONSTANT (MAXPAGESIZE)/0x1
000/g' > $@
-include $(DEPFILES)
-include $(DEPFILES)
UCC
git Repository :: git.ucc.asn.au