Small Makefile cleanups.
This commit is contained in:
@@ -715,9 +715,5 @@ ifneq ($(STUBS),)
|
|||||||
endif
|
endif
|
||||||
-include tmp/*.d
|
-include tmp/*.d
|
||||||
|
|
||||||
# debug
|
|
||||||
hg-diff:
|
|
||||||
hg diff -r 5cca9ba74f3a $(STUBS)
|
|
||||||
|
|
||||||
|
|
||||||
# vi:ts=8:nowrap
|
# vi:ts=8:nowrap
|
||||||
|
|||||||
@@ -27,25 +27,21 @@ lzma_d_c%.S : tc_list = arm-lzma arm-linux.elf default
|
|||||||
lzma_d_c%.S : tc_bfdname = elf32-littlearm
|
lzma_d_c%.S : tc_bfdname = elf32-littlearm
|
||||||
|
|
||||||
tc.arm-lzma.gcc = $(tc.arm-linux.elf.gcc)
|
tc.arm-lzma.gcc = $(tc.arm-linux.elf.gcc)
|
||||||
|
|
||||||
# -fPIC not needed: no globals, no string constants, no &func.
|
# -fPIC not needed: no globals, no string constants, no &func.
|
||||||
# Omitting -fPIC enables general use of r10.
|
# Omitting -fPIC enables general use of r10.
|
||||||
tc.arm-lzma.gcc += -march=armv4
|
tc.arm-lzma.gcc += -march=armv4
|
||||||
|
|
||||||
tc.arm-lzma.gcc += -Os
|
tc.arm-lzma.gcc += -Os
|
||||||
tc.arm-lzma.gcc += -ffunction-sections
|
tc.arm-lzma.gcc += -ffunction-sections
|
||||||
tc.arm-lzma.gcc += -I$(UPX_LZMADIR)
|
tc.arm-lzma.gcc += -I$(UPX_LZMADIR)
|
||||||
tc.arm-lzma.gcc += -I$(top_srcdir)/src
|
tc.arm-lzma.gcc += -I$(top_srcdir)/src
|
||||||
|
|
||||||
lzma_d_cf.S : lzma_d_c.c
|
lzma_d_c%.S : lzma_d_c.c
|
||||||
$(call tc,gcc) $(PP_FLAGS) -S $< -o tmp/$T.s
|
$(call tc,gcc) $(PP_FLAGS) -S $< -o tmp/$T.s
|
||||||
sed -e '1,/LzmaDecode:/d' -e '/\.size/d' -e '/\.ident/d' -e 's/\.L/.Lf/g' <tmp/$T.s >$@
|
sed -e '1,/LzmaDecode:/d' -e '/\.size/d' -e '/\.ident/d' -e 's/\.L/$(LABEL_PREFIX)/g' < tmp/$T.s > $@
|
||||||
|
|
||||||
lzma_d_cs.S : lzma_d_c.c
|
|
||||||
$(call tc,gcc) $(PP_FLAGS) -S $< -o tmp/$T.s
|
|
||||||
sed -e '1,/LzmaDecode:/d' -e '/\.size/d' -e '/\.ident/d' -e 's/\.L/.Ls/g' <tmp/$T.s >$@
|
|
||||||
|
|
||||||
lzma_d_cf.% : PP_FLAGS = -DFAST
|
lzma_d_cf.% : PP_FLAGS = -DFAST
|
||||||
lzma_d_cs.% : PP_FLAGS = -DSMALL
|
lzma_d_cs.% : PP_FLAGS = -DSMALL
|
||||||
|
lzma_d_cf.% : LABEL_PREFIX = .Lf
|
||||||
|
lzma_d_cs.% : LABEL_PREFIX = .Ls
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -33,15 +33,13 @@ tc.arm-lzma.gcc += -ffunction-sections
|
|||||||
tc.arm-lzma.gcc += -I$(UPX_LZMADIR)
|
tc.arm-lzma.gcc += -I$(UPX_LZMADIR)
|
||||||
tc.arm-lzma.gcc += -I$(top_srcdir)/src
|
tc.arm-lzma.gcc += -I$(top_srcdir)/src
|
||||||
|
|
||||||
lzma_d_cf.S : lzma_d_c.c
|
lzma_d_c%.S : lzma_d_c.c
|
||||||
$(call tc,gcc) $(PP_FLAGS) -S $< -o tmp/$T.s
|
$(call tc,gcc) $(PP_FLAGS) -S $< -o tmp/$T.s
|
||||||
sed -e '1,/LzmaDecode:/d' -e '/\.size/d' -e '/\.ident/d' -e 's/\.L/.Lf/g' <tmp/$T.s >$@
|
sed -e '1,/LzmaDecode:/d' -e '/\.size/d' -e '/\.ident/d' -e 's/\.L/$(LABEL_PREFIX)/g' < tmp/$T.s > $@
|
||||||
|
|
||||||
lzma_d_cs.S : lzma_d_c.c
|
|
||||||
$(call tc,gcc) $(PP_FLAGS) -S $< -o tmp/$T.s
|
|
||||||
sed -e '1,/LzmaDecode:/d' -e '/\.size/d' -e '/\.ident/d' -e 's/\.L/.Ls/g' <tmp/$T.s >$@
|
|
||||||
|
|
||||||
lzma_d_cf.% : PP_FLAGS = -DFAST
|
lzma_d_cf.% : PP_FLAGS = -DFAST
|
||||||
lzma_d_cs.% : PP_FLAGS = -DSMALL
|
lzma_d_cs.% : PP_FLAGS = -DSMALL
|
||||||
|
lzma_d_cf.% : LABEL_PREFIX = .Lf
|
||||||
|
lzma_d_cs.% : LABEL_PREFIX = .Ls
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user