From e36e8e3b33d2426ee2bcf767d91df07d738498d8 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 22 Sep 2016 11:15:49 +0200 Subject: [PATCH] stub: arm renaming. --- src/stub/Makefile | 18 +++++++++--------- ...h => armeb.v5a-linux.kernel.vmlinux-head.h} | 12 ++++++------ ...inux.h => armeb.v5a-linux.kernel.vmlinux.h} | 12 ++++++------ ...S => armeb.v5a-linux.kernel.vmlinux-head.S} | 2 +- ...inux.S => armeb.v5a-linux.kernel.vmlinux.S} | 2 +- ...=> armeb.v5a-linux.kernel.vmlinux.bin.dump} | 0 6 files changed, 23 insertions(+), 23 deletions(-) rename src/stub/{armeb-linux.kernel.vmlinux-head.h => armeb.v5a-linux.kernel.vmlinux-head.h} (76%) rename src/stub/{armeb-linux.kernel.vmlinux.h => armeb.v5a-linux.kernel.vmlinux.h} (99%) rename src/stub/src/{armeb-linux.kernel.vmlinux-head.S => armeb.v5a-linux.kernel.vmlinux-head.S} (92%) rename src/stub/src/{armeb-linux.kernel.vmlinux.S => armeb.v5a-linux.kernel.vmlinux.S} (93%) rename src/stub/tmp/{armeb-linux.kernel.vmlinux.bin.dump => armeb.v5a-linux.kernel.vmlinux.bin.dump} (100%) diff --git a/src/stub/Makefile b/src/stub/Makefile index 77df3c56..e4304d3a 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -71,8 +71,8 @@ STUBS += arm.v4a-wince.pe.h STUBS += arm.v4t-wince.pe.h STUBS += armeb-linux.elf-entry.h STUBS += armeb-linux.elf-fold.h -STUBS += armeb-linux.kernel.vmlinux-head.h -STUBS += armeb-linux.kernel.vmlinux.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 += armel-eabi-linux.shlib-init.h @@ -597,21 +597,21 @@ tmp/armeb-linux.elf-main.o : $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-ma # /*********************************************************************** -# // armeb-linux.kernel.vmlinux (arm.v5a) -# // armeb-linux.kernel.vmlinux-head (arm.v5a) +# // armeb.v5a-linux.kernel.vmlinux (arm.v5a) +# // armeb.v5a-linux.kernel.vmlinux-head (arm.v5a) # ************************************************************************/ -armeb-linux.kernel.vmlinu%.h : tc_list = armeb-linux.kernel default -armeb-linux.kernel.vmlinu%.h : tc_bfdname = elf32-bigarm +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-linux.kernel.gcc = $(tc.arm-linux.elf.gcc) -mbig-endian -march=armv5 +tc.armeb.v5a-linux.kernel.gcc = $(tc.arm-linux.elf.gcc) -mbig-endian -march=armv5 -armeb-linux.kernel.vmlinu%.h : $(srcdir)/src/$$T.S +armeb.v5a-linux.kernel.vmlinu%.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin $(call tc,f-embed_objinfo,tmp/$T.bin) $(call tc,bin2h-c) tmp/$T.bin $@ -armeb-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S +armeb.v5a-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o $(call tc,objcopy) --output-target binary --only-section .text tmp/$T.o tmp/$T.bin $(call tc,bin2h) tmp/$T.bin $@ diff --git a/src/stub/armeb-linux.kernel.vmlinux-head.h b/src/stub/armeb.v5a-linux.kernel.vmlinux-head.h similarity index 76% rename from src/stub/armeb-linux.kernel.vmlinux-head.h rename to src/stub/armeb.v5a-linux.kernel.vmlinux-head.h index 8d017dd2..d747962f 100644 --- a/src/stub/armeb-linux.kernel.vmlinux-head.h +++ b/src/stub/armeb.v5a-linux.kernel.vmlinux-head.h @@ -1,5 +1,5 @@ -/* armeb-linux.kernel.vmlinux-head.h - created from armeb-linux.kernel.vmlinux-head.bin, 8 (0x8) bytes +/* armeb.v5a-linux.kernel.vmlinux-head.h + created from armeb.v5a-linux.kernel.vmlinux-head.bin, 8 (0x8) bytes This file is part of the UPX executable compressor. @@ -31,10 +31,10 @@ */ -#define STUB_ARMEB_LINUX_KERNEL_VMLINUX_HEAD_SIZE 8 -#define STUB_ARMEB_LINUX_KERNEL_VMLINUX_HEAD_ADLER32 0x19db0637 -#define STUB_ARMEB_LINUX_KERNEL_VMLINUX_HEAD_CRC32 0xb5ec5990 +#define STUB_ARMEB_V5A_LINUX_KERNEL_VMLINUX_HEAD_SIZE 8 +#define STUB_ARMEB_V5A_LINUX_KERNEL_VMLINUX_HEAD_ADLER32 0x19db0637 +#define STUB_ARMEB_V5A_LINUX_KERNEL_VMLINUX_HEAD_CRC32 0xb5ec5990 -unsigned char stub_armeb_linux_kernel_vmlinux_head[8] = { +unsigned char stub_armeb_v5a_linux_kernel_vmlinux_head[8] = { /* 0x0000 */ 225,160,192, 14,235,255,255,254 }; diff --git a/src/stub/armeb-linux.kernel.vmlinux.h b/src/stub/armeb.v5a-linux.kernel.vmlinux.h similarity index 99% rename from src/stub/armeb-linux.kernel.vmlinux.h rename to src/stub/armeb.v5a-linux.kernel.vmlinux.h index e22887d8..172dfa58 100644 --- a/src/stub/armeb-linux.kernel.vmlinux.h +++ b/src/stub/armeb.v5a-linux.kernel.vmlinux.h @@ -1,5 +1,5 @@ -/* armeb-linux.kernel.vmlinux.h - created from armeb-linux.kernel.vmlinux.bin, 15160 (0x3b38) bytes +/* armeb.v5a-linux.kernel.vmlinux.h + created from armeb.v5a-linux.kernel.vmlinux.bin, 15160 (0x3b38) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_ARMEB_LINUX_KERNEL_VMLINUX_SIZE 15160 -#define STUB_ARMEB_LINUX_KERNEL_VMLINUX_ADLER32 0x785730ee -#define STUB_ARMEB_LINUX_KERNEL_VMLINUX_CRC32 0x7efd8186 +#define STUB_ARMEB_V5A_LINUX_KERNEL_VMLINUX_SIZE 15160 +#define STUB_ARMEB_V5A_LINUX_KERNEL_VMLINUX_ADLER32 0x785730ee +#define STUB_ARMEB_V5A_LINUX_KERNEL_VMLINUX_CRC32 0x7efd8186 -unsigned char stub_armeb_linux_kernel_vmlinux[15160] = { +unsigned char stub_armeb_v5a_linux_kernel_vmlinux[15160] = { /* 0x0000 */ 127, 69, 76, 70, 1, 2, 1, 97, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 0, 1, 0, 40, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0020 */ 0, 0, 18,244, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 40, diff --git a/src/stub/src/armeb-linux.kernel.vmlinux-head.S b/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S similarity index 92% rename from src/stub/src/armeb-linux.kernel.vmlinux-head.S rename to src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S index 7beda31a..e585cdaa 100644 --- a/src/stub/src/armeb-linux.kernel.vmlinux-head.S +++ b/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S @@ -1,5 +1,5 @@ /* -; armeb-linux.kernel.vmlinux-head.S -- set up stack for vmlinux/armeb format +; armeb.v5a-linux.kernel.vmlinux-head.S -- set up stack for vmlinux/armeb format ; ; This file is part of the UPX executable compressor. ; diff --git a/src/stub/src/armeb-linux.kernel.vmlinux.S b/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S similarity index 93% rename from src/stub/src/armeb-linux.kernel.vmlinux.S rename to src/stub/src/armeb.v5a-linux.kernel.vmlinux.S index 90d548e0..49fb0a69 100644 --- a/src/stub/src/armeb-linux.kernel.vmlinux.S +++ b/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S @@ -1,5 +1,5 @@ /* -; armeb-linux.kernel.vmlinux.S -- loader & decompressor for the vmlinux/armeb format +; armeb.v5a-linux.kernel.vmlinux.S -- loader & decompressor for the vmlinux/armeb format ; ; This file is part of the UPX executable compressor. ; diff --git a/src/stub/tmp/armeb-linux.kernel.vmlinux.bin.dump b/src/stub/tmp/armeb.v5a-linux.kernel.vmlinux.bin.dump similarity index 100% rename from src/stub/tmp/armeb-linux.kernel.vmlinux.bin.dump rename to src/stub/tmp/armeb.v5a-linux.kernel.vmlinux.bin.dump