From 3f4419b177f48b492f5cd6a3c6c1836543ec41ac Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Sun, 25 Sep 2016 23:28:15 +0200 Subject: [PATCH] Update stub/src for recent changes. --- src/stub/src/arch/arm/v4a/Makefile.extra | 4 ++-- src/stub/src/arch/arm/v4t/Makefile.extra | 4 ++-- src/stub/src/c/lzma_d_c.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/stub/src/arch/arm/v4a/Makefile.extra b/src/stub/src/arch/arm/v4a/Makefile.extra index 9c55d699..6ce00c73 100644 --- a/src/stub/src/arch/arm/v4a/Makefile.extra +++ b/src/stub/src/arch/arm/v4a/Makefile.extra @@ -29,11 +29,11 @@ include $(top_srcdir)/src/stub/Makefile # // method-lzma # ************************************************************************/ -lzma_d_c%.S : tc_list = method-lzma arm-linux.elf default +lzma_d_c%.S : tc_list = method-lzma arm.v4a-linux.elf default lzma_d_c%.S : tc_bfdname = elf32-littlearm c := tc.method-lzma.gcc -$c = $(tc.arm-linux.elf.gcc) +$c = $(tc.arm.v4a-linux.elf.gcc) # -fPIC not needed: no globals, no string constants, no &func. # Omitting -fPIC enables general use of r10. $c += -march=armv4 diff --git a/src/stub/src/arch/arm/v4t/Makefile.extra b/src/stub/src/arch/arm/v4t/Makefile.extra index 2f6a037b..b94f5f3a 100644 --- a/src/stub/src/arch/arm/v4t/Makefile.extra +++ b/src/stub/src/arch/arm/v4t/Makefile.extra @@ -29,11 +29,11 @@ include $(top_srcdir)/src/stub/Makefile # // method-lzma # ************************************************************************/ -lzma_d_c%.S : tc_list = method-lzma arm-linux.elf default +lzma_d_c%.S : tc_list = method-lzma arm.v4a-linux.elf default lzma_d_c%.S : tc_bfdname = elf32-littlearm c := tc.method-lzma.gcc -$c = $(tc.arm-linux.elf.gcc) +$c = $(tc.arm.v4a-linux.elf.gcc) $c += -march=armv4t -mthumb $c += -Os -fomit-frame-pointer $c += -fno-unit-at-a-time diff --git a/src/stub/src/c/lzma_d_c.c b/src/stub/src/c/lzma_d_c.c index c074c08a..60bfa169 100644 --- a/src/stub/src/c/lzma_d_c.c +++ b/src/stub/src/c/lzma_d_c.c @@ -33,6 +33,8 @@ /*#define ACC_OS_FREESTANDING 1*/ #include "miniacc.h" +#define UPX_LZMA_COMPAT 1 + #if 0 #undef _LZMA_IN_CB #undef _LZMA_OUT_READ