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

help_umf.S for MIPS and PPC

Browse Source 
modified:   p_lx_elf.cpp
	modified:   stub/Makefile
	modified:   stub/src/mips.r3000-linux.elf-help_umf.S
	modified:   stub/src/mipsel.r3000-linux.elf-entry.S
	modified:   stub/src/mipsel.r3000-linux.elf-help_umf.S
	new file:   stub/src/powerpc-linux.elf-help_umf.S
This commit is contained in:
John Reiser 2024-12-05 11:06:09 -08:00
parent ebe6272ac7
commit 330ac2443c
6 changed files with 86 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/p_lx_elf.cpp
View File

@ -1613,7 +1613,8 @@ PackLinuxElf32::buildLinuxLoader(
addLoader("ELFMAINX"); addLoader("ELFMAINX");
// Only if $ARCH-linux.elf-entry.S calls upx_mmap_and_fd instead of memfd_create // Only if $ARCH-linux.elf-entry.S calls upx_mmap_and_fd instead of memfd_create
if (this->e_machine != Elf32_Ehdr::EM_PPC) // FIXME: also MIPS? if (this->e_machine != Elf32_Ehdr::EM_PPC
&& this->e_machine != Elf32_Ehdr::EM_MIPS)
addLoader((sec_arm_attr || is_asl || opt->o_unix.android_shlib) addLoader((sec_arm_attr || is_asl || opt->o_unix.android_shlib)
? "HUMF_A,UMF_ANDROID" ? "HUMF_A,UMF_ANDROID"
: "HUMF_L,UMF_LINUX"); : "HUMF_L,UMF_LINUX");

106
src/stub/Makefile
View File

