diff --git a/src/stub/Makefile b/src/stub/Makefile index a544bb35..cd862bf4 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -62,8 +62,8 @@ STUBS += arm.v5a-darwin.macho-entry.h STUBS += arm.v5a-darwin.macho-fold.h STUBS += arm64-darwin.macho-entry.h STUBS += arm64-darwin.macho-fold.h -STUBS += arm-linux.elf-entry.h -STUBS += arm-linux.elf-fold.h +STUBS += arm.v4a-linux.elf-entry.h +STUBS += arm.v4a-linux.elf-fold.h STUBS += arm.v5a-linux.kernel.vmlinux-head.h STUBS += arm.v5a-linux.kernel.vmlinux.h STUBS += arm.v5a-linux.kernel.vmlinuz-head.h @@ -75,8 +75,8 @@ STUBS += armeb.v4a-linux.elf-entry.h STUBS += armeb.v4a-linux.elf-fold.h STUBS += armeb.v5a-linux.kernel.vmlinux-head.h STUBS += armeb.v5a-linux.kernel.vmlinux.h -STUBS += armel-eabi-linux.elf-entry.h -STUBS += armel-eabi-linux.elf-fold.h +STUBS += arm.v5a-linux.elf-entry.h +STUBS += arm.v5a-linux.elf-fold.h STUBS += arm.v5a-linux.shlib-init.h STUBS += i086-dos16.com.h STUBS += i086-dos16.exe.h @@ -410,8 +410,8 @@ amd64-win64.pep.h : $(srcdir)/src/$$T.S # // arm.v5a-darwin.macho (arm.v5a) # ************************************************************************/ -# info: we use the tc settings from arm-linux.elf, but override v4 with v5 -arm.v5a-darwin.macho%.h : tc_list = arm-linux.elf default +# info: we use the tc settings from arm.v4a-linux.elf, but override v4 with v5 +arm.v5a-darwin.macho%.h : tc_list = arm.v4a-linux.elf default arm.v5a-darwin.macho%.h : tc_bfdname = elf32-littlearm tc.arm.v5a-darwin.macho-entry.gcc = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@ tc.arm.v5a-darwin.macho-fold.gcc = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@ @@ -478,32 +478,32 @@ tmp/arm64-darwin.macho-main.o : $(srcdir)/src/$$T.c # /*********************************************************************** -# // arm-linux.elf (arm.v4a) +# // arm.v4a-linux.elf (arm.v4a) # ************************************************************************/ -arm-linux.elf%.h : tc_list = arm-linux.elf default -arm-linux.elf%.h : tc_bfdname = elf32-littlearm +arm.v4a-linux.elf%.h : tc_list = arm.v4a-linux.elf default +arm.v4a-linux.elf%.h : tc_bfdname = elf32-littlearm -tc.arm-linux.elf.gcc = arm-linux-gcc-4.1.0 -march=armv4 -nostdinc -MMD -MT $@ -tc.arm-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -tc.arm-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror +tc.arm.v4a-linux.elf.gcc = arm-linux-gcc-4.1.0 -march=armv4 -nostdinc -MMD -MT $@ +tc.arm.v4a-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables +tc.arm.v4a-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror -arm-linux.elf-entry.h : $(srcdir)/src/$$T.S +arm.v4a-linux.elf-entry.h : $(srcdir)/src/$$T.S $(call tc,gcc) -march=armv4 -c $< -o tmp/$T.bin $(call tc,f-embed_objinfo,tmp/$T.bin) $(call tc,bin2h) tmp/$T.bin $@ -arm-linux.elf-fold.h : tmp/$$T.o tmp/arm-linux.elf-main.o $(srcdir)/src/$$T.lds +arm.v4a-linux.elf-fold.h : tmp/$$T.o tmp/arm.v4a-linux.elf-main.o $(srcdir)/src/$$T.lds $(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin $(call tc,f-objstrip,tmp/$T.bin) $(call tc,sstrip) tmp/$T.bin $(call tc,bin2h) tmp/$T.bin $@ -tmp/arm-linux.elf-fold.o : $(srcdir)/src/$$T.S +tmp/arm.v4a-linux.elf-fold.o : $(srcdir)/src/$$T.S $(call tc,gcc) -c $< -o $@ $(call tc,f-objstrip,$@) -tmp/arm-linux.elf-main.o : $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-main.c +tmp/arm.v4a-linux.elf-main.o : $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-main.c $(call tc,gcc) -c -Os $< -o $@ $(call tc,f-objstrip,$@) @@ -542,7 +542,7 @@ arm.v5a-linux.kernel.vmlinuz-head.h : $(srcdir)/src/$$T.S # // arm-linux.shlib (arm.v5a) # ************************************************************************/ -arm-linux.shlib%.h : tc_list = armel-eabi-linux.elf default +arm-linux.shlib%.h : tc_list = arm.v5a-linux.elf default arm-linux.shlib%.h : tc_bfdname = elf32-littlearm arm-linux.shlib%.h : $(srcdir)/src/$$T.S @@ -556,9 +556,9 @@ arm-linux.shlib%.h : $(srcdir)/src/$$T.S # // arm.v4t-wince.pe (arm.v4t) # ************************************************************************/ -# info: we use the tc settings from arm-linux.elf -arm.v4a-wince.pe.h : tc_list = arm-linux.elf default -arm.v4t-wince.pe.h : tc_list = arm-linux.elf default +# info: we use the tc settings from arm.v4a-linux.elf +arm.v4a-wince.pe.h : tc_list = arm.v4a-linux.elf default +arm.v4t-wince.pe.h : tc_list = arm.v4a-linux.elf default arm.v4a-wince.pe.h : tc_bfdname = elf32-littlearm arm.v4t-wince.pe.h : tc_bfdname = elf32-littlearm arm.v4t-wince.pe.h : tc_objdump_disasm_options = -M force-thumb @@ -581,7 +581,7 @@ arm.v4t-wince.pe.h : $(srcdir)/src/$$T.S armeb.v4a-linux.elf%.h : tc_list = armeb.v4a-linux.elf default armeb.v4a-linux.elf%.h : tc_bfdname = elf32-bigarm -tc.armeb.v4a-linux.elf.gcc = $(tc.arm-linux.elf.gcc) -mbig-endian +tc.armeb.v4a-linux.elf.gcc = $(tc.arm.v4a-linux.elf.gcc) -mbig-endian armeb.v4a-linux.elf-entry.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c $< -o tmp/$T.bin @@ -611,7 +611,7 @@ tmp/armeb.v4a-linux.elf-main.o : $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.el armeb.v5a-linux.kernel.vmlinu%.h : tc_list = armeb.v5a-linux.kernel default armeb.v5a-linux.kernel.vmlinu%.h : tc_bfdname = elf32-bigarm -tc.armeb.v5a-linux.kernel.gcc = $(tc.arm-linux.elf.gcc) -mbig-endian -march=armv5 +tc.armeb.v5a-linux.kernel.gcc = $(tc.arm.v4a-linux.elf.gcc) -mbig-endian -march=armv5 armeb.v5a-linux.kernel.vmlinu%.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin @@ -625,28 +625,28 @@ armeb.v5a-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S # /*********************************************************************** -# // armel-eabi-linux.elf (arm.v5a) +# // arm.v5a-linux.elf (arm.v5a) # ************************************************************************/ -armel-eabi-linux.elf%.h : tc_list = armel-eabi-linux.elf default -armel-eabi-linux.elf%.h : tc_bfdname = elf32-littlearm +arm.v5a-linux.elf%.h : tc_list = arm.v5a-linux.elf default +arm.v5a-linux.elf%.h : tc_bfdname = elf32-littlearm -tc.armel-eabi-linux.elf.gcc = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@ -tc.armel-eabi-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -tc.armel-eabi-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror +tc.arm.v5a-linux.elf.gcc = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@ +tc.arm.v5a-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables +tc.arm.v5a-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror -armel-eabi-linux.elf-entry.h : $(srcdir)/src/$$T.S +arm.v5a-linux.elf-entry.h : $(srcdir)/src/$$T.S $(call tc,gcc) -march=armv5 -c $< -o tmp/$T.bin $(call tc,f-embed_objinfo,tmp/$T.bin) $(call tc,bin2h) tmp/$T.bin $@ -armel-eabi-linux.elf-fold.h : tmp/$$T.o tmp/armel-linux.elf-main.o $(srcdir)/src/arm-linux.elf-fold.lds - $(call tc,ld) --strip-all -T $(srcdir)/src/arm-linux.elf-fold.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin +arm.v5a-linux.elf-fold.h : tmp/$$T.o tmp/armel-linux.elf-main.o $(srcdir)/src/arm.v4a-linux.elf-fold.lds + $(call tc,ld) --strip-all -T $(srcdir)/src/arm.v4a-linux.elf-fold.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin $(call tc,f-objstrip,tmp/$T.bin) $(call tc,sstrip) tmp/$T.bin $(call tc,bin2h) tmp/$T.bin $@ -tmp/armel-eabi-linux.elf-fold.o : $(srcdir)/src/$$T.S +tmp/arm.v5a-linux.elf-fold.o : $(srcdir)/src/$$T.S $(call tc,gcc) -c $< -o $@ $(call tc,f-objstrip,$@) @@ -659,7 +659,7 @@ tmp/armel-linux.elf-main.o : $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-ma # // arm.v5a-linux.shlib (arm.v5a) # ************************************************************************/ -arm.v5a-linux.shlib%.h : tc_list = armel-eabi-linux.elf default +arm.v5a-linux.shlib%.h : tc_list = arm.v5a-linux.elf default arm.v5a-linux.shlib%.h : tc_bfdname = elf32-littlearm arm.v5a-linux.shlib%.h : $(srcdir)/src/$$T.S @@ -1400,7 +1400,7 @@ powerpc64le-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S # // arm.v5t-linux.shlib (arm.v5t) # ************************************************************************/ -arm.v5t-linux.shlib%.h : tc_list = arm.v5t-linux.elf armel-eabi-linux.elf default +arm.v5t-linux.shlib%.h : tc_list = arm.v5t-linux.elf arm.v5a-linux.elf default arm.v5t-linux.shlib%.h : tc_bfdname = elf32-littlearm tc.arm.v5t-linux.elf.gcc = arm-linux-gcc-4.1.0 -march=armv5t -nostdinc -MMD -MT $@ diff --git a/src/stub/arm-linux.elf-entry.h b/src/stub/arm.v4a-linux.elf-entry.h similarity index 99% rename from src/stub/arm-linux.elf-entry.h rename to src/stub/arm.v4a-linux.elf-entry.h index 624f2c94..7682af7b 100644 --- a/src/stub/arm-linux.elf-entry.h +++ b/src/stub/arm.v4a-linux.elf-entry.h @@ -1,5 +1,5 @@ -/* arm-linux.elf-entry.h - created from arm-linux.elf-entry.bin, 14939 (0x3a5b) bytes +/* arm.v4a-linux.elf-entry.h + created from arm.v4a-linux.elf-entry.bin, 14939 (0x3a5b) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_ARM_LINUX_ELF_ENTRY_SIZE 14939 -#define STUB_ARM_LINUX_ELF_ENTRY_ADLER32 0x63c9224e -#define STUB_ARM_LINUX_ELF_ENTRY_CRC32 0x33ce036f +#define STUB_ARM_V4A_LINUX_ELF_ENTRY_SIZE 14939 +#define STUB_ARM_V4A_LINUX_ELF_ENTRY_ADLER32 0x63c9224e +#define STUB_ARM_V4A_LINUX_ELF_ENTRY_CRC32 0x33ce036f -unsigned char stub_arm_linux_elf_entry[14939] = { +unsigned char stub_arm_v4a_linux_elf_entry[14939] = { /* 0x0000 */ 127, 69, 76, 70, 1, 1, 1, 97, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 1, 0, 40, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0020 */ 120, 19, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 40, 0, diff --git a/src/stub/arm-linux.elf-fold.h b/src/stub/arm.v4a-linux.elf-fold.h similarity index 97% rename from src/stub/arm-linux.elf-fold.h rename to src/stub/arm.v4a-linux.elf-fold.h index 1932f199..91585d0e 100644 --- a/src/stub/arm-linux.elf-fold.h +++ b/src/stub/arm.v4a-linux.elf-fold.h @@ -1,5 +1,5 @@ -/* arm-linux.elf-fold.h - created from arm-linux.elf-fold.bin, 2580 (0xa14) bytes +/* arm.v4a-linux.elf-fold.h + created from arm.v4a-linux.elf-fold.bin, 2580 (0xa14) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_ARM_LINUX_ELF_FOLD_SIZE 2580 -#define STUB_ARM_LINUX_ELF_FOLD_ADLER32 0x44f82e48 -#define STUB_ARM_LINUX_ELF_FOLD_CRC32 0x13bfa79e +#define STUB_ARM_V4A_LINUX_ELF_FOLD_SIZE 2580 +#define STUB_ARM_V4A_LINUX_ELF_FOLD_ADLER32 0x44f82e48 +#define STUB_ARM_V4A_LINUX_ELF_FOLD_CRC32 0x13bfa79e -unsigned char stub_arm_linux_elf_fold[2580] = { +unsigned char stub_arm_v4a_linux_elf_fold[2580] = { /* 0x0000 */ 127, 69, 76, 70, 1, 1, 1, 97, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 2, 0, 40, 0, 1, 0, 0, 0,128,128, 0, 0, 52, 0, 0, 0, /* 0x0020 */ 0, 0, 0, 0, 2, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, 0, diff --git a/src/stub/armel-eabi-linux.elf-entry.h b/src/stub/arm.v5a-linux.elf-entry.h similarity index 99% rename from src/stub/armel-eabi-linux.elf-entry.h rename to src/stub/arm.v5a-linux.elf-entry.h index 7db7829d..fa1fb342 100644 --- a/src/stub/armel-eabi-linux.elf-entry.h +++ b/src/stub/arm.v5a-linux.elf-entry.h @@ -1,5 +1,5 @@ -/* armel-eabi-linux.elf-entry.h - created from armel-eabi-linux.elf-entry.bin, 15023 (0x3aaf) bytes +/* arm.v5a-linux.elf-entry.h + created from arm.v5a-linux.elf-entry.bin, 15023 (0x3aaf) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_ARMEL_EABI_LINUX_ELF_ENTRY_SIZE 15023 -#define STUB_ARMEL_EABI_LINUX_ELF_ENTRY_ADLER32 0x2bde4a99 -#define STUB_ARMEL_EABI_LINUX_ELF_ENTRY_CRC32 0x88e4202b +#define STUB_ARM_V5A_LINUX_ELF_ENTRY_SIZE 15023 +#define STUB_ARM_V5A_LINUX_ELF_ENTRY_ADLER32 0x2bde4a99 +#define STUB_ARM_V5A_LINUX_ELF_ENTRY_CRC32 0x88e4202b -unsigned char stub_armel_eabi_linux_elf_entry[15023] = { +unsigned char stub_arm_v5a_linux_elf_entry[15023] = { /* 0x0000 */ 127, 69, 76, 70, 1, 1, 1, 97, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 1, 0, 40, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0020 */ 204, 19, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 40, 0, diff --git a/src/stub/armel-eabi-linux.elf-fold.h b/src/stub/arm.v5a-linux.elf-fold.h similarity index 97% rename from src/stub/armel-eabi-linux.elf-fold.h rename to src/stub/arm.v5a-linux.elf-fold.h index 8947b279..afc70b5c 100644 --- a/src/stub/armel-eabi-linux.elf-fold.h +++ b/src/stub/arm.v5a-linux.elf-fold.h @@ -1,5 +1,5 @@ -/* armel-eabi-linux.elf-fold.h - created from armel-eabi-linux.elf-fold.bin, 2732 (0xaac) bytes +/* arm.v5a-linux.elf-fold.h + created from arm.v5a-linux.elf-fold.bin, 2732 (0xaac) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_ARMEL_EABI_LINUX_ELF_FOLD_SIZE 2732 -#define STUB_ARMEL_EABI_LINUX_ELF_FOLD_ADLER32 0x86407765 -#define STUB_ARMEL_EABI_LINUX_ELF_FOLD_CRC32 0x6bd6d8af +#define STUB_ARM_V5A_LINUX_ELF_FOLD_SIZE 2732 +#define STUB_ARM_V5A_LINUX_ELF_FOLD_ADLER32 0x86407765 +#define STUB_ARM_V5A_LINUX_ELF_FOLD_CRC32 0x6bd6d8af -unsigned char stub_armel_eabi_linux_elf_fold[2732] = { +unsigned char stub_arm_v5a_linux_elf_fold[2732] = { /* 0x0000 */ 127, 69, 76, 70, 1, 1, 1, 97, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 2, 0, 40, 0, 1, 0, 0, 0,128,128, 0, 0, 52, 0, 0, 0, /* 0x0020 */ 0, 0, 0, 0, 2, 0, 0, 0, 52, 0, 32, 0, 2, 0, 0, 0, diff --git a/src/stub/src/arm-linux.elf-entry.S b/src/stub/src/arm.v4a-linux.elf-entry.S similarity index 100% rename from src/stub/src/arm-linux.elf-entry.S rename to src/stub/src/arm.v4a-linux.elf-entry.S diff --git a/src/stub/src/arm-linux.elf-fold.S b/src/stub/src/arm.v4a-linux.elf-fold.S similarity index 100% rename from src/stub/src/arm-linux.elf-fold.S rename to src/stub/src/arm.v4a-linux.elf-fold.S diff --git a/src/stub/src/arm-linux.elf-fold.lds b/src/stub/src/arm.v4a-linux.elf-fold.lds similarity index 100% rename from src/stub/src/arm-linux.elf-fold.lds rename to src/stub/src/arm.v4a-linux.elf-fold.lds diff --git a/src/stub/src/arm-linux.elf-main.c b/src/stub/src/arm.v4a-linux.elf-main.c similarity index 100% rename from src/stub/src/arm-linux.elf-main.c rename to src/stub/src/arm.v4a-linux.elf-main.c diff --git a/src/stub/src/arm.v5a-linux.elf-entry.S b/src/stub/src/arm.v5a-linux.elf-entry.S new file mode 100644 index 00000000..ef87028b --- /dev/null +++ b/src/stub/src/arm.v5a-linux.elf-entry.S @@ -0,0 +1,2 @@ +#define ARMEL_EABI4 1 +#include "arm.v4a-linux.elf-entry.S" diff --git a/src/stub/src/arm.v5a-linux.elf-fold.S b/src/stub/src/arm.v5a-linux.elf-fold.S new file mode 100644 index 00000000..dd57c756 --- /dev/null +++ b/src/stub/src/arm.v5a-linux.elf-fold.S @@ -0,0 +1,2 @@ +#define ARMEL_EABI4 1 +#include "arm.v4a-linux.elf-fold.S" diff --git a/src/stub/src/armeb.v4a-linux.elf-entry.S b/src/stub/src/armeb.v4a-linux.elf-entry.S index ae637c20..160b9b20 100644 --- a/src/stub/src/armeb.v4a-linux.elf-entry.S +++ b/src/stub/src/armeb.v4a-linux.elf-entry.S @@ -1,2 +1,2 @@ #define ARM_OLDABI 1 -#include "arm-linux.elf-entry.S" +#include "arm.v4a-linux.elf-entry.S" diff --git a/src/stub/src/armeb.v4a-linux.elf-fold.S b/src/stub/src/armeb.v4a-linux.elf-fold.S index 6f8af066..762f9540 100644 --- a/src/stub/src/armeb.v4a-linux.elf-fold.S +++ b/src/stub/src/armeb.v4a-linux.elf-fold.S @@ -29,7 +29,7 @@ #define ARM_OLDABI 1 #define FILTER_ID 0x51 /* big-endian */ -#include "arm-linux.elf-fold.S" +#include "arm.v4a-linux.elf-fold.S" #undef FILTER_ID @ vi:ts=8:et:nowrap diff --git a/src/stub/src/armel-eabi-linux.elf-entry.S b/src/stub/src/armel-eabi-linux.elf-entry.S deleted file mode 100644 index 473c815d..00000000 --- a/src/stub/src/armel-eabi-linux.elf-entry.S +++ /dev/null @@ -1,2 +0,0 @@ -#define ARMEL_EABI4 1 -#include "arm-linux.elf-entry.S" diff --git a/src/stub/src/armel-eabi-linux.elf-fold.S b/src/stub/src/armel-eabi-linux.elf-fold.S deleted file mode 100644 index 97bdfc85..00000000 --- a/src/stub/src/armel-eabi-linux.elf-fold.S +++ /dev/null @@ -1,2 +0,0 @@ -#define ARMEL_EABI4 1 -#include "arm-linux.elf-fold.S" diff --git a/src/stub/tmp/arm-linux.elf-entry.bin.dump b/src/stub/tmp/arm.v4a-linux.elf-entry.bin.dump similarity index 100% rename from src/stub/tmp/arm-linux.elf-entry.bin.dump rename to src/stub/tmp/arm.v4a-linux.elf-entry.bin.dump diff --git a/src/stub/tmp/armel-eabi-linux.elf-entry.bin.dump b/src/stub/tmp/arm.v5a-linux.elf-entry.bin.dump similarity index 100% rename from src/stub/tmp/armel-eabi-linux.elf-entry.bin.dump rename to src/stub/tmp/arm.v5a-linux.elf-entry.bin.dump