notaz.gp2x.de
/
ginge.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unset ld env before running command
[ginge.git]
/
loader
/
Makefile
diff --git
a/loader/Makefile
b/loader/Makefile
index
99f0af6
..
e76d5df
100644
(file)
--- a/
loader/Makefile
+++ b/
loader/Makefile
@@
-3,10
+3,11
@@
CROSS_COMPILE ?= arm-linux-
CC = $(CROSS_COMPILE)gcc
AS = $(CROSS_COMPILE)as
CFLAGS += -Wall -ggdb -DLOADER
CC = $(CROSS_COMPILE)gcc
AS = $(CROSS_COMPILE)as
CFLAGS += -Wall -ggdb -DLOADER
-LDFLAGS += -ggdb -lpthread -lrt
+LDFLAGS += -ggdb
+#LDFLAGS += -nodefaultlibs # NYET
ifndef DEBUG
CFLAGS += -O2 -fno-strict-aliasing
ifndef DEBUG
CFLAGS += -O2 -fno-strict-aliasing
-LDFLAGS += -
s -
O2
+LDFLAGS += -O2
endif
ifdef DBG
CFLAGS += -DDBG=$(DBG)
endif
ifdef DBG
CFLAGS += -DDBG=$(DBG)
@@
-16,11
+17,9
@@
ifeq "$(ARCH)" "ia32"
ARCH = ia32
CFLAGS += -m32
LDFLAGS += -m32
ARCH = ia32
CFLAGS += -m32
LDFLAGS += -m32
-ASFLAGS += --32
endif
ifeq "$(ARCH)" "arm"
endif
ifeq "$(ARCH)" "arm"
-ASFLAGS += -mfloat-abi=soft
-OBJ += sys_cacheflush.o emu_arm.o
+OBJ += syscalls.o emu_arm.o
endif
ifdef PND
CFLAGS += -DPND
endif
ifdef PND
CFLAGS += -DPND
@@
-38,7
+37,7
@@
vpath %.s = ../common/
TARGET_S = ginge_sloader$(TAG)
TARGET_D = ginge_dyn$(TAG)
TARGET_S = ginge_sloader$(TAG)
TARGET_D = ginge_dyn$(TAG)
-OBJ += emu.o host.o host_fb.o cmn.o
+OBJ += emu.o host.o host_fb.o cmn.o
llibc.o
OBJ_S += $(OBJ) loader.o loader_$(ARCH).o patches.o
OBJ_D += $(OBJ) dl.o
OBJ_S += $(OBJ) loader.o loader_$(ARCH).o patches.o
OBJ_D += $(OBJ) dl.o
@@
-46,6
+45,7
@@
all: $(TARGET_S) $(TARGET_D)
$(TARGET_S): LDFLAGS += -Wl,-T script_$(ARCH).lds
$(TARGET_D): LDFLAGS += -ldl -Wl,--version-script=ginge_dyn.symver
$(TARGET_S): LDFLAGS += -Wl,-T script_$(ARCH).lds
$(TARGET_D): LDFLAGS += -ldl -Wl,--version-script=ginge_dyn.symver
+$(TARGET_D): LDFLAGS += -Wl,--no-undefined
$(TARGET_S): $(OBJ_S)
$(CC) -o $@ $^ -static $(LDFLAGS)
$(TARGET_S): $(OBJ_S)
$(CC) -o $@ $^ -static $(LDFLAGS)
@@
-53,6
+53,10
@@
$(TARGET_S): $(OBJ_S)
$(TARGET_D): $(OBJ_D)
$(CC) -o $@ $^ -shared $(LDFLAGS)
$(TARGET_D): $(OBJ_D)
$(CC) -o $@ $^ -shared $(LDFLAGS)
+# easier to support old toolchains with this
+%.o: %.s
+ $(CC) -o $@ -c $< $(CFLAGS)
+
clean:
$(RM) $(TARGET_S) $(TARGET_D) $(OBJ_S) $(OBJ_D)
clean:
$(RM) $(TARGET_S) $(TARGET_D) $(OBJ_S) $(OBJ_D)