@ -1588,11 +1588,9 @@ tc.mips.r3000-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
tc.mips.r3000-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror tc.mips.r3000-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror
mips.r3000-linux.elf-entry.h : $(srcdir)/src/mips.r3000-linux.elf-entry.lds \ mips.r3000-linux.elf-entry.h : $(srcdir)/src/mips.r3000-linux.elf-entry.lds \
$(srcdir)/src/$$T.S \ $(srcdir)/src/$$T.S
tmp/mips.r3000-linux.elf-upxfd_linux.s
@echo; echo TARGET: $@; echo @echo; echo TARGET: $@; echo
mipsel-linux-gcc-4.1.1 -E -D__mips__ -D__MIPSEB__ -D_TARGET_LINUX_ $(srcdir)/src/$T.S \ mipsel-linux-gcc-4.1.1 -E -D__mips__ -D__MIPSEB__ -D_TARGET_LINUX_ $(srcdir)/src/$T.S \
| cat - tmp/mips.r3000-linux.elf-upxfd_linux.s \
| mipsel-elf-as-20060406 -EB -O -mno-pdr -o tmp/mips.r3000-linux.elf-entry.o | mipsel-elf-as-20060406 -EB -O -mno-pdr -o tmp/mips.r3000-linux.elf-entry.o
$(call tc,gpp_mkdep) --mode=c --MMD=$@ --MF=tmp/$T.d $(srcdir)/src/$T.S $(call tc,gpp_mkdep) --mode=c --MMD=$@ --MF=tmp/$T.d $(srcdir)/src/$T.S
multiarch-ld-2.17 -r --format=elf32-bigmips -Map tmp/$T.map -o tmp/$T.bin \ multiarch-ld-2.17 -r --format=elf32-bigmips -Map tmp/$T.map -o tmp/$T.bin \
@ -1601,21 +1599,6 @@ mips.r3000-linux.elf-entry.h : $(srcdir)/src/mips.r3000-linux.elf-entry.lds \
$(call tc,f-embed_objinfo_without_xstrip,tmp/$T.bin) $(call tc,f-embed_objinfo_without_xstrip,tmp/$T.bin)
$(call tc,bin2h) tmp/$T.bin $@ $(call tc,bin2h) tmp/$T.bin $@
tmp/mips.r3000-linux.elf-upxfd_linux.s : $(srcdir)/src/upxfd_linux.c
@echo; echo TARGET: $@; echo
cp $< tmp/mips.r3000-linux.elf-upxfd_linux.c
( cd tmp; \
mipsel-linux-gcc-4.1.1 -meb -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \
-fno-exceptions -fno-asynchronous-unwind-tables \
-Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror \
-I../src -S -O mips.r3000-linux.elf-upxfd_linux.c; \
sed < mips.r3000-linux.elf-upxfd_linux.s > mips.r3000-linux.elf-upxfd_linux.ii \
-e 's/^\t\.text/ section UMF_LINUX/' \
-e 's/ j[ ][ ]*$$L/ b $$L/' \
-e 's/ jal[ ][ ]*\([^\$$]\)/ bal \1/' ; \
mv mips.r3000-linux.elf-upxfd_linux.ii mips.r3000-linux.elf-upxfd_linux.s \
)
mips.r3000-linux.elf-fold.h : $(srcdir)/src/$$T.lds \ mips.r3000-linux.elf-fold.h : $(srcdir)/src/$$T.lds \
$(srcdir)/src/$$T.S \ $(srcdir)/src/$$T.S \
tmp/mips.r3000-linux.elf-main2.s \ tmp/mips.r3000-linux.elf-main2.s \
@ -1642,6 +1625,26 @@ mips.r3000-linux.elf-fold.h : $(srcdir)/src/$$T.lds \
# "unrecognized program segment header size" $(call tc,sstrip) tmp/$T.bin # "unrecognized program segment header size" $(call tc,sstrip) tmp/$T.bin
$(call tc,bin2h) tmp/$T.bin $@ $(call tc,bin2h) tmp/$T.bin $@
tmp/mips.r3000-linux.elf-upxfd_linux.s : $(srcdir)/src/upxfd_linux.c
@echo; echo TARGET: $@; echo
cp $< tmp/mips.r3000-linux.elf-upxfd_linux.c
( cd tmp; \
mipsel-linux-gcc-4.1.1 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \
-fno-exceptions -fno-asynchronous-unwind-tables \
-Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror \
-D__mips__ -D__MIPS__ -D__MIPSEL__ -D_TARGET_LINUX_\
-I../src -S -O mips.r3000-linux.elf-upxfd_linux.c -o - \
| cat ../src/mips.r3000-linux.elf-help_umf.S - \
| sed > mips.r3000-linux.elf-upxfd_linux.s \
-e '/section .gcc_compiled/d' \
-e '/section .mdebug.eabi/d' \
-e '/^\t\.file\t/d' \
-e 's/^\t\.text/ .section UMF_LINUX, "ax"/' \
-e 's/[ \t]j[ \t][ \t]*$$31/ jr $$31/' \
-e 's/[ \t]j[ \t]/ b /' \
-e 's/[ \t]jal[ \t]/ bal /' \
)
tmp/mips.r3000-linux.elf-main2.s: $(srcdir)/src/i386-linux.elf-main2.c tmp/mips.r3000-linux.elf-main2.s: $(srcdir)/src/i386-linux.elf-main2.c
@echo; echo TARGET: $@; echo @echo; echo TARGET: $@; echo
cp $< tmp/mips.r3000-linux.elf-main2.c cp $< tmp/mips.r3000-linux.elf-main2.c
@ -1657,8 +1660,9 @@ tmp/mips.r3000-linux.elf-main2.s: $(srcdir)/src/i386-linux.elf-main2.c
-e '/^\t\.file\t/d' \ -e '/^\t\.file\t/d' \
-e 's/L[0-9][0-9]*/L7&/g' \ -e 's/L[0-9][0-9]*/L7&/g' \
-e $$(cat ../src/dollar-dollar.sed) \ -e $$(cat ../src/dollar-dollar.sed) \
-e 's/ j[ ][ ]*$$L/ b $$L/' \ -e 's/[ \t]j[ \t][ \t]*$$31/ jr $$31/' \
-e 's/ jal[ ][ ]*\([^\$$]\)/ bal \1/' \ -e 's/[ \t]j[ \t]/ b /' \
-e 's/[ \t]jal[ \t]/ bal /' \
; \ ; \
mv mips.r3000-linux.elf-main2.ii mips.r3000-linux.elf-main2.s \ mv mips.r3000-linux.elf-main2.ii mips.r3000-linux.elf-main2.s \
) )
@ -1702,12 +1706,10 @@ tc.mipsel.r3000-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
tc.mipsel.r3000-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror tc.mipsel.r3000-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror
mipsel.r3000-linux.elf-entry.h : $(srcdir)/src/mipsel.r3000-linux.elf-entry.lds \ mipsel.r3000-linux.elf-entry.h : $(srcdir)/src/mipsel.r3000-linux.elf-entry.lds \
$(srcdir)/src/$$T.S \ $(srcdir)/src/$$T.S
tmp/mipsel.r3000-linux.elf-upxfd_linux.s
@echo; echo TARGET: $@; echo @echo; echo TARGET: $@; echo
mipsel-linux-gcc-4.1.1 -E -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \ mipsel-linux-gcc-4.1.1 -E -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \
-D__mipsel__ -D__MIPSEL__ -D_TARGET_LINUX_ $(srcdir)/src/$T.S \ -D__mipsel__ -D__MIPSEL__ -D_TARGET_LINUX_ $(srcdir)/src/$T.S \
| cat - tmp/mipsel.r3000-linux.elf-upxfd_linux.s \
| mipsel-elf-as-20060406 -EL -O -mno-pdr -o tmp/mipsel.r3000-linux.elf-entry.o | mipsel-elf-as-20060406 -EL -O -mno-pdr -o tmp/mipsel.r3000-linux.elf-entry.o
$(call tc,gpp_mkdep) --mode=c --MMD=$@ --MF=tmp/$T.d $(srcdir)/src/$T.S $(call tc,gpp_mkdep) --mode=c --MMD=$@ --MF=tmp/$T.d $(srcdir)/src/$T.S
multiarch-ld-2.17 -r --format=elf32-littlemips -Map tmp/$T.map -o tmp/$T.bin \ multiarch-ld-2.17 -r --format=elf32-littlemips -Map tmp/$T.map -o tmp/$T.bin \
@ -1716,25 +1718,6 @@ mipsel.r3000-linux.elf-entry.h : $(srcdir)/src/mipsel.r3000-linux.elf-entry.lds
$(call tc,f-embed_objinfo_without_xstrip,tmp/$T.bin) $(call tc,f-embed_objinfo_without_xstrip,tmp/$T.bin)
$(call tc,bin2h) tmp/$T.bin $@ $(call tc,bin2h) tmp/$T.bin $@
tmp/mipsel.r3000-linux.elf-upxfd_linux.s : $(srcdir)/src/upxfd_linux.c
@echo; echo TARGET: $@; echo
cp $< tmp/mipsel.r3000-linux.elf-upxfd_linux.c
( cd tmp; \
mipsel-linux-gcc-4.1.1 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \
-fno-exceptions -fno-asynchronous-unwind-tables \
-Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror \
-D__mips__ -D__MIPS__ -D__MIPSEL__ -D_TARGET_LINUX_\
-I../src -S -O mipsel.r3000-linux.elf-upxfd_linux.c; \
sed < mipsel.r3000-linux.elf-upxfd_linux.s > mipsel.r3000-linux.elf-upxfd_linux.ii \
-e '/section .gcc_compiled/d' \
-e '/section .mdebug.eabi/d' \
-e '/^\t\.file\t/d' \
-e 's/^\t\.text/ section UMF_LINUX/' \
-e 's/ j[ ][ ]*$$L/ b $$L/' \
-e 's/ jal[ ][ ]*\([^\$$]\)/ bal \1/' ; \
mv mipsel.r3000-linux.elf-upxfd_linux.ii mipsel.r3000-linux.elf-upxfd_linux.s \
)
mipsel.r3000-linux.elf-fold.h : $(srcdir)/src/$$T.lds \ mipsel.r3000-linux.elf-fold.h : $(srcdir)/src/$$T.lds \
$(srcdir)/src/$$T.S \ $(srcdir)/src/$$T.S \
tmp/mipsel.r3000-linux.elf-main2.s \ tmp/mipsel.r3000-linux.elf-main2.s \
@ -1761,6 +1744,26 @@ mipsel.r3000-linux.elf-fold.h : $(srcdir)/src/$$T.lds \
# "unrecognized program segment header size" $(call tc,sstrip) tmp/$T.bin # "unrecognized program segment header size" $(call tc,sstrip) tmp/$T.bin
$(call tc,bin2h) tmp/$T.bin $@ $(call tc,bin2h) tmp/$T.bin $@
tmp/mipsel.r3000-linux.elf-upxfd_linux.s : $(srcdir)/src/upxfd_linux.c
@echo; echo TARGET: $@; echo
cp $< tmp/mipsel.r3000-linux.elf-upxfd_linux.c
( cd tmp; \
mipsel-linux-gcc-4.1.1 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \
-fno-exceptions -fno-asynchronous-unwind-tables \
-Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror \
-D__mips__ -D__MIPS__ -D__MIPSEL__ -D_TARGET_LINUX_\
-I../src -S -O mipsel.r3000-linux.elf-upxfd_linux.c -o - \
| cat ../src/mipsel.r3000-linux.elf-help_umf.S - \
| sed > mipsel.r3000-linux.elf-upxfd_linux.s \
-e '/section .gcc_compiled/d' \
-e '/section .mdebug.eabi/d' \
-e '/^\t\.file\t/d' \
-e 's/^\t\.text/ .section UMF_LINUX, "ax"/' \
-e 's/[ \t]j[ \t][ \t]*$$31/ jr $$31/' \
-e 's/[ \t]j[ \t]/ b /' \
-e 's/[ \t]jal[ \t]/ bal /' \
)
tmp/mipsel.r3000-linux.elf-main2.s: $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-main2.c tmp/mipsel.r3000-linux.elf-main2.s: $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-main2.c
@echo; echo TARGET: $@; echo @echo; echo TARGET: $@; echo
$(call tc,gcc) -S -D__mipsel__ -D_TARGET_LINUX_ -O $< -o - \ $(call tc,gcc) -S -D__mipsel__ -D_TARGET_LINUX_ -O $< -o - \
@ -1769,8 +1772,9 @@ tmp/mipsel.r3000-linux.elf-main2.s: $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux
-e '/^\t\.file\t/d' \ -e '/^\t\.file\t/d' \
-e 's/L[0-9][0-9]*/L7&/g' \ -e 's/L[0-9][0-9]*/L7&/g' \
-e $$(cat src/dollar-dollar.sed) \ -e $$(cat src/dollar-dollar.sed) \
-e 's/ j[ ][ ]*$$L/ b $$L/' \ -e 's/[ \t]j[ \t][ \t]*$$31/ jr $$31/' \
-e 's/ jal[ ][ ]*\([^\$$]\)/ bal \1/' \ -e 's/[ \t]j[ \t]/ b /' \
-e 's/[ \t]jal[ \t]/ bal /' \
>$@ >$@
@ -1884,6 +1888,7 @@ powerpc-linux.elf-entry.h : $(srcdir)/src/$$T.S
powerpc-linux.elf-fold.h : $(srcdir)/src/$$T.lds \ powerpc-linux.elf-fold.h : $(srcdir)/src/$$T.lds \
tmp/$$T.o \ tmp/$$T.o \
tmp/powerpc-linux.elf-help_umf.o \
tmp/powerpc-linux.elf-upxfd_linux.o \ tmp/powerpc-linux.elf-upxfd_linux.o \
tmp/powerpc-expand.o \ tmp/powerpc-expand.o \
tmp/powerpc-linux.elf-main2.o tmp/powerpc-linux.elf-main2.o
@ -1899,6 +1904,9 @@ tmp/powerpc-linux.elf-main2.o : $(srcdir)/src/$$T.c
$(call tc,gcc) -c $< -o $@ $(call tc,gcc) -c $< -o $@
$(call tc,f-objstrip,$@) $(call tc,f-objstrip,$@)
tmp/powerpc-linux.elf-help_umf.o: $(srcdir)/src/$$T.S
$(call tc,gcc) -c $< -o $@
tmp/powerpc-linux.elf-upxfd_linux.o : $(srcdir)/src/upxfd_linux.c tmp/powerpc-linux.elf-upxfd_linux.o : $(srcdir)/src/upxfd_linux.c
$(call tc,gcc) -c -O $< -o $@ $(call tc,gcc) -c -O $< -o $@
$(call tc,objcopy) --rename-section .text=UMF_LINUX -R .comment -R .data -R .bss -R .note.GNU-stack $@ $(call tc,objcopy) --rename-section .text=UMF_LINUX -R .comment -R .data -R .bss -R .note.GNU-stack $@
@ -2036,8 +2044,9 @@ tmp/powerpc64le-linux.elf-main2.s: $(srcdir)/src/$$T.c $(srcdir)/src/amd64-linux
| sed -e '/^\t\.file\t/d' \ | sed -e '/^\t\.file\t/d' \
-e 's/L[0-9][0-9]*/L7&/g' \ -e 's/L[0-9][0-9]*/L7&/g' \
-e $$(cat src/dollar-dollar.sed) \ -e $$(cat src/dollar-dollar.sed) \
-e 's/ j[ ][ ]*$$L/ b $$L/' \ -e 's/[ \t]j[ \t][ \t]*$$31/ jr $$31/' \
-e 's/ jal[ ][ ]*\([^\$$]\)/ bal \1/' \ -e 's/[ \t]j[ \t]/ b /' \
-e 's/[ \t]jal[ \t]/ bal /' \
>$@ >$@
powerpc64-linux.elf%.h : tc_list = powerpc64-linux.elf default powerpc64-linux.elf%.h : tc_list = powerpc64-linux.elf default
@ -2092,8 +2101,9 @@ tmp/powerpc64-linux.elf-main2.s: $(srcdir)/src/$$T.c $(srcdir)/src/amd64-linux.e
| sed -e '/^\t\.file\t/d' \ | sed -e '/^\t\.file\t/d' \
-e 's/L[0-9][0-9]*/L7&/g' \ -e 's/L[0-9][0-9]*/L7&/g' \
-e $$(cat src/dollar-dollar.sed) \ -e $$(cat src/dollar-dollar.sed) \
-e 's/ j[ ][ ]*$$L/ b $$L/' \ -e 's/[ \t]j[ \t][ \t]*$$31/ jr $$31/' \
-e 's/ jal[ ][ ]*\([^\$$]\)/ bal \1/' \ -e 's/[ \t]j[ \t]/ b /' \
-e 's/[ \t]jal[ \t]/ bal /' \
>$@ >$@
# /*********************************************************************** # /***********************************************************************

