From d3419acada3f34e99a72c647625e6fae2befaa76 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 22 Sep 2016 10:52:26 +0200 Subject: [PATCH] stub: start arm renaming. --- src/stub/Makefile | 16 ++++++++-------- ...x.shlib-init.h => arm.v5t-linux.shlib-init.h} | 12 ++++++------ ...x.shlib-init.S => arm.v4t-linux.shlib-init.S} | 2 +- src/stub/src/arm.v5t-linux.shlib-init.S | 2 ++ src/stub/src/thumb-eabi-linux.shlib-init.S | 2 -- ...in.dump => arm.v5t-linux.shlib-init.bin.dump} | 0 6 files changed, 17 insertions(+), 17 deletions(-) rename src/stub/{thumb-eabi-linux.shlib-init.h => arm.v5t-linux.shlib-init.h} (99%) rename src/stub/src/{thumb-linux.shlib-init.S => arm.v4t-linux.shlib-init.S} (99%) create mode 100644 src/stub/src/arm.v5t-linux.shlib-init.S delete mode 100644 src/stub/src/thumb-eabi-linux.shlib-init.S rename src/stub/tmp/{thumb-eabi-linux.shlib-init.bin.dump => arm.v5t-linux.shlib-init.bin.dump} (100%) diff --git a/src/stub/Makefile b/src/stub/Makefile index 19619701..939322f8 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -129,7 +129,7 @@ STUBS += powerpc64le-linux.elf-entry.h STUBS += powerpc64le-linux.elf-fold.h STUBS += powerpc64le-linux.kernel.vmlinux-head.h STUBS += powerpc64le-linux.kernel.vmlinux.h -STUBS += thumb-eabi-linux.shlib-init.h +STUBS += arm.v5t-linux.shlib-init.h endif @@ -1413,17 +1413,17 @@ powerpc64le-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S # /*********************************************************************** -# // thumb-eabi-linux.shlib (arm.v5t) +# // arm.v5t-linux.shlib (arm.v5t) # ************************************************************************/ -thumb-eabi-linux.shlib%.h : tc_list = thumb-eabi-linux.elf armel-eabi-linux.elf default -thumb-eabi-linux.shlib%.h : tc_bfdname = elf32-littlearm +arm.v5t-linux.shlib%.h : tc_list = arm.v5t-linux.elf armel-eabi-linux.elf default +arm.v5t-linux.shlib%.h : tc_bfdname = elf32-littlearm -tc.armel-eabi-linux.elf.gcc = arm-linux-gcc-4.1.0 -march=armv5t -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.v5t-linux.elf.gcc = arm-linux-gcc-4.1.0 -march=armv5t -nostdinc -MMD -MT $@ +tc.arm.v5t-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables +tc.arm.v5t-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror -thumb-eabi-linux.shlib%.h : $(srcdir)/src/$$T.S +arm.v5t-linux.shlib%.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 $@ diff --git a/src/stub/thumb-eabi-linux.shlib-init.h b/src/stub/arm.v5t-linux.shlib-init.h similarity index 99% rename from src/stub/thumb-eabi-linux.shlib-init.h rename to src/stub/arm.v5t-linux.shlib-init.h index c1960953..4c228ed8 100644 --- a/src/stub/thumb-eabi-linux.shlib-init.h +++ b/src/stub/arm.v5t-linux.shlib-init.h @@ -1,5 +1,5 @@ -/* thumb-eabi-linux.shlib-init.h - created from thumb-eabi-linux.shlib-init.bin, 15562 (0x3cca) bytes +/* arm.v5t-linux.shlib-init.h + created from arm.v5t-linux.shlib-init.bin, 15562 (0x3cca) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_THUMB_EABI_LINUX_SHLIB_INIT_SIZE 15562 -#define STUB_THUMB_EABI_LINUX_SHLIB_INIT_ADLER32 0xa92f2082 -#define STUB_THUMB_EABI_LINUX_SHLIB_INIT_CRC32 0xe5449bd7 +#define STUB_ARM_V5T_LINUX_SHLIB_INIT_SIZE 15562 +#define STUB_ARM_V5T_LINUX_SHLIB_INIT_ADLER32 0xa92f2082 +#define STUB_ARM_V5T_LINUX_SHLIB_INIT_CRC32 0xe5449bd7 -unsigned char stub_thumb_eabi_linux_shlib_init[15562] = { +unsigned char stub_arm_v5t_linux_shlib_init[15562] = { /* 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 */ 232, 20, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 40, 0, diff --git a/src/stub/src/thumb-linux.shlib-init.S b/src/stub/src/arm.v4t-linux.shlib-init.S similarity index 99% rename from src/stub/src/thumb-linux.shlib-init.S rename to src/stub/src/arm.v4t-linux.shlib-init.S index 2dcf6f05..4a83fc5e 100644 --- a/src/stub/src/thumb-linux.shlib-init.S +++ b/src/stub/src/arm.v4t-linux.shlib-init.S @@ -1,4 +1,4 @@ -/* thumb-linux.shlib-init.S -- Linux Elf shared library init & decompressor +/* arm.v4t-linux.shlib-init.S -- Linux Elf shared library init & decompressor * * This file is part of the UPX executable compressor. * diff --git a/src/stub/src/arm.v5t-linux.shlib-init.S b/src/stub/src/arm.v5t-linux.shlib-init.S new file mode 100644 index 00000000..5b29103a --- /dev/null +++ b/src/stub/src/arm.v5t-linux.shlib-init.S @@ -0,0 +1,2 @@ +#define ARMEL_EABI4 1 +#include "arm.v4t-linux.shlib-init.S" diff --git a/src/stub/src/thumb-eabi-linux.shlib-init.S b/src/stub/src/thumb-eabi-linux.shlib-init.S deleted file mode 100644 index f77a9538..00000000 --- a/src/stub/src/thumb-eabi-linux.shlib-init.S +++ /dev/null @@ -1,2 +0,0 @@ -#define ARMEL_EABI4 1 -#include "thumb-linux.shlib-init.S" diff --git a/src/stub/tmp/thumb-eabi-linux.shlib-init.bin.dump b/src/stub/tmp/arm.v5t-linux.shlib-init.bin.dump similarity index 100% rename from src/stub/tmp/thumb-eabi-linux.shlib-init.bin.dump rename to src/stub/tmp/arm.v5t-linux.shlib-init.bin.dump