jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
John Reiser
2006-06-28 19:45:58 -07:00
parent 67e09fb342 c360806f47
commit 4fff523a6d
20 changed files with 1442 additions and 1317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.SRC
-13
View File
@@ -118,7 +118,6 @@ If you want to modify the stub sources you'll also need
- Certain versions of some i386-linux tools: - Certain versions of some i386-linux tools:
- gcc-2.95.3 - gcc-2.95.3
- gcc-3.4.6 - gcc-3.4.6
- binutils-2.16.1
- Other cross compilers targeted at the following architectures. - Other cross compilers targeted at the following architectures.
- arm-9tdmi-linux-gnu - arm-9tdmi-linux-gnu
@@ -135,16 +134,10 @@ If you want to modify the stub sources you'll also need
bin-upx/a68k bin-upx/a68k
bin-upx/arm-9tdmi-linux-gnu-gcc-3.4.5 bin-upx/arm-9tdmi-linux-gnu-gcc-3.4.5
bin-upx/arm-9tdmi-linux-gnu-ld
bin-upx/arm-9tdmi-linux-gnu-objcopy
bin-upx/arm-9tdmi-linux-gnu-objdump
bin-upx/asm5900 bin-upx/asm5900
bin-upx/djasm bin-upx/djasm
bin-upx/i386-linux-gcc-2.95.3 bin-upx/i386-linux-gcc-2.95.3
bin-upx/i386-linux-gcc-3.4.6 bin-upx/i386-linux-gcc-3.4.6
bin-upx/i386-linux-ld-2.16.1
bin-upx/i386-linux-objcopy-2.16.1
bin-upx/i386-linux-objdump
bin-upx/multiarch-addr2line-2.17 bin-upx/multiarch-addr2line-2.17
bin-upx/multiarch-ar-2.17 bin-upx/multiarch-ar-2.17
bin-upx/multiarch-as-2.17 bin-upx/multiarch-as-2.17
@@ -165,14 +158,8 @@ If you want to modify the stub sources you'll also need
bin-upx/multiarch-sysdump-2.17 bin-upx/multiarch-sysdump-2.17
bin-upx/nasm bin-upx/nasm
bin-upx/powerpc-750-linux-gnu-gcc-3.4.4 bin-upx/powerpc-750-linux-gnu-gcc-3.4.4
bin-upx/powerpc-750-linux-gnu-ld
bin-upx/powerpc-750-linux-gnu-objcopy
bin-upx/powerpc-750-linux-gnu-objdump
bin-upx/sstrip [ from src/stub/util ] bin-upx/sstrip [ from src/stub/util ]
bin-upx/x86_64-unknown-linux-gnu-gcc-3.4.4 bin-upx/x86_64-unknown-linux-gnu-gcc-3.4.4
bin-upx/x86_64-unknown-linux-gnu-ld
bin-upx/x86_64-unknown-linux-gnu-objcopy
bin-upx/x86_64-unknown-linux-gnu-objdump
Misc. notes Misc. notes
src/stub/Makefile
+56 -35
View File
@@ -11,6 +11,7 @@ MAKEFLAGS += -rR
.SUFFIXES: .SUFFIXES:
.SECONDEXPANSION: .SECONDEXPANSION:
export SHELL = /bin/sh export SHELL = /bin/sh
export LC_ALL = C
ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.79 3.79.1 3.80),) ifneq ($(findstring $(firstword $(MAKE_VERSION)),3.79 3.79.1 3.80),)
$(error GNU make 3.81 or better is required) $(error GNU make 3.81 or better is required)
@@ -77,20 +78,20 @@ endif
ifndef default.targets ifndef default.targets
ifeq ($(wildcard .all-stamp),) ifeq ($(wildcard .all-stamp),)
default.targets = default.targets =
default: $(default.targets) default: $$(default.targets)
@echo "UPX info: type 'make all' if you have all the required build tools." @echo "UPX info: type 'make all' if you have all the required build tools."
else else
default.targets = all default.targets = all
default: $(default.targets) default: $$(default.targets)
endif endif
endif endif
all.targets ?= tmp/.tmp-stamp .all-stamp all.targets ?= tmp/.tmp-stamp .all-stamp
all: $(all.targets) all: $$(all.targets)
tmp/.tmp-stamp: tmp/.tmp-stamp:
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@echo "timestamp" > $@ @echo "timestamp" > $@
.all-stamp: $(STUBS) .all-stamp: $$(STUBS)
@echo "timestamp" > $@ @echo "timestamp" > $@
ifeq ($(wildcard .all-stamp),) ifeq ($(wildcard .all-stamp),)
@@ -121,19 +122,25 @@ tc.default.bin2h = python $(srcdir)/scripts/bin2h.py
tc.default.brandelf = perl -w $(srcdir)/scripts/brandelf.pl tc.default.brandelf = perl -w $(srcdir)/scripts/brandelf.pl
tc.default.djasm = djasm tc.default.djasm = djasm
tc.default.gpp_inc = python $(srcdir)/scripts/gpp_inc.py tc.default.gpp_inc = python $(srcdir)/scripts/gpp_inc.py
tc.default.o2bin = perl $(srcdir)/scripts/o2bin.pl tc.default.m-objcopy = multiarch-objcopy-2.17
tc.default.m-objdump = multiarch-objdump-2.17
tc.default.m-ld = multiarch-ld-2.17
tc.default.m-nm = multiarch-nm-2.17
tc.default.m-readelf = multiarch-readelf-2.17
tc.default.nasm = nasm tc.default.nasm = nasm
tc.default.nasm += -I$(srcdir)/ -I$(srcdir)/src/ tc.default.nasm += -I$(srcdir)/ -I$(srcdir)/src/
tc.default.nasm += -O99 -w+macro-params -w+macro-selfref -w+number-overflow -w+orphan-labels tc.default.nasm += -O99 -w+macro-params -w+macro-selfref -w+number-overflow -w+orphan-labels
tc.default.nasm += -Dstub_$(subst .,_,$(subst -,_,$(basename $(notdir $@))))=1 tc.default.nasm += -Dstub_$(subst .,_,$(subst -,_,$(basename $(notdir $@))))=1
tc.default.o2bin = perl $(srcdir)/scripts/o2bin.pl
tc.default.pp-asm = i386-linux-gcc-2.95.3 -E -nostdinc -x assembler-with-cpp -Wall -Wp,-P,-C,-traditional tc.default.pp-asm = i386-linux-gcc-2.95.3 -E -nostdinc -x assembler-with-cpp -Wall -Wp,-P,-C,-traditional
tc.default.pp-nasm = $(tc.default.gpp_inc) --mode=nasm -I$(srcdir)/ -I$(srcdir)/src/ tc.default.pp-nasm = $(tc.default.gpp_inc) --mode=nasm -I$(srcdir)/ -I$(srcdir)/src/
tc.default.readelf = readelf
tc.default.sstrip = sstrip tc.default.sstrip = sstrip
# some common settings for $(tc_list) # some common settings for $(tc_list)
tc.i086.app-nasm = perl -w $(srcdir)/src/arch/i086/app-nasm.pl tc.arch-i086.app-nasm = perl -w $(srcdir)/src/arch/i086/app-nasm.pl
tc.i386.app-nasm = perl -w $(srcdir)/src/arch/i386/app-nasm.pl tc.arch-i086.gcc = i386-linux-gcc-3.4.6 -m32 -march=i386 -nostdinc -MMD
tc.arch-i386.app-nasm = perl -w $(srcdir)/src/arch/i386/app-nasm.pl
tc.arch-i386.gcc = i386-linux-gcc-3.4.6 -m32 -march=i386 -nostdinc -MMD
# slightly tricky make stuff follows # slightly tricky make stuff follows
@@ -143,7 +150,7 @@ __tc_varlist = tc.$(basename $(notdir $@)).$1 $(foreach v,$(tc_list),tc.$v.$1)
# return the name of the first variable that is not empty # return the name of the first variable that is not empty
__tc_varsearch = $(firstword $(foreach v,$1,$(if $($v),$v,))) __tc_varsearch = $(firstword $(foreach v,$1,$(if $($v),$v,)))
# error sentinel for missing commands # error sentinel for missing commands
__tc_FALSE = false tc_FALSE: '$1' '$@' '$<' __tc_FALSE = false tc_FALSE: '$1' '$@' '$<' '$(tc_list)'
# expand the first variable that is not empty # expand the first variable that is not empty
tc = $($(call __tc_varsearch,$(call __tc_varlist,$1) __tc_FALSE)) tc = $($(call __tc_varsearch,$(call __tc_varlist,$1) __tc_FALSE))
@@ -166,9 +173,12 @@ amd64-linux.elf% : tc_list = amd64-linux.elf default
tc.amd64-linux.elf.gcc = x86_64-unknown-linux-gnu-gcc-3.4.4 -m64 -nostdinc -MMD tc.amd64-linux.elf.gcc = x86_64-unknown-linux-gnu-gcc-3.4.4 -m64 -nostdinc -MMD
tc.amd64-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables tc.amd64-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
tc.amd64-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror tc.amd64-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror
tc.amd64-linux.elf.ld = x86_64-unknown-linux-gnu-ld -m elf_x86_64 ##tc.amd64-linux.elf.ld = x86_64-unknown-linux-gnu-ld -m elf_x86_64
tc.amd64-linux.elf.objcopy = x86_64-unknown-linux-gnu-objcopy ##tc.amd64-linux.elf.objcopy = x86_64-unknown-linux-gnu-objcopy
tc.amd64-linux.elf.objdump = x86_64-unknown-linux-gnu-objdump ##tc.amd64-linux.elf.objdump = x86_64-unknown-linux-gnu-objdump
tc.amd64-linux.elf.ld = $(call tc,m-ld) -b elf64-x86-64
tc.amd64-linux.elf.objcopy = $(call tc,m-objcopy) -I elf64-x86-64
tc.amd64-linux.elf.objdump = $(call tc,m-objdump) -b elf64-x86-64
tc.amd64-linux.elf.objstrip = $(call tc,objcopy) -R .comment -R .note tc.amd64-linux.elf.objstrip = $(call tc,objcopy) -R .comment -R .note
amd64-linux.elf-entry.h : $(srcdir)/src/$$T.S amd64-linux.elf-entry.h : $(srcdir)/src/$$T.S
@@ -200,9 +210,12 @@ arm-linux.elf% : tc_list = arm-linux.elf default
tc.arm-linux.elf.gcc = arm-9tdmi-linux-gnu-gcc-3.4.5 -march=armv4 -nostdinc -MMD tc.arm-linux.elf.gcc = arm-9tdmi-linux-gnu-gcc-3.4.5 -march=armv4 -nostdinc -MMD
tc.arm-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables tc.arm-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
tc.arm-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror tc.arm-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror
tc.arm-linux.elf.ld = arm-9tdmi-linux-gnu-ld ##tc.arm-linux.elf.ld = arm-9tdmi-linux-gnu-ld
tc.arm-linux.elf.objcopy = arm-9tdmi-linux-gnu-objcopy ##tc.arm-linux.elf.objcopy = arm-9tdmi-linux-gnu-objcopy
tc.arm-linux.elf.objdump = arm-9tdmi-linux-gnu-objdump ##tc.arm-linux.elf.objdump = arm-9tdmi-linux-gnu-objdump
tc.arm-linux.elf.ld = $(call tc,m-ld) -b elf32-littlearm
tc.arm-linux.elf.objcopy = $(call tc,m-objcopy) -I elf32-littlearm
tc.arm-linux.elf.objdump = $(call tc,m-objdump) -b elf32-littlearm
tc.arm-linux.elf.objstrip = $(call tc,objcopy) -R .comment -R .note tc.arm-linux.elf.objstrip = $(call tc,objcopy) -R .comment -R .note
arm-linux.elf-entry.h : $(srcdir)/src/$$T.S arm-linux.elf-entry.h : $(srcdir)/src/$$T.S
@@ -248,11 +261,11 @@ arm.v4t-wince.pe.h : $(srcdir)/src/$$T.S
# // i086-dos16.com # // i086-dos16.com
# ************************************************************************/ # ************************************************************************/
i086-dos16.com% : tc_list = i086 default i086-dos16.com% : tc_list = arch-i086 default
i086-dos16.com.h : $(srcdir)/src/$$T.asm i086-dos16.com.h : $(srcdir)/src/$$T.asm
gcc -c -x assembler-with-cpp $< -o tmp/$T.bin $(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
objdump -trwh tmp/$T.bin >> tmp/$T.bin $(call tc,m-objdump) -trwh tmp/$T.bin >> tmp/$T.bin
$(call tc,bin2h) --ident=nrv2b_loader tmp/$T.bin $@ $(call tc,bin2h) --ident=nrv2b_loader tmp/$T.bin $@
@@ -260,7 +273,7 @@ i086-dos16.com.h : $(srcdir)/src/$$T.asm
# // i086-dos16.exe # // i086-dos16.exe
# ************************************************************************/ # ************************************************************************/
i086-dos16.exe% : tc_list = i086 default i086-dos16.exe% : tc_list = arch-i086 default
i086-dos16.exe.h : $(srcdir)/src/$$T.asm i086-dos16.exe.h : $(srcdir)/src/$$T.asm
$(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1 $(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1
@@ -273,11 +286,11 @@ i086-dos16.exe.h : $(srcdir)/src/$$T.asm
# // i086-dos16.sys # // i086-dos16.sys
# ************************************************************************/ # ************************************************************************/
i086-dos16.sys% : tc_list = i086 default i086-dos16.sys% : tc_list = arch-i086 default
i086-dos16.sys.h : $(srcdir)/src/$$T.asm i086-dos16.sys.h : $(srcdir)/src/$$T.asm
gcc -c -x assembler-with-cpp $< -o tmp/$T.bin $(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
objdump -trwh tmp/$T.bin >> tmp/$T.bin $(call tc,m-objdump) -trwh tmp/$T.bin >> tmp/$T.bin
$(call tc,bin2h) --ident=nrv2b_loader tmp/$T.bin $@ $(call tc,bin2h) --ident=nrv2b_loader tmp/$T.bin $@
@@ -285,7 +298,7 @@ i086-dos16.sys.h : $(srcdir)/src/$$T.asm
# // i386-dos32.djgpp2 # // i386-dos32.djgpp2
# ************************************************************************/ # ************************************************************************/
i386-dos32.djgpp2% : tc_list = i386 default i386-dos32.djgpp2% : tc_list = arch-i386 default
i386-dos32.djgpp2.h : $(srcdir)/src/$$T.asm i386-dos32.djgpp2.h : $(srcdir)/src/$$T.asm
$(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1 $(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1
@@ -302,7 +315,7 @@ i386-dos32.djgpp2-stubify.h : $(srcdir)/src/$$T.asm
# // i386-dos32.tmt # // i386-dos32.tmt
# ************************************************************************/ # ************************************************************************/
i386-dos32.tmt% : tc_list = i386 default i386-dos32.tmt% : tc_list = arch-i386 default
i386-dos32.tmt.h : $(srcdir)/src/$$T.asm i386-dos32.tmt.h : $(srcdir)/src/$$T.asm
$(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1 $(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1
@@ -315,7 +328,7 @@ i386-dos32.tmt.h : $(srcdir)/src/$$T.asm
# // i386-dos32.watcom.le # // i386-dos32.watcom.le
# ************************************************************************/ # ************************************************************************/
i386-dos32.watcom.le% : tc_list = i386 default i386-dos32.watcom.le% : tc_list = arch-i386 default
i386-dos32.watcom.le.h : $(srcdir)/src/$$T.asm i386-dos32.watcom.le.h : $(srcdir)/src/$$T.asm
$(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1 $(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1
@@ -328,9 +341,9 @@ i386-dos32.watcom.le.h : $(srcdir)/src/$$T.asm
# // i386-linux.elf # // i386-linux.elf
# ************************************************************************/ # ************************************************************************/
i386-linux.elf% : tc_list = i386-linux.elf i386 default i386-linux.elf% : tc_list = i386-linux.elf arch-i386 default
tc.i386-linux.elf.gcc = i386-linux-gcc-3.4.6 -m32 -nostdinc -MMD tc.i386-linux.elf.gcc = i386-linux-gcc-3.4.6 -m32 -march=i386 -nostdinc -MMD
tc.i386-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables tc.i386-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
tc.i386-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror tc.i386-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror
tc.i386-linux.elf.gcc += -march=i386 -mtune=k6 tc.i386-linux.elf.gcc += -march=i386 -mtune=k6
@@ -339,9 +352,12 @@ tc.i386-linux.elf.gcc += -momit-leaf-frame-pointer
tc.i386-linux.elf.gcc += -fno-align-functions -fno-align-jumps -fno-align-labels -fno-align-loops tc.i386-linux.elf.gcc += -fno-align-functions -fno-align-jumps -fno-align-labels -fno-align-loops
tc.i386-linux.elf.gcc += -mpreferred-stack-boundary=2 tc.i386-linux.elf.gcc += -mpreferred-stack-boundary=2
tc.i386-linux.elf.gcc += -fweb tc.i386-linux.elf.gcc += -fweb
tc.i386-linux.elf.ld = i386-linux-ld-2.16.1 ##tc.i386-linux.elf.ld = i386-linux-ld-2.16.1
tc.i386-linux.elf.objcopy = i386-linux-objcopy-2.16.1 ##tc.i386-linux.elf.objcopy = i386-linux-objcopy-2.16.1
tc.i386-linux.elf.objdump = i386-linux-objdump ##tc.i386-linux.elf.objdump = i386-linux-objdump
tc.i386-linux.elf.ld = $(call tc,m-ld) -b elf32-i386
tc.i386-linux.elf.objcopy = $(call tc,m-objcopy) -I elf32-i386
tc.i386-linux.elf.objdump = $(call tc,m-objdump) -b elf32-i386
tc.i386-linux.elf.objstrip = $(call tc,objcopy) -R .comment -R .note tc.i386-linux.elf.objstrip = $(call tc,objcopy) -R .comment -R .note
i386-linux.elf-entry.h : $(srcdir)/src/$$T.asm i386-linux.elf-entry.h : $(srcdir)/src/$$T.asm
@@ -459,7 +475,7 @@ tmp/i386-linux.elf.shell-main.o : $(srcdir)/src/$$T.c
# // i386-linux.kernel.vmlinuz # // i386-linux.kernel.vmlinuz
# ************************************************************************/ # ************************************************************************/
i386-linux.kernel.vmlin% : tc_list = i386 default i386-linux.kernel.vmlin% : tc_list = arch-i386 default
i386-linux.kernel%.h : $(srcdir)/src/$$T.asm i386-linux.kernel%.h : $(srcdir)/src/$$T.asm
$(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1 $(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1
@@ -472,7 +488,7 @@ i386-linux.kernel%.h : $(srcdir)/src/$$T.asm
# // i386-win32.pe # // i386-win32.pe
# ************************************************************************/ # ************************************************************************/
i386-win32.pe% : tc_list = i386 default i386-win32.pe% : tc_list = arch-i386 default
i386-win32.pe.h : $(srcdir)/src/$$T.asm i386-win32.pe.h : $(srcdir)/src/$$T.asm
$(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1 $(call tc,pp-nasm) --MMD=$@ $< -o tmp/$T.tmp1
@@ -540,9 +556,12 @@ powerpc-linux.elf% : tc_list = powerpc-linux.elf default
tc.powerpc-linux.elf.gcc = powerpc-750-linux-gnu-gcc-3.4.4 -mcpu=405 -nostdinc -MMD tc.powerpc-linux.elf.gcc = powerpc-750-linux-gnu-gcc-3.4.4 -mcpu=405 -nostdinc -MMD
tc.powerpc-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables tc.powerpc-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
tc.powerpc-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror tc.powerpc-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror
tc.powerpc-linux.elf.ld = powerpc-750-linux-gnu-ld ##tc.powerpc-linux.elf.ld = powerpc-750-linux-gnu-ld
tc.powerpc-linux.elf.objcopy = powerpc-750-linux-gnu-objcopy ##tc.powerpc-linux.elf.objcopy = powerpc-750-linux-gnu-objcopy
tc.powerpc-linux.elf.objdump = powerpc-750-linux-gnu-objdump ##tc.powerpc-linux.elf.objdump = powerpc-750-linux-gnu-objdump
tc.powerpc-linux.elf.ld = $(call tc,m-ld) -b elf32-powerpc
tc.powerpc-linux.elf.objcopy = $(call tc,m-objcopy) -I elf32-powerpc
tc.powerpc-linux.elf.objdump = $(call tc,m-objdump) -b elf32-powerpc
tc.powerpc-linux.elf.objstrip = $(call tc,objcopy) -R .comment -R .note tc.powerpc-linux.elf.objstrip = $(call tc,objcopy) -R .comment -R .note
powerpc-linux.elf-entry.h : $(srcdir)/src/$$T.S powerpc-linux.elf-entry.h : $(srcdir)/src/$$T.S
@@ -595,9 +614,11 @@ tmp/powerpc-darwin.macho-main.o : $(srcdir)/src/$$T.c
# // dependencies # // dependencies
# ************************************************************************/ # ************************************************************************/
ifneq ($(STUBS),)
# FIXME: we want a dependency-only-prerequisite here # FIXME: we want a dependency-only-prerequisite here
##$(STUBS): | tmp/.tmp-stamp ##$(STUBS): | tmp/.tmp-stamp
##$(STUBS): $(MAKEFILE_LIST) ##$(STUBS): $(MAKEFILE_LIST)
endif
-include tmp/*.d -include tmp/*.d
src/stub/amd64-linux.elf-fold.h
+5 -5
View File
@@ -28,8 +28,8 @@
#define LINUX_ELF64AMD_FOLD_SIZE 1699 #define LINUX_ELF64AMD_FOLD_SIZE 1699
#define LINUX_ELF64AMD_FOLD_ADLER32 0x85c88c53 #define LINUX_ELF64AMD_FOLD_ADLER32 0x87378ad9
#define LINUX_ELF64AMD_FOLD_CRC32 0xb486db08 #define LINUX_ELF64AMD_FOLD_CRC32 0x774d6ce1
unsigned char linux_elf64amd_fold[1699] = { unsigned char linux_elf64amd_fold[1699] = {
127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 0 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 0 */
@@ -39,9 +39,9 @@ unsigned char linux_elf64amd_fold[1699] = {
1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 40 */ 1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 40 */
0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, /* 0x 50 */ 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, /* 0x 50 */
163, 6, 0, 0, 0, 0, 0, 0,164, 6, 0, 0, 0, 0, 0, 0, /* 0x 60 */ 163, 6, 0, 0, 0, 0, 0, 0,164, 6, 0, 0, 0, 0, 0, 0, /* 0x 60 */
0, 0, 16, 0, 0, 0, 0, 0, 1, 0, 0, 0, 6, 0, 0, 0, /* 0x 70 */ 0, 0, 16, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, /* 0x 70 */
163, 6, 0, 0, 0, 0, 0, 0,164, 6, 16, 0, 0, 0, 0, 0, /* 0x 80 */ 163, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 80 */
164, 6, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 90 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 90 */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, /* 0x a0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, /* 0x a0 */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,232, 80, 0, 0, /* 0x b0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,232, 80, 0, 0, /* 0x b0 */
0,131,249, 73,117, 74, 72,137,241, 72,137,254,235, 44,138, 7, /* 0x c0 */ 0,131,249, 73,117, 74, 72,137,241, 72,137,254,235, 44,138, 7, /* 0x c0 */
src/stub/arm-linux.elf-fold.h
+4 -4
View File
@@ -28,8 +28,8 @@
#define LINUX_ELF32ARM_FOLD_SIZE 2084 #define LINUX_ELF32ARM_FOLD_SIZE 2084
#define LINUX_ELF32ARM_FOLD_ADLER32 0x0ec054f2 #define LINUX_ELF32ARM_FOLD_ADLER32 0x6ecb5394
#define LINUX_ELF32ARM_FOLD_CRC32 0x981e01bb #define LINUX_ELF32ARM_FOLD_CRC32 0x1f581fa7
unsigned char linux_elf32arm_fold[2084] = { unsigned char linux_elf32arm_fold[2084] = {
127, 69, 76, 70, 1, 1, 1, 97, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 0 */ 127, 69, 76, 70, 1, 1, 1, 97, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 0 */
@@ -37,8 +37,8 @@ unsigned char linux_elf32arm_fold[2084] = {
0, 0, 0, 0, 2, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, 0, /* 0x 20 */ 0, 0, 0, 0, 2, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, 0, /* 0x 20 */
0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 0, /* 0x 30 */ 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,128, 0, 0, /* 0x 30 */
0,128, 0, 0, 36, 8, 0, 0, 36, 8, 0, 0, 5, 0, 0, 0, /* 0x 40 */ 0,128, 0, 0, 36, 8, 0, 0, 36, 8, 0, 0, 5, 0, 0, 0, /* 0x 40 */
0,128, 0, 0, 1, 0, 0, 0, 36, 8, 0, 0, 36,136, 0, 0, /* 0x 50 */ 0,128, 0, 0, 1, 0, 0, 0, 36, 8, 0, 0, 0, 0, 0, 0, /* 0x 50 */
36,136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, /* 0x 60 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 60 */
0,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 70 */ 0,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 70 */
12, 48,157,229, 3, 49,141,224, 20, 48,131,226, 4, 0,147,228, /* 0x 80 */ 12, 48,157,229, 3, 49,141,224, 20, 48,131,226, 4, 0,147,228, /* 0x 80 */
0, 0, 80,227,252,255,255, 26, 3, 32,160,225, 8, 0,146,228, /* 0x 90 */ 0, 0, 80,227,252,255,255, 26, 3, 32,160,225, 8, 0,146,228, /* 0x 90 */
src/stub/i086-dos16.com.h
+601 -555
View File
File diff suppressed because it is too large Load Diff
src/stub/i086-dos16.sys.h
+675 -629
View File
File diff suppressed because it is too large Load Diff
src/stub/i386-linux.elf-fold.h
+4 -4
View File
@@ -28,8 +28,8 @@
#define LINUX_I386ELF_FOLD_SIZE 1623 #define LINUX_I386ELF_FOLD_SIZE 1623
#define LINUX_I386ELF_FOLD_ADLER32 0xaec8bf31 #define LINUX_I386ELF_FOLD_ADLER32 0x7624bccf
#define LINUX_I386ELF_FOLD_CRC32 0x20b6d044 #define LINUX_I386ELF_FOLD_CRC32 0x41216340
unsigned char linux_i386elf_fold[1623] = { unsigned char linux_i386elf_fold[1623] = {
127, 69, 76, 70, 1, 1, 1, 0, 76,105,110,117,120, 0, 0, 0, /* 0x 0 */ 127, 69, 76, 70, 1, 1, 1, 0, 76,105,110,117,120, 0, 0, 0, /* 0x 0 */
@@ -37,8 +37,8 @@ unsigned char linux_i386elf_fold[1623] = {
0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, 0, /* 0x 20 */ 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, 0, /* 0x 20 */
0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 16,192, 0, /* 0x 30 */ 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 16,192, 0, /* 0x 30 */
0, 16,192, 0, 87, 6, 0, 0, 88, 6, 0, 0, 5, 0, 0, 0, /* 0x 40 */ 0, 16,192, 0, 87, 6, 0, 0, 88, 6, 0, 0, 5, 0, 0, 0, /* 0x 40 */
0, 16, 0, 0, 1, 0, 0, 0, 87, 6, 0, 0, 88, 22,192, 0, /* 0x 50 */ 0, 16, 0, 0, 1, 0, 0, 0, 87, 6, 0, 0, 0, 0, 0, 0, /* 0x 50 */
88, 22,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, /* 0x 60 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 60 */
0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 70 */ 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 70 */
41,201,186,120, 2, 0, 0,137,230,137,231,232,121, 0, 0, 0, /* 0x 80 */ 41,201,186,120, 2, 0, 0,137,230,137,231,232,121, 0, 0, 0, /* 0x 80 */
137,230,209,234, 25,192, 41,193,141, 36,196,133,210,117,243,137, /* 0x 90 */ 137,230,209,234, 25,192, 41,193,141, 36,196,133,210,117,243,137, /* 0x 90 */
src/stub/i386-linux.elf.interp-fold.h
+4 -4
View File
@@ -28,8 +28,8 @@
#define LINUX_I386PTI_FOLD_SIZE 1531 #define LINUX_I386PTI_FOLD_SIZE 1531
#define LINUX_I386PTI_FOLD_ADLER32 0xc7639b18 #define LINUX_I386PTI_FOLD_ADLER32 0x54fe990e
#define LINUX_I386PTI_FOLD_CRC32 0x45f45f94 #define LINUX_I386PTI_FOLD_CRC32 0xa290f522
unsigned char linux_i386pti_fold[1531] = { unsigned char linux_i386pti_fold[1531] = {
127, 69, 76, 70, 1, 1, 1, 0, 76,105,110,117,120, 0, 0, 0, /* 0x 0 */ 127, 69, 76, 70, 1, 1, 1, 0, 76,105,110,117,120, 0, 0, 0, /* 0x 0 */
@@ -37,8 +37,8 @@ unsigned char linux_i386pti_fold[1531] = {
0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, 0, /* 0x 20 */ 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, 0, /* 0x 20 */
0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, /* 0x 30 */ 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, /* 0x 30 */
0, 0, 1, 0,251, 5, 0, 0,252, 5, 0, 0, 5, 0, 0, 0, /* 0x 40 */ 0, 0, 1, 0,251, 5, 0, 0,252, 5, 0, 0, 5, 0, 0, 0, /* 0x 40 */
0, 16, 0, 0, 1, 0, 0, 0,251, 5, 0, 0,252, 5, 1, 0, /* 0x 50 */ 0, 16, 0, 0, 1, 0, 0, 0,251, 5, 0, 0, 0, 0, 0, 0, /* 0x 50 */
252, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, /* 0x 60 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 60 */
0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 70 */ 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 70 */
93, 89, 88,141,124,132, 4, 80, 41,192,175,117,253,175,137,254, /* 0x 80 */ 93, 89, 88,141,124,132, 4, 80, 41,192,175,117,253,175,137,254, /* 0x 80 */
139, 6,131,248, 3,116, 8,131,198, 8,131,248, 0,117,241,139, /* 0x 90 */ 139, 6,131,248, 3,116, 8,131,198, 8,131,248, 0,117,241,139, /* 0x 90 */
src/stub/powerpc-linux.elf-fold.h
+4 -4
View File
@@ -28,8 +28,8 @@
#define LINUX_ELFPPC32_FOLD_SIZE 1936 #define LINUX_ELFPPC32_FOLD_SIZE 1936
#define LINUX_ELFPPC32_FOLD_ADLER32 0xa51c716b #define LINUX_ELFPPC32_FOLD_ADLER32 0x1a2f7017
#define LINUX_ELFPPC32_FOLD_CRC32 0xaa049b2f #define LINUX_ELFPPC32_FOLD_CRC32 0xf69d4404
unsigned char linux_elfppc32_fold[1936] = { unsigned char linux_elfppc32_fold[1936] = {
127, 69, 76, 70, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 0 */ 127, 69, 76, 70, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 0 */
@@ -37,8 +37,8 @@ unsigned char linux_elfppc32_fold[1936] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, /* 0x 20 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, /* 0x 20 */
0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 16, 0, 0, /* 0x 30 */ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 16, 0, 0, /* 0x 30 */
0, 16, 0, 0, 0, 0, 7,144, 0, 0, 7,144, 0, 0, 0, 5, /* 0x 40 */ 0, 16, 0, 0, 0, 0, 7,144, 0, 0, 7,144, 0, 0, 0, 5, /* 0x 40 */
0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 7,144, 0, 16, 7,144, /* 0x 50 */ 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 7,144, 0, 0, 0, 0, /* 0x 50 */
0, 16, 7,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, /* 0x 60 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 60 */
0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 70 */ 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x 70 */
72, 0, 0,125, 40, 6, 0,208, 76,130, 0, 32, 84,132,240,191, /* 0x 80 */ 72, 0, 0,125, 40, 6, 0,208, 76,130, 0, 32, 84,132,240,191, /* 0x 80 */
77,130, 0, 32, 60, 0, 0, 16,124, 4, 0, 64, 65,128, 0, 8, /* 0x 90 */ 77,130, 0, 32, 60, 0, 0, 16,124, 4, 0, 64, 65,128, 0, 8, /* 0x 90 */
src/stub/src/arch/amd64/Makefile.extra
+17 -12
View File
@@ -1,28 +1,36 @@
MAKEFLAGS += -rR MAKEFLAGS += -rR
.SUFFIXES: .SUFFIXES:
.SECONDEXPANSION: .SECONDEXPANSION:
export SHELL = /bin/sh
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),) ifndef top_srcdir
__dir_list = . .. ../.. ../../.. ../../../.. ../../../../..
STUBS += lzma_d_cf.S lzma_d_cs.S __dir_list += ../../../../../.. ../../../../../../.. ../../../../../../../..
__dir_search = $(firstword $(foreach v,$1,$(if $(wildcard $v/$2),$v)) $3)
top_srcdir := $(call __dir_search,$(__dir_list),src/bele.h,NOT_FOUND)
endif
default.targets = all default.targets = all
all.targets = tmp/.tmp-stamp $(STUBS) STUBS = NO_STUBS
include $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))../../../Makefile include $(top_srcdir)/src/stub/Makefile
STUBS =
# /*********************************************************************** # /***********************************************************************
# // amd64-lzma # // amd64-lzma
# ************************************************************************/ # ************************************************************************/
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
STUBS += lzma_d_cf.S lzma_d_cs.S
lzma_d_cf.S : tc_list = amd64-lzma amd64-linux.elf default lzma_d_cf.S : tc_list = amd64-lzma amd64-linux.elf default
lzma_d_cs.S : tc_list = amd64-lzma amd64-linux.elf default lzma_d_cs.S : tc_list = amd64-lzma amd64-linux.elf default
tc.amd64-lzma.gcc = $(tc.amd64-linux.elf.gcc) tc.amd64-lzma.gcc = $(tc.amd64-linux.elf.gcc)
tc.amd64-lzma.gcc += -ffunction-sections
tc.amd64-lzma.gcc += -Os tc.amd64-lzma.gcc += -Os
tc.amd64-lzma.gcc += -ffunction-sections
tc.amd64-lzma.gcc += -I$(UPX_LZMADIR) tc.amd64-lzma.gcc += -I$(UPX_LZMADIR)
tc.amd64-lzma.gcc += -I$(top_srcdir)/src
lzma_d_c%.S : lzma_d_c.c lzma_d_c%.S : lzma_d_c.c
$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o $(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
@@ -32,10 +40,7 @@ lzma_d_c%.S : lzma_d_c.c
$(call tc,objdump) -b binary -m i386:x86-64 -D tmp/$T.out > tmp/$T.out.lst $(call tc,objdump) -b binary -m i386:x86-64 -D tmp/$T.out > tmp/$T.out.lst
$(call tc,bin2h) --mode=gas tmp/$T.out $@ $(call tc,bin2h) --mode=gas tmp/$T.out $@
lzma_d_cf.S : PP_FLAGS = -DFAST lzma_d_cf.% : PP_FLAGS = -DFAST
lzma_d_cs.S : PP_FLAGS = -DSMALL lzma_d_cs.% : PP_FLAGS = -DSMALL
lzma_d_cf.S : $(MAKEFILE_LIST)
lzma_d_cs.S : $(MAKEFILE_LIST)
endif endif
src/stub/src/arch/amd64/lzma_d_c.c
+1 -1
View File
@@ -31,7 +31,7 @@
#define ACC_LIBC_NAKED #define ACC_LIBC_NAKED
#define ACC_OS_FREESTANDING #define ACC_OS_FREESTANDING
#include "../../../../miniacc.h" #include "miniacc.h"
#undef _LZMA_IN_CB #undef _LZMA_IN_CB
#undef _LZMA_OUT_READ #undef _LZMA_OUT_READ
src/stub/src/arch/arm/v4a/Makefile.extra
+16 -11
View File
@@ -1,21 +1,28 @@
MAKEFLAGS += -rR MAKEFLAGS += -rR
.SUFFIXES: .SUFFIXES:
.SECONDEXPANSION: .SECONDEXPANSION:
export SHELL = /bin/sh
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),) ifndef top_srcdir
__dir_list = . .. ../.. ../../.. ../../../.. ../../../../..
STUBS += lzma_d_cf.S lzma_d_cs.S __dir_list += ../../../../../.. ../../../../../../.. ../../../../../../../..
__dir_search = $(firstword $(foreach v,$1,$(if $(wildcard $v/$2),$v)) $3)
top_srcdir := $(call __dir_search,$(__dir_list),src/bele.h,NOT_FOUND)
endif
default.targets = all default.targets = all
all.targets = tmp/.tmp-stamp $(STUBS) STUBS = NO_STUBS
include $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))../../../../Makefile include $(top_srcdir)/src/stub/Makefile
STUBS =
# /*********************************************************************** # /***********************************************************************
# // arm-lzma # // arm-lzma
# ************************************************************************/ # ************************************************************************/
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
STUBS += lzma_d_cf.S lzma_d_cs.S
lzma_d_cf.S : tc_list = arm-lzma arm-linux.elf default lzma_d_cf.S : tc_list = arm-lzma arm-linux.elf default
lzma_d_cs.S : tc_list = arm-lzma arm-linux.elf default lzma_d_cs.S : tc_list = arm-lzma arm-linux.elf default
@@ -24,6 +31,7 @@ tc.arm-lzma.gcc += -march=armv4 -fPIC
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
lzma_d_c%.S : lzma_d_c.c lzma_d_c%.S : lzma_d_c.c
$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o $(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
@@ -33,10 +41,7 @@ lzma_d_c%.S : lzma_d_c.c
$(call tc,objdump) -b binary -m armv4 -D tmp/$T.out > tmp/$T.out.lst $(call tc,objdump) -b binary -m armv4 -D tmp/$T.out > tmp/$T.out.lst
$(call tc,bin2h) --mode=gas tmp/$T.out $@ $(call tc,bin2h) --mode=gas tmp/$T.out $@
lzma_d_cf.S : PP_FLAGS = -DFAST lzma_d_cf.% : PP_FLAGS = -DFAST
lzma_d_cs.S : PP_FLAGS = -DSMALL lzma_d_cs.% : PP_FLAGS = -DSMALL
lzma_d_cf.S : $(MAKEFILE_LIST)
lzma_d_cs.S : $(MAKEFILE_LIST)
endif endif
src/stub/src/arch/arm/v4a/lzma_d_c.c
+1 -1
View File
@@ -31,7 +31,7 @@
#define ACC_LIBC_NAKED #define ACC_LIBC_NAKED
#define ACC_OS_FREESTANDING #define ACC_OS_FREESTANDING
#include "../../../../../miniacc.h" #include "miniacc.h"
#undef _LZMA_IN_CB #undef _LZMA_IN_CB
#undef _LZMA_OUT_READ #undef _LZMA_OUT_READ
src/stub/src/arch/arm/v4t/Makefile.extra
+16 -11
View File
@@ -1,21 +1,28 @@
MAKEFLAGS += -rR MAKEFLAGS += -rR
.SUFFIXES: .SUFFIXES:
.SECONDEXPANSION: .SECONDEXPANSION:
export SHELL = /bin/sh
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),) ifndef top_srcdir
__dir_list = . .. ../.. ../../.. ../../../.. ../../../../..
STUBS += lzma_d_cf.S lzma_d_cs.S __dir_list += ../../../../../.. ../../../../../../.. ../../../../../../../..
__dir_search = $(firstword $(foreach v,$1,$(if $(wildcard $v/$2),$v)) $3)
top_srcdir := $(call __dir_search,$(__dir_list),src/bele.h,NOT_FOUND)
endif
default.targets = all default.targets = all
all.targets = tmp/.tmp-stamp $(STUBS) STUBS = NO_STUBS
include $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))../../../../Makefile include $(top_srcdir)/src/stub/Makefile
STUBS =
# /*********************************************************************** # /***********************************************************************
# // arm-lzma # // arm-lzma
# ************************************************************************/ # ************************************************************************/
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
STUBS += lzma_d_cf.S lzma_d_cs.S
lzma_d_cf.S : tc_list = arm-lzma arm-linux.elf default lzma_d_cf.S : tc_list = arm-lzma arm-linux.elf default
lzma_d_cs.S : tc_list = arm-lzma arm-linux.elf default lzma_d_cs.S : tc_list = arm-lzma arm-linux.elf default
@@ -24,6 +31,7 @@ tc.arm-lzma.gcc += -march=armv4t -mthumb -fPIC
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
lzma_d_c%.S : lzma_d_c.c lzma_d_c%.S : lzma_d_c.c
$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o $(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
@@ -33,10 +41,7 @@ lzma_d_c%.S : lzma_d_c.c
$(call tc,objdump) -b binary -m armv4t -M force-thumb -D tmp/$T.out > tmp/$T.out.lst $(call tc,objdump) -b binary -m armv4t -M force-thumb -D tmp/$T.out > tmp/$T.out.lst
$(call tc,bin2h) --mode=gas tmp/$T.out $@ $(call tc,bin2h) --mode=gas tmp/$T.out $@
lzma_d_cf.S : PP_FLAGS = -DFAST lzma_d_cf.% : PP_FLAGS = -DFAST
lzma_d_cs.S : PP_FLAGS = -DSMALL lzma_d_cs.% : PP_FLAGS = -DSMALL
lzma_d_cf.S : $(MAKEFILE_LIST)
lzma_d_cs.S : $(MAKEFILE_LIST)
endif endif
src/stub/src/arch/arm/v4t/lzma_d_c.c
+1 -1
View File
@@ -31,7 +31,7 @@
#define ACC_LIBC_NAKED #define ACC_LIBC_NAKED
#define ACC_OS_FREESTANDING #define ACC_OS_FREESTANDING
#include "../../../../../miniacc.h" #include "miniacc.h"
#undef _LZMA_IN_CB #undef _LZMA_IN_CB
#undef _LZMA_OUT_READ #undef _LZMA_OUT_READ
src/stub/src/arch/i086/nrv2b_d16.ash
+1 -1
View File
@@ -77,7 +77,7 @@ section NRVGTD00
cmp bp, -0xd00 cmp bp, -0xd00
adc cx, 1 adc cx, 1
section NRVDECO2 section NRVDECO2
lea ax, [di+bp] lea ax, [bp+di]
xchg ax, si xchg ax, si
rep rep
movsb movsb
src/stub/src/arch/i386/Makefile.extra
+18 -13
View File
@@ -1,27 +1,35 @@
MAKEFLAGS += -rR MAKEFLAGS += -rR
.SUFFIXES: .SUFFIXES:
.SECONDEXPANSION: .SECONDEXPANSION:
export SHELL = /bin/sh
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),) ifndef top_srcdir
__dir_list = . .. ../.. ../../.. ../../../.. ../../../../..
STUBS += lzma_d_cf.ash lzma_d_cs.ash __dir_list += ../../../../../.. ../../../../../../.. ../../../../../../../..
__dir_search = $(firstword $(foreach v,$1,$(if $(wildcard $v/$2),$v)) $3)
top_srcdir := $(call __dir_search,$(__dir_list),src/bele.h,NOT_FOUND)
endif
default.targets = all default.targets = all
all.targets = tmp/.tmp-stamp $(STUBS) STUBS = NO_STUBS
include $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))../../../Makefile include $(top_srcdir)/src/stub/Makefile
STUBS =
# /*********************************************************************** # /***********************************************************************
# // i386-lzma # // i386-lzma
# ************************************************************************/ # ************************************************************************/
lzma_d_cf.ash : tc_list = i386-lzma i386-linux.elf i386 default ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
lzma_d_cs.ash : tc_list = i386-lzma i386-linux.elf i386 default
STUBS += lzma_d_cf.ash lzma_d_cs.ash
lzma_d_cf.ash : tc_list = i386-lzma i386-linux.elf arch-i386 default
lzma_d_cs.ash : tc_list = i386-lzma i386-linux.elf arch-i386 default
tc.i386-lzma.gcc = $(tc.i386-linux.elf.gcc) tc.i386-lzma.gcc = $(tc.i386-linux.elf.gcc)
tc.i386-lzma.gcc += -ffunction-sections tc.i386-lzma.gcc += -ffunction-sections
tc.i386-lzma.gcc += -I$(UPX_LZMADIR) tc.i386-lzma.gcc += -I$(UPX_LZMADIR)
tc.i386-lzma.gcc += -I$(top_srcdir)/src
lzma_d_c%.ash : lzma_d_c.c lzma_d_c%.ash : lzma_d_c.c
$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o $(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
@@ -31,10 +39,7 @@ lzma_d_c%.ash : lzma_d_c.c
$(call tc,objdump) -b binary -m i386 -D tmp/$T.out > tmp/$T.out.lst $(call tc,objdump) -b binary -m i386 -D tmp/$T.out > tmp/$T.out.lst
$(call tc,bin2h) --mode=nasm tmp/$T.out $@ $(call tc,bin2h) --mode=nasm tmp/$T.out $@
lzma_d_cf.ash : PP_FLAGS = -DFAST lzma_d_cf.% : PP_FLAGS = -DFAST
lzma_d_cs.ash : PP_FLAGS = -DSMALL lzma_d_cs.% : PP_FLAGS = -DSMALL
lzma_d_cf.ash : $(MAKEFILE_LIST)
lzma_d_cs.ash : $(MAKEFILE_LIST)
endif endif
src/stub/src/arch/i386/lzma_d_c.c
+1 -1
View File
@@ -31,7 +31,7 @@
#define ACC_LIBC_NAKED #define ACC_LIBC_NAKED
#define ACC_OS_FREESTANDING #define ACC_OS_FREESTANDING
#include "../../../../miniacc.h" #include "miniacc.h"
#undef _LZMA_IN_CB #undef _LZMA_IN_CB
#undef _LZMA_OUT_READ #undef _LZMA_OUT_READ
src/stub/src/arch/powerpc/32/Makefile.extra
+16 -11
View File
@@ -1,21 +1,28 @@
MAKEFLAGS += -rR MAKEFLAGS += -rR
.SUFFIXES: .SUFFIXES:
.SECONDEXPANSION: .SECONDEXPANSION:
export SHELL = /bin/sh
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),) ifndef top_srcdir
__dir_list = . .. ../.. ../../.. ../../../.. ../../../../..
STUBS += lzma_d_cf.S lzma_d_cs.S __dir_list += ../../../../../.. ../../../../../../.. ../../../../../../../..
__dir_search = $(firstword $(foreach v,$1,$(if $(wildcard $v/$2),$v)) $3)
top_srcdir := $(call __dir_search,$(__dir_list),src/bele.h,NOT_FOUND)
endif
default.targets = all default.targets = all
all.targets = tmp/.tmp-stamp $(STUBS) STUBS = NO_STUBS
include $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))../../../../Makefile include $(top_srcdir)/src/stub/Makefile
STUBS =
# /*********************************************************************** # /***********************************************************************
# // powerpc-lzma # // powerpc-lzma
# ************************************************************************/ # ************************************************************************/
ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
STUBS += lzma_d_cf.S lzma_d_cs.S
lzma_d_cf.S : tc_list = powerpc-lzma powerpc-linux.elf default lzma_d_cf.S : tc_list = powerpc-lzma powerpc-linux.elf default
lzma_d_cs.S : tc_list = powerpc-lzma powerpc-linux.elf default lzma_d_cs.S : tc_list = powerpc-lzma powerpc-linux.elf default
@@ -24,6 +31,7 @@ tc.powerpc-lzma.gcc += -mcpu=405 -fPIC
tc.powerpc-lzma.gcc += -Os tc.powerpc-lzma.gcc += -Os
tc.powerpc-lzma.gcc += -ffunction-sections tc.powerpc-lzma.gcc += -ffunction-sections
tc.powerpc-lzma.gcc += -I$(UPX_LZMADIR) tc.powerpc-lzma.gcc += -I$(UPX_LZMADIR)
tc.powerpc-lzma.gcc += -I$(top_srcdir)/src
lzma_d_c%.S : lzma_d_c.c lzma_d_c%.S : lzma_d_c.c
$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o $(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
@@ -33,10 +41,7 @@ lzma_d_c%.S : lzma_d_c.c
$(call tc,objdump) -b binary -m powerpc -D tmp/$T.out > tmp/$T.out.lst $(call tc,objdump) -b binary -m powerpc -D tmp/$T.out > tmp/$T.out.lst
$(call tc,bin2h) --mode=gas tmp/$T.out $@ $(call tc,bin2h) --mode=gas tmp/$T.out $@
lzma_d_cf.S : PP_FLAGS = -DFAST lzma_d_cf.% : PP_FLAGS = -DFAST
lzma_d_cs.S : PP_FLAGS = -DSMALL lzma_d_cs.% : PP_FLAGS = -DSMALL
lzma_d_cf.S : $(MAKEFILE_LIST)
lzma_d_cs.S : $(MAKEFILE_LIST)
endif endif
src/stub/src/arch/powerpc/32/lzma_d_c.c
+1 -1
View File
@@ -31,7 +31,7 @@
#define ACC_LIBC_NAKED #define ACC_LIBC_NAKED
#define ACC_OS_FREESTANDING #define ACC_OS_FREESTANDING
#include "../../../../../miniacc.h" #include "miniacc.h"
#undef _LZMA_IN_CB #undef _LZMA_IN_CB
#undef _LZMA_OUT_READ #undef _LZMA_OUT_READ