12
src/stub/src/mips.r3000-linux.elf-help_umf.S
View File

@ -1 +1,11 @@
#include "mipsel.r3000-linux.elf-help_umf.S" .section HUMF_A, "ax"
.set noreorder
j upx_mmap_and_fd_android
nop
.set reorder
.section HUMF_L, "ax"
.set noreorder
j upx_mmap_and_fd_linux
nop
.set reorder

7
src/stub/src/mipsel.r3000-linux.elf-entry.S
View File

@ -186,9 +186,10 @@ eof_n2b:
jr ra jr ra
addiu sp,4 addiu sp,4
.balign 4 // Not needed because call memfd_create directly instead of upx_mmap_and_fd
upx_mmap_and_fd: .globl upx_mmap_and_fd // .balign 4
// section UMF_LINUX or UMF_ANDROID goes here //upx_mmap_and_fd: .globl upx_mmap_and_fd
// // section UMF_LINUX or UMF_ANDROID goes here
section ELFMAINZ; .set noreorder section ELFMAINZ; .set noreorder
L72: L72:

6
src/stub/src/mipsel.r3000-linux.elf-help_umf.S
View File

@ -1,5 +1,11 @@
.section HUMF_A, "ax" .section HUMF_A, "ax"
.set noreorder
j upx_mmap_and_fd_android j upx_mmap_and_fd_android
nop
.set reorder
.section HUMF_L, "ax" .section HUMF_L, "ax"
.set noreorder
j upx_mmap_and_fd_linux j upx_mmap_and_fd_linux
nop
.set reorder

5
src/stub/src/powerpc-linux.elf-help_umf.S Normal file
View File

@ -0,0 +1,5 @@
.section HUMF_A, "ax"
b upx_mmap_and_fd_android
.section HUMF_L, "ax"
b upx_mmap_and_fd_linux