From 188f67cfcada718398a42ec84fe224a420a56c18 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 22 Sep 2016 10:20:54 +0200 Subject: [PATCH] stub: rename ppc64le to powerpc64le. --- src/stub/Makefile | 82 +++++++++---------- ...try.h => powerpc64le-darwin.dylib-entry.h} | 12 +-- ...try.h => powerpc64le-darwin.macho-entry.h} | 12 +-- ...fold.h => powerpc64le-darwin.macho-fold.h} | 12 +-- ...-entry.h => powerpc64le-linux.elf-entry.h} | 12 +-- ...lf-fold.h => powerpc64le-linux.elf-fold.h} | 12 +-- ...> powerpc64le-linux.kernel.vmlinux-head.h} | 12 +-- ...x.h => powerpc64le-linux.kernel.vmlinux.h} | 12 +-- .../{ppc64le/64 => powerpc/64le}/Makefile | 0 .../64 => powerpc/64le}/Makefile.extra | 4 +- .../arch/{ppc64le/64 => powerpc/64le}/bxx.S | 0 .../{ppc64le/64 => powerpc/64le}/lzma_d.S | 0 .../{ppc64le/64 => powerpc/64le}/lzma_d_cf.S | 0 .../{ppc64le/64 => powerpc/64le}/lzma_d_cs.S | 0 .../{ppc64le/64 => powerpc/64le}/macros.S | 0 .../{ppc64le/64 => powerpc/64le}/nrv2b_d.S | 0 .../{ppc64le/64 => powerpc/64le}/nrv2d_d.S | 0 .../{ppc64le/64 => powerpc/64le}/nrv2e_d.S | 0 .../{ppc64le/64 => powerpc/64le}/ppc_regs.h | 0 src/stub/src/arch/ppc64le/Makefile | 3 - ...try.S => powerpc64le-darwin.dylib-entry.S} | 16 ++-- ...try.S => powerpc64le-darwin.macho-entry.S} | 14 ++-- ...fold.S => powerpc64le-darwin.macho-fold.S} | 2 +- ...main.c => powerpc64le-darwin.macho-main.c} | 2 +- ...-entry.S => powerpc64le-linux.elf-entry.S} | 14 ++-- ...lf-fold.S => powerpc64le-linux.elf-fold.S} | 8 +- ...old.lds => powerpc64le-linux.elf-fold.lds} | 2 +- ...lf-main.c => powerpc64le-linux.elf-main.c} | 0 ...> powerpc64le-linux.kernel.vmlinux-head.S} | 0 ...x.S => powerpc64le-linux.kernel.vmlinux.S} | 14 ++-- ...> powerpc64le-darwin.dylib-entry.bin.dump} | 0 ...> powerpc64le-darwin.macho-entry.bin.dump} | 0 ...p => powerpc64le-linux.elf-entry.bin.dump} | 0 ...powerpc64le-linux.kernel.vmlinux.bin.dump} | 0 34 files changed, 121 insertions(+), 124 deletions(-) rename src/stub/{ppc64le-darwin.dylib-entry.h => powerpc64le-darwin.dylib-entry.h} (99%) rename src/stub/{ppc64le-darwin.macho-entry.h => powerpc64le-darwin.macho-entry.h} (99%) rename src/stub/{ppc64le-darwin.macho-fold.h => powerpc64le-darwin.macho-fold.h} (98%) rename src/stub/{ppc64le-linux.elf-entry.h => powerpc64le-linux.elf-entry.h} (99%) rename src/stub/{ppc64le-linux.elf-fold.h => powerpc64le-linux.elf-fold.h} (97%) rename src/stub/{ppc64le-linux.kernel.vmlinux-head.h => powerpc64le-linux.kernel.vmlinux-head.h} (76%) rename src/stub/{ppc64le-linux.kernel.vmlinux.h => powerpc64le-linux.kernel.vmlinux.h} (99%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/Makefile (100%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/Makefile.extra (93%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/bxx.S (100%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/lzma_d.S (100%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/lzma_d_cf.S (100%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/lzma_d_cs.S (100%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/macros.S (100%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/nrv2b_d.S (100%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/nrv2d_d.S (100%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/nrv2e_d.S (100%) rename src/stub/src/arch/{ppc64le/64 => powerpc/64le}/ppc_regs.h (100%) delete mode 100644 src/stub/src/arch/ppc64le/Makefile rename src/stub/src/{ppc64le-darwin.dylib-entry.S => powerpc64le-darwin.dylib-entry.S} (96%) rename src/stub/src/{ppc64le-darwin.macho-entry.S => powerpc64le-darwin.macho-entry.S} (93%) rename src/stub/src/{ppc64le-darwin.macho-fold.S => powerpc64le-darwin.macho-fold.S} (98%) rename src/stub/src/{ppc64le-darwin.macho-main.c => powerpc64le-darwin.macho-main.c} (99%) rename src/stub/src/{ppc64le-linux.elf-entry.S => powerpc64le-linux.elf-entry.S} (95%) rename src/stub/src/{ppc64le-linux.elf-fold.S => powerpc64le-linux.elf-fold.S} (97%) rename src/stub/src/{ppc64le-linux.elf-fold.lds => powerpc64le-linux.elf-fold.lds} (97%) rename src/stub/src/{ppc64le-linux.elf-main.c => powerpc64le-linux.elf-main.c} (100%) rename src/stub/src/{ppc64le-linux.kernel.vmlinux-head.S => powerpc64le-linux.kernel.vmlinux-head.S} (100%) rename src/stub/src/{ppc64le-linux.kernel.vmlinux.S => powerpc64le-linux.kernel.vmlinux.S} (93%) rename src/stub/tmp/{ppc64le-darwin.dylib-entry.bin.dump => powerpc64le-darwin.dylib-entry.bin.dump} (100%) rename src/stub/tmp/{ppc64le-darwin.macho-entry.bin.dump => powerpc64le-darwin.macho-entry.bin.dump} (100%) rename src/stub/tmp/{ppc64le-linux.elf-entry.bin.dump => powerpc64le-linux.elf-entry.bin.dump} (100%) rename src/stub/tmp/{ppc64le-linux.kernel.vmlinux.bin.dump => powerpc64le-linux.kernel.vmlinux.bin.dump} (100%) diff --git a/src/stub/Makefile b/src/stub/Makefile index 9767bf4e..3c0ae909 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -122,13 +122,13 @@ STUBS += powerpc-linux.elf-entry.h STUBS += powerpc-linux.elf-fold.h STUBS += powerpc-linux.kernel.vmlinux-head.h STUBS += powerpc-linux.kernel.vmlinux.h -STUBS += ppc64le-darwin.dylib-entry.h -STUBS += ppc64le-darwin.macho-entry.h -STUBS += ppc64le-darwin.macho-fold.h -STUBS += ppc64le-linux.elf-entry.h -STUBS += ppc64le-linux.elf-fold.h -STUBS += ppc64le-linux.kernel.vmlinux-head.h -STUBS += ppc64le-linux.kernel.vmlinux.h +STUBS += powerpc64le-darwin.dylib-entry.h +STUBS += powerpc64le-darwin.macho-entry.h +STUBS += powerpc64le-darwin.macho-fold.h +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 endif @@ -1308,28 +1308,28 @@ powerpc-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S # /*********************************************************************** -# // ppc64le-darwin.macho +# // powerpc64le-darwin.macho # ************************************************************************/ -# info: we use the tc settings from ppc64le-linux.elf -ppc64le-darwin.macho%.h : tc_list = ppc64le-darwin.macho ppc64le-linux.elf default -ppc64le-darwin.macho%.h : tc_bfdname = elf64-powerpcle +# info: we use the tc settings from powerpc64le-linux.elf +powerpc64le-darwin.macho%.h : tc_list = powerpc64le-darwin.macho powerpc64le-linux.elf default +powerpc64le-darwin.macho%.h : tc_bfdname = elf64-powerpcle -tc.ppc64le-darwin.macho.ld = multiarch-ld-2.27 -b $(tc_bfdname) +tc.powerpc64le-darwin.macho.ld = multiarch-ld-2.27 -b $(tc_bfdname) -ppc64le-darwin.macho-entry.h : $(srcdir)/src/$$T.S +powerpc64le-darwin.macho-entry.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c $< -o tmp/$T.bin $(call tc,f-embed_objinfo,tmp/$T.bin) $(call tc,bin2h) tmp/$T.bin $@ -ppc64le-darwin.macho-fold.h : tmp/$$T.o tmp/ppc64le-darwin.macho-main.o +powerpc64le-darwin.macho-fold.h : tmp/$$T.o tmp/powerpc64le-darwin.macho-main.o # FIXME: undefined reference to `_savegpr0_28' etc. $(call tc,ld) --no-warn-mismatch --strip-all --oformat binary -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin # echo "FIXME" > tmp/$T.bin chmod a-x tmp/$T.bin $(call tc,bin2h) tmp/$T.bin $@ -tmp/ppc64le-darwin.macho-fold.o : $(srcdir)/src/$$T.S +tmp/powerpc64le-darwin.macho-fold.o : $(srcdir)/src/$$T.S $(call tc,gcc) -c $< -o $@ $(call tc,f-objstrip,$@) @@ -1337,76 +1337,76 @@ tmp/ppc64le-darwin.macho-fold.o : $(srcdir)/src/$$T.S # only 3 times, so sharing the code of those routines saves almost nothing # (and we would have to write them ourselves.) # Besides, PowerPC has 31.5 registers (r0 cannot index), which is plenty. -tmp/ppc64le-darwin.macho-main.o : $(srcdir)/src/$$T.c +tmp/powerpc64le-darwin.macho-main.o : $(srcdir)/src/$$T.c $(call tc,gcc) -c -O $< -o $@ $(call tc,f-objstrip,$@) # /*********************************************************************** -# // ppc64le-darwin.dylib +# // powerpc64le-darwin.dylib # ************************************************************************/ -# info: we use the tc settings from ppc64le-linux.elf -ppc64le-darwin.dylib%.h : tc_list = ppc64le-linux.elf default -ppc64le-darwin.dylib%.h : tc_bfdname = elf64-powerpcle +# info: we use the tc settings from powerpc64le-linux.elf +powerpc64le-darwin.dylib%.h : tc_list = powerpc64le-linux.elf default +powerpc64le-darwin.dylib%.h : tc_bfdname = elf64-powerpcle -ppc64le-darwin.dylib-entry.h : $(srcdir)/src/$$T.S +powerpc64le-darwin.dylib-entry.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c $< -o tmp/$T.bin $(call tc,f-embed_objinfo,tmp/$T.bin) $(call tc,bin2h) tmp/$T.bin $@ # /*********************************************************************** -# // ppc64le-linux.elf +# // powerpc64le-linux.elf # ************************************************************************/ -ppc64le-linux.elf%.h : tc_list = ppc64le-linux.elf default -ppc64le-linux.elf%.h : tc_bfdname = elf64-powerpcle +powerpc64le-linux.elf%.h : tc_list = powerpc64le-linux.elf default +powerpc64le-linux.elf%.h : tc_bfdname = elf64-powerpcle -tc.ppc64le-linux.elf.gcc = powerpc64-linux-gcc-4.9.2 -m64 -mlittle-endian -nostdinc -MMD -MT $@ -tc.ppc64le-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -fno-stack-protector -tc.ppc64le-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror +tc.powerpc64le-linux.elf.gcc = powerpc64-linux-gcc-4.9.2 -m64 -mlittle-endian -nostdinc -MMD -MT $@ +tc.powerpc64le-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -fno-stack-protector +tc.powerpc64le-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror -tc.ppc64le-linux.elf.ld = powerpc64-linux-ld-2.25 -b $(tc_bfdname) -tc.ppc64le-linux.elf.objcopy = multiarch-objcopy-2.27 -F $(tc_bfdname) -tc.ppc64le-linux.elf.objdump = multiarch-objdump-2.27 -b $(tc_bfdname) +tc.powerpc64le-linux.elf.ld = powerpc64-linux-ld-2.25 -b $(tc_bfdname) +tc.powerpc64le-linux.elf.objcopy = multiarch-objcopy-2.27 -F $(tc_bfdname) +tc.powerpc64le-linux.elf.objdump = multiarch-objdump-2.27 -b $(tc_bfdname) -ppc64le-linux.elf-entry.h : $(srcdir)/src/$$T.S +powerpc64le-linux.elf-entry.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c $< -o tmp/$T.bin $(call tc,f-embed_objinfo,tmp/$T.bin) $(call tc,bin2h) tmp/$T.bin $@ -ppc64le-linux.elf-fold.h : tmp/$$T.o tmp/ppc64le-linux.elf-main.o $(srcdir)/src/$$T.lds +powerpc64le-linux.elf-fold.h : tmp/$$T.o tmp/powerpc64le-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/ppc64le-linux.elf-fold.o : $(srcdir)/src/$$T.S +tmp/powerpc64le-linux.elf-fold.o : $(srcdir)/src/$$T.S $(call tc,gcc) -c $< -o $@ $(call tc,f-objstrip,$@) -tmp/ppc64le-linux.elf-main.o : $(srcdir)/src/$$T.c +tmp/powerpc64le-linux.elf-main.o : $(srcdir)/src/$$T.c $(call tc,gcc) -c -Os $< -o $@ $(call tc,f-objstrip,$@) # /*********************************************************************** -# // ppc64le-linux.kernel.vmlinux -# // ppc64le-linux.kernel.vmlinux-head +# // powerpc64le-linux.kernel.vmlinux +# // powerpc64le-linux.kernel.vmlinux-head # ************************************************************************/ -ppc64le-linux.kernel.vmlinu%.h : tc_list = ppc64le-linux.kernel default -ppc64le-linux.kernel.vmlinu%.h : tc_bfdname = elf64-powerpcle +powerpc64le-linux.kernel.vmlinu%.h : tc_list = powerpc64le-linux.kernel default +powerpc64le-linux.kernel.vmlinu%.h : tc_bfdname = elf64-powerpcle -tc.ppc64le-linux.kernel.gcc = $(tc.ppc64le-linux.elf.gcc) +tc.powerpc64le-linux.kernel.gcc = $(tc.powerpc64le-linux.elf.gcc) -ppc64le-linux.kernel.vmlinu%.h : $(srcdir)/src/$$T.S +powerpc64le-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 $@ -ppc64le-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S +powerpc64le-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/ppc64le-darwin.dylib-entry.h b/src/stub/powerpc64le-darwin.dylib-entry.h similarity index 99% rename from src/stub/ppc64le-darwin.dylib-entry.h rename to src/stub/powerpc64le-darwin.dylib-entry.h index 8bbcd9ac..8b655e5a 100644 --- a/src/stub/ppc64le-darwin.dylib-entry.h +++ b/src/stub/powerpc64le-darwin.dylib-entry.h @@ -1,5 +1,5 @@ -/* ppc64le-darwin.dylib-entry.h - created from ppc64le-darwin.dylib-entry.bin, 9851 (0x267b) bytes +/* powerpc64le-darwin.dylib-entry.h + created from powerpc64le-darwin.dylib-entry.bin, 9851 (0x267b) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_PPC64LE_DARWIN_DYLIB_ENTRY_SIZE 9851 -#define STUB_PPC64LE_DARWIN_DYLIB_ENTRY_ADLER32 0x2a885bc3 -#define STUB_PPC64LE_DARWIN_DYLIB_ENTRY_CRC32 0x9d3b5811 +#define STUB_POWERPC64LE_DARWIN_DYLIB_ENTRY_SIZE 9851 +#define STUB_POWERPC64LE_DARWIN_DYLIB_ENTRY_ADLER32 0x2a885bc3 +#define STUB_POWERPC64LE_DARWIN_DYLIB_ENTRY_CRC32 0x9d3b5811 -unsigned char stub_ppc64le_darwin_dylib_entry[9851] = { +unsigned char stub_powerpc64le_darwin_dylib_entry[9851] = { /* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 1, 0, 21, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0020 */ 0, 0, 0, 0, 0, 0, 0, 0,152, 29, 0, 0, 0, 0, 0, 0, diff --git a/src/stub/ppc64le-darwin.macho-entry.h b/src/stub/powerpc64le-darwin.macho-entry.h similarity index 99% rename from src/stub/ppc64le-darwin.macho-entry.h rename to src/stub/powerpc64le-darwin.macho-entry.h index 3d2cf745..575e56e5 100644 --- a/src/stub/ppc64le-darwin.macho-entry.h +++ b/src/stub/powerpc64le-darwin.macho-entry.h @@ -1,5 +1,5 @@ -/* ppc64le-darwin.macho-entry.h - created from ppc64le-darwin.macho-entry.bin, 9187 (0x23e3) bytes +/* powerpc64le-darwin.macho-entry.h + created from powerpc64le-darwin.macho-entry.bin, 9187 (0x23e3) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_PPC64LE_DARWIN_MACHO_ENTRY_SIZE 9187 -#define STUB_PPC64LE_DARWIN_MACHO_ENTRY_ADLER32 0x8b1d4a8e -#define STUB_PPC64LE_DARWIN_MACHO_ENTRY_CRC32 0x1d66b327 +#define STUB_POWERPC64LE_DARWIN_MACHO_ENTRY_SIZE 9187 +#define STUB_POWERPC64LE_DARWIN_MACHO_ENTRY_ADLER32 0x8b1d4a8e +#define STUB_POWERPC64LE_DARWIN_MACHO_ENTRY_CRC32 0x1d66b327 -unsigned char stub_ppc64le_darwin_macho_entry[9187] = { +unsigned char stub_powerpc64le_darwin_macho_entry[9187] = { /* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 1, 0, 21, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0020 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, diff --git a/src/stub/ppc64le-darwin.macho-fold.h b/src/stub/powerpc64le-darwin.macho-fold.h similarity index 98% rename from src/stub/ppc64le-darwin.macho-fold.h rename to src/stub/powerpc64le-darwin.macho-fold.h index 832eb0d4..fb8dc413 100644 --- a/src/stub/ppc64le-darwin.macho-fold.h +++ b/src/stub/powerpc64le-darwin.macho-fold.h @@ -1,5 +1,5 @@ -/* ppc64le-darwin.macho-fold.h - created from ppc64le-darwin.macho-fold.bin, 6344 (0x18c8) bytes +/* powerpc64le-darwin.macho-fold.h + created from powerpc64le-darwin.macho-fold.bin, 6344 (0x18c8) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_PPC64LE_DARWIN_MACHO_FOLD_SIZE 6344 -#define STUB_PPC64LE_DARWIN_MACHO_FOLD_ADLER32 0xaa2e4fd4 -#define STUB_PPC64LE_DARWIN_MACHO_FOLD_CRC32 0x06ae68ec +#define STUB_POWERPC64LE_DARWIN_MACHO_FOLD_SIZE 6344 +#define STUB_POWERPC64LE_DARWIN_MACHO_FOLD_ADLER32 0xaa2e4fd4 +#define STUB_POWERPC64LE_DARWIN_MACHO_FOLD_CRC32 0x06ae68ec -unsigned char stub_ppc64le_darwin_macho_fold[6344] = { +unsigned char stub_powerpc64le_darwin_macho_fold[6344] = { /* 0x0000 */ 105, 0, 0, 72,208, 0, 6, 40, 32, 0,194, 76,191,240,132, 84, /* 0x0010 */ 32, 0,194, 77, 16, 0, 0, 60, 64, 0, 4,124, 8, 0,128, 65, /* 0x0020 */ 120, 3, 4,124, 32, 1,165, 56,120, 27,103,124,252,255, 99, 56, diff --git a/src/stub/ppc64le-linux.elf-entry.h b/src/stub/powerpc64le-linux.elf-entry.h similarity index 99% rename from src/stub/ppc64le-linux.elf-entry.h rename to src/stub/powerpc64le-linux.elf-entry.h index e5b40a7f..011b6141 100644 --- a/src/stub/ppc64le-linux.elf-entry.h +++ b/src/stub/powerpc64le-linux.elf-entry.h @@ -1,5 +1,5 @@ -/* ppc64le-linux.elf-entry.h - created from ppc64le-linux.elf-entry.bin, 9657 (0x25b9) bytes +/* powerpc64le-linux.elf-entry.h + created from powerpc64le-linux.elf-entry.bin, 9657 (0x25b9) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_PPC64LE_LINUX_ELF_ENTRY_SIZE 9657 -#define STUB_PPC64LE_LINUX_ELF_ENTRY_ADLER32 0x20e0ce9f -#define STUB_PPC64LE_LINUX_ELF_ENTRY_CRC32 0x65fa7f1a +#define STUB_POWERPC64LE_LINUX_ELF_ENTRY_SIZE 9657 +#define STUB_POWERPC64LE_LINUX_ELF_ENTRY_ADLER32 0x20e0ce9f +#define STUB_POWERPC64LE_LINUX_ELF_ENTRY_CRC32 0x65fa7f1a -unsigned char stub_ppc64le_linux_elf_entry[9657] = { +unsigned char stub_powerpc64le_linux_elf_entry[9657] = { /* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 1, 0, 21, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0020 */ 0, 0, 0, 0, 0, 0, 0, 0, 16, 28, 0, 0, 0, 0, 0, 0, diff --git a/src/stub/ppc64le-linux.elf-fold.h b/src/stub/powerpc64le-linux.elf-fold.h similarity index 97% rename from src/stub/ppc64le-linux.elf-fold.h rename to src/stub/powerpc64le-linux.elf-fold.h index 13685372..83e4e4df 100644 --- a/src/stub/ppc64le-linux.elf-fold.h +++ b/src/stub/powerpc64le-linux.elf-fold.h @@ -1,5 +1,5 @@ -/* ppc64le-linux.elf-fold.h - created from ppc64le-linux.elf-fold.bin, 2379 (0x94b) bytes +/* powerpc64le-linux.elf-fold.h + created from powerpc64le-linux.elf-fold.bin, 2379 (0x94b) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_PPC64LE_LINUX_ELF_FOLD_SIZE 2379 -#define STUB_PPC64LE_LINUX_ELF_FOLD_ADLER32 0x1fa74a77 -#define STUB_PPC64LE_LINUX_ELF_FOLD_CRC32 0xc33ee113 +#define STUB_POWERPC64LE_LINUX_ELF_FOLD_SIZE 2379 +#define STUB_POWERPC64LE_LINUX_ELF_FOLD_ADLER32 0x1fa74a77 +#define STUB_POWERPC64LE_LINUX_ELF_FOLD_CRC32 0xc33ee113 -unsigned char stub_ppc64le_linux_elf_fold[2379] = { +unsigned char stub_powerpc64le_linux_elf_fold[2379] = { /* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 2, 0, 21, 0, 1, 0, 0, 0, 0, 9, 16, 0, 0, 0, 0, 0, /* 0x0020 */ 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/src/stub/ppc64le-linux.kernel.vmlinux-head.h b/src/stub/powerpc64le-linux.kernel.vmlinux-head.h similarity index 76% rename from src/stub/ppc64le-linux.kernel.vmlinux-head.h rename to src/stub/powerpc64le-linux.kernel.vmlinux-head.h index 363bb820..0325626a 100644 --- a/src/stub/ppc64le-linux.kernel.vmlinux-head.h +++ b/src/stub/powerpc64le-linux.kernel.vmlinux-head.h @@ -1,5 +1,5 @@ -/* ppc64le-linux.kernel.vmlinux-head.h - created from ppc64le-linux.kernel.vmlinux-head.bin, 8 (0x8) bytes +/* powerpc64le-linux.kernel.vmlinux-head.h + created from powerpc64le-linux.kernel.vmlinux-head.bin, 8 (0x8) bytes This file is part of the UPX executable compressor. @@ -31,10 +31,10 @@ */ -#define STUB_PPC64LE_LINUX_KERNEL_VMLINUX_HEAD_SIZE 8 -#define STUB_PPC64LE_LINUX_KERNEL_VMLINUX_HEAD_ADLER32 0x0d7d0259 -#define STUB_PPC64LE_LINUX_KERNEL_VMLINUX_HEAD_CRC32 0xdfb1607d +#define STUB_POWERPC64LE_LINUX_KERNEL_VMLINUX_HEAD_SIZE 8 +#define STUB_POWERPC64LE_LINUX_KERNEL_VMLINUX_HEAD_ADLER32 0x0d7d0259 +#define STUB_POWERPC64LE_LINUX_KERNEL_VMLINUX_HEAD_CRC32 0xdfb1607d -unsigned char stub_ppc64le_linux_kernel_vmlinux_head[8] = { +unsigned char stub_powerpc64le_linux_kernel_vmlinux_head[8] = { /* 0x0000 */ 166, 2,232,127, 1, 0, 0, 72 }; diff --git a/src/stub/ppc64le-linux.kernel.vmlinux.h b/src/stub/powerpc64le-linux.kernel.vmlinux.h similarity index 99% rename from src/stub/ppc64le-linux.kernel.vmlinux.h rename to src/stub/powerpc64le-linux.kernel.vmlinux.h index a24e1644..db2d2e4f 100644 --- a/src/stub/ppc64le-linux.kernel.vmlinux.h +++ b/src/stub/powerpc64le-linux.kernel.vmlinux.h @@ -1,5 +1,5 @@ -/* ppc64le-linux.kernel.vmlinux.h - created from ppc64le-linux.kernel.vmlinux.bin, 9824 (0x2660) bytes +/* powerpc64le-linux.kernel.vmlinux.h + created from powerpc64le-linux.kernel.vmlinux.bin, 9824 (0x2660) bytes This file is part of the UPX executable compressor. @@ -31,11 +31,11 @@ */ -#define STUB_PPC64LE_LINUX_KERNEL_VMLINUX_SIZE 9824 -#define STUB_PPC64LE_LINUX_KERNEL_VMLINUX_ADLER32 0xfa8bc568 -#define STUB_PPC64LE_LINUX_KERNEL_VMLINUX_CRC32 0x0e1bf668 +#define STUB_POWERPC64LE_LINUX_KERNEL_VMLINUX_SIZE 9824 +#define STUB_POWERPC64LE_LINUX_KERNEL_VMLINUX_ADLER32 0xfa8bc568 +#define STUB_POWERPC64LE_LINUX_KERNEL_VMLINUX_CRC32 0x0e1bf668 -unsigned char stub_ppc64le_linux_kernel_vmlinux[9824] = { +unsigned char stub_powerpc64le_linux_kernel_vmlinux[9824] = { /* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 */ 1, 0, 21, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0020 */ 0, 0, 0, 0, 0, 0, 0, 0,104, 25, 0, 0, 0, 0, 0, 0, diff --git a/src/stub/src/arch/ppc64le/64/Makefile b/src/stub/src/arch/powerpc/64le/Makefile similarity index 100% rename from src/stub/src/arch/ppc64le/64/Makefile rename to src/stub/src/arch/powerpc/64le/Makefile diff --git a/src/stub/src/arch/ppc64le/64/Makefile.extra b/src/stub/src/arch/powerpc/64le/Makefile.extra similarity index 93% rename from src/stub/src/arch/ppc64le/64/Makefile.extra rename to src/stub/src/arch/powerpc/64le/Makefile.extra index 7263409a..56c1588d 100644 --- a/src/stub/src/arch/ppc64le/64/Makefile.extra +++ b/src/stub/src/arch/powerpc/64le/Makefile.extra @@ -29,11 +29,11 @@ include $(top_srcdir)/src/stub/Makefile # // method-lzma # ************************************************************************/ -lzma_d_c%.S : tc_list = method-lzma ppc64le-linux.elf default +lzma_d_c%.S : tc_list = method-lzma powerpc64le-linux.elf default lzma_d_c%.S : tc_bfdname = elf64-powerpcle c := tc.method-lzma.gcc -$c = $(tc.ppc64le-linux.elf.gcc) +$c = $(tc.powerpc64le-linux.elf.gcc) $c += -mcpu=405 -fPIC $c += -Os -fomit-frame-pointer $c += -fno-unit-at-a-time diff --git a/src/stub/src/arch/ppc64le/64/bxx.S b/src/stub/src/arch/powerpc/64le/bxx.S similarity index 100% rename from src/stub/src/arch/ppc64le/64/bxx.S rename to src/stub/src/arch/powerpc/64le/bxx.S diff --git a/src/stub/src/arch/ppc64le/64/lzma_d.S b/src/stub/src/arch/powerpc/64le/lzma_d.S similarity index 100% rename from src/stub/src/arch/ppc64le/64/lzma_d.S rename to src/stub/src/arch/powerpc/64le/lzma_d.S diff --git a/src/stub/src/arch/ppc64le/64/lzma_d_cf.S b/src/stub/src/arch/powerpc/64le/lzma_d_cf.S similarity index 100% rename from src/stub/src/arch/ppc64le/64/lzma_d_cf.S rename to src/stub/src/arch/powerpc/64le/lzma_d_cf.S diff --git a/src/stub/src/arch/ppc64le/64/lzma_d_cs.S b/src/stub/src/arch/powerpc/64le/lzma_d_cs.S similarity index 100% rename from src/stub/src/arch/ppc64le/64/lzma_d_cs.S rename to src/stub/src/arch/powerpc/64le/lzma_d_cs.S diff --git a/src/stub/src/arch/ppc64le/64/macros.S b/src/stub/src/arch/powerpc/64le/macros.S similarity index 100% rename from src/stub/src/arch/ppc64le/64/macros.S rename to src/stub/src/arch/powerpc/64le/macros.S diff --git a/src/stub/src/arch/ppc64le/64/nrv2b_d.S b/src/stub/src/arch/powerpc/64le/nrv2b_d.S similarity index 100% rename from src/stub/src/arch/ppc64le/64/nrv2b_d.S rename to src/stub/src/arch/powerpc/64le/nrv2b_d.S diff --git a/src/stub/src/arch/ppc64le/64/nrv2d_d.S b/src/stub/src/arch/powerpc/64le/nrv2d_d.S similarity index 100% rename from src/stub/src/arch/ppc64le/64/nrv2d_d.S rename to src/stub/src/arch/powerpc/64le/nrv2d_d.S diff --git a/src/stub/src/arch/ppc64le/64/nrv2e_d.S b/src/stub/src/arch/powerpc/64le/nrv2e_d.S similarity index 100% rename from src/stub/src/arch/ppc64le/64/nrv2e_d.S rename to src/stub/src/arch/powerpc/64le/nrv2e_d.S diff --git a/src/stub/src/arch/ppc64le/64/ppc_regs.h b/src/stub/src/arch/powerpc/64le/ppc_regs.h similarity index 100% rename from src/stub/src/arch/ppc64le/64/ppc_regs.h rename to src/stub/src/arch/powerpc/64le/ppc_regs.h diff --git a/src/stub/src/arch/ppc64le/Makefile b/src/stub/src/arch/ppc64le/Makefile deleted file mode 100644 index 413a5328..00000000 --- a/src/stub/src/arch/ppc64le/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# convenience Makefile -default %: - $(MAKE) -C ../../.. $@ diff --git a/src/stub/src/ppc64le-darwin.dylib-entry.S b/src/stub/src/powerpc64le-darwin.dylib-entry.S similarity index 96% rename from src/stub/src/ppc64le-darwin.dylib-entry.S rename to src/stub/src/powerpc64le-darwin.dylib-entry.S index 47f83c42..d9f31769 100644 --- a/src/stub/src/ppc64le-darwin.dylib-entry.S +++ b/src/stub/src/powerpc64le-darwin.dylib-entry.S @@ -1,5 +1,5 @@ /* - * ppc64le-darwin.dylib-entry.S -- program entry point & decompress (PowerPC32 dylib) + * powerpc64le-darwin.dylib-entry.S -- program entry point & decompress (PowerPC32 dylib) * * This file is part of the UPX executable compressor. * @@ -26,8 +26,8 @@ * */ -#include "arch/ppc64le/64/macros.S" -#include "arch/ppc64le/64/ppc_regs.h" +#include "arch/powerpc/64le/macros.S" +#include "arch/powerpc/64le/ppc_regs.h" /************************************************************************* // We have been CALLed as a subroutine from dyld; C-language rules apply. @@ -60,15 +60,15 @@ SZ_DLINE=128 # size of data cache line in Apple G5 #define disp a7 section NRV2E -#include "arch/ppc64le/64/nrv2e_d.S" +#include "arch/powerpc/64le/nrv2e_d.S" section NRV2D -#include "arch/ppc64le/64/nrv2d_d.S" +#include "arch/powerpc/64le/nrv2d_d.S" section NRV2B -#include "arch/ppc64le/64/nrv2b_d.S" +#include "arch/powerpc/64le/nrv2b_d.S" -#include "arch/ppc64le/64/lzma_d.S" +#include "arch/powerpc/64le/lzma_d.S" #undef off #undef len @@ -341,7 +341,7 @@ get4: blr unfilter: -#include "arch/ppc64le/64/bxx.S" +#include "arch/powerpc/64le/bxx.S" main: b main2 diff --git a/src/stub/src/ppc64le-darwin.macho-entry.S b/src/stub/src/powerpc64le-darwin.macho-entry.S similarity index 93% rename from src/stub/src/ppc64le-darwin.macho-entry.S rename to src/stub/src/powerpc64le-darwin.macho-entry.S index 27c6627d..5cc1bb5b 100644 --- a/src/stub/src/ppc64le-darwin.macho-entry.S +++ b/src/stub/src/powerpc64le-darwin.macho-entry.S @@ -1,5 +1,5 @@ /* - * ppc64le-darwin.macho-entry.S -- program entry point & decompressor (PowerPC32 Mach-o) + * powerpc64le-darwin.macho-entry.S -- program entry point & decompressor (PowerPC32 Mach-o) * * This file is part of the UPX executable compressor. * @@ -26,8 +26,8 @@ * */ -#include "arch/ppc64le/64/macros.S" -#include "arch/ppc64le/64/ppc_regs.h" +#include "arch/powerpc/64le/macros.S" +#include "arch/powerpc/64le/ppc_regs.h" section MACOS000 _start: .globl _start @@ -51,15 +51,15 @@ SZ_DLINE=128 # size of data cache line in Apple G5 #define disp a7 section NRV2E -#include "arch/ppc64le/64/nrv2e_d.S" +#include "arch/powerpc/64le/nrv2e_d.S" section NRV2D -#include "arch/ppc64le/64/nrv2d_d.S" +#include "arch/powerpc/64le/nrv2d_d.S" section NRV2B -#include "arch/ppc64le/64/nrv2b_d.S" +#include "arch/powerpc/64le/nrv2b_d.S" -#include "arch/ppc64le/64/lzma_d.S" +#include "arch/powerpc/64le/lzma_d.S" section NRV_TAIL eof_nrv: diff --git a/src/stub/src/ppc64le-darwin.macho-fold.S b/src/stub/src/powerpc64le-darwin.macho-fold.S similarity index 98% rename from src/stub/src/ppc64le-darwin.macho-fold.S rename to src/stub/src/powerpc64le-darwin.macho-fold.S index 6c595d9a..c4c5fa67 100644 --- a/src/stub/src/ppc64le-darwin.macho-fold.S +++ b/src/stub/src/powerpc64le-darwin.macho-fold.S @@ -1,4 +1,4 @@ -/* powerpc-darwin.macho-fold.S -- linkage to C code to process Mach-o binary +/* powerpc-darwin.macho-fold.S -- linkage to C code to process Mach-o binary * * This file is part of the UPX executable compressor. * diff --git a/src/stub/src/ppc64le-darwin.macho-main.c b/src/stub/src/powerpc64le-darwin.macho-main.c similarity index 99% rename from src/stub/src/ppc64le-darwin.macho-main.c rename to src/stub/src/powerpc64le-darwin.macho-main.c index 894f47e3..32f5a1ef 100644 --- a/src/stub/src/ppc64le-darwin.macho-main.c +++ b/src/stub/src/powerpc64le-darwin.macho-main.c @@ -1,4 +1,4 @@ -/* ppc64le-darwin.macho-main.c -- loader stub for Mach-o PowerPC64LE +/* powerpc64le-darwin.macho-main.c -- loader stub for Mach-o PowerPC64LE This file is part of the UPX executable compressor. diff --git a/src/stub/src/ppc64le-linux.elf-entry.S b/src/stub/src/powerpc64le-linux.elf-entry.S similarity index 95% rename from src/stub/src/ppc64le-linux.elf-entry.S rename to src/stub/src/powerpc64le-linux.elf-entry.S index db706a12..381ce357 100644 --- a/src/stub/src/ppc64le-linux.elf-entry.S +++ b/src/stub/src/powerpc64le-linux.elf-entry.S @@ -1,4 +1,4 @@ -/* ppc64le-linux.elf-entry.S -- Linux program entry point & decompressor (Elf binary) +/* powerpc64le-linux.elf-entry.S -- Linux program entry point & decompressor (Elf binary) * * This file is part of the UPX executable compressor. * @@ -29,8 +29,8 @@ * */ -#include "arch/ppc64le/64/macros.S" -#include "arch/ppc64le/64/ppc_regs.h" +#include "arch/powerpc/64le/macros.S" +#include "arch/powerpc/64le/ppc_regs.h" sz_b_info= 12 sz_unc= 0 @@ -78,15 +78,15 @@ SZ_DLINE=128 # size of data cache line in Apple G5 #define disp a7 section NRV2E -#include "arch/ppc64le/64/nrv2e_d.S" +#include "arch/powerpc/64le/nrv2e_d.S" section NRV2D -#include "arch/ppc64le/64/nrv2d_d.S" +#include "arch/powerpc/64le/nrv2d_d.S" section NRV2B -#include "arch/ppc64le/64/nrv2b_d.S" +#include "arch/powerpc/64le/nrv2b_d.S" -#include "arch/ppc64le/64/lzma_d.S" +#include "arch/powerpc/64le/lzma_d.S" section NRV_TAIL eof_nrv: diff --git a/src/stub/src/ppc64le-linux.elf-fold.S b/src/stub/src/powerpc64le-linux.elf-fold.S similarity index 97% rename from src/stub/src/ppc64le-linux.elf-fold.S rename to src/stub/src/powerpc64le-linux.elf-fold.S index b35226b1..0d8103e1 100644 --- a/src/stub/src/ppc64le-linux.elf-fold.S +++ b/src/stub/src/powerpc64le-linux.elf-fold.S @@ -1,4 +1,4 @@ -/* ppc64le-linux.elf-fold.S -- linkage to C code to process ELF binary +/* powerpc64le-linux.elf-fold.S -- linkage to C code to process ELF binary * * This file is part of the UPX executable compressor. * @@ -29,8 +29,8 @@ * */ -#include "arch/ppc64le/64/macros.S" -#include "arch/ppc64le/64/ppc_regs.h" +#include "arch/powerpc/64le/macros.S" +#include "arch/powerpc/64le/ppc_regs.h" #define szElf64_Ehdr 0x40 #define szElf64_Phdr 0x38 @@ -49,7 +49,7 @@ LINKAREA= 6*8 // (sp,pc,cr, xx,yy.zz) save area per calling convention */ fold_begin: call L90 -#include "arch/ppc64le/64/bxx.S" +#include "arch/powerpc/64le/bxx.S" /* The SysV convention for argument registers after execve is nice: a0= argc diff --git a/src/stub/src/ppc64le-linux.elf-fold.lds b/src/stub/src/powerpc64le-linux.elf-fold.lds similarity index 97% rename from src/stub/src/ppc64le-linux.elf-fold.lds rename to src/stub/src/powerpc64le-linux.elf-fold.lds index 19961a1b..1420d4c8 100644 --- a/src/stub/src/ppc64le-linux.elf-fold.lds +++ b/src/stub/src/powerpc64le-linux.elf-fold.lds @@ -1,4 +1,4 @@ -/* ppc64le-linux.elf-fold.lds -- +/* powerpc64le-linux.elf-fold.lds -- This file is part of the UPX executable compressor. diff --git a/src/stub/src/ppc64le-linux.elf-main.c b/src/stub/src/powerpc64le-linux.elf-main.c similarity index 100% rename from src/stub/src/ppc64le-linux.elf-main.c rename to src/stub/src/powerpc64le-linux.elf-main.c diff --git a/src/stub/src/ppc64le-linux.kernel.vmlinux-head.S b/src/stub/src/powerpc64le-linux.kernel.vmlinux-head.S similarity index 100% rename from src/stub/src/ppc64le-linux.kernel.vmlinux-head.S rename to src/stub/src/powerpc64le-linux.kernel.vmlinux-head.S diff --git a/src/stub/src/ppc64le-linux.kernel.vmlinux.S b/src/stub/src/powerpc64le-linux.kernel.vmlinux.S similarity index 93% rename from src/stub/src/ppc64le-linux.kernel.vmlinux.S rename to src/stub/src/powerpc64le-linux.kernel.vmlinux.S index 2e842bcf..bb614be4 100644 --- a/src/stub/src/ppc64le-linux.kernel.vmlinux.S +++ b/src/stub/src/powerpc64le-linux.kernel.vmlinux.S @@ -30,8 +30,8 @@ ; */ -#include "arch/ppc64le/64/macros.S" -#include "arch/ppc64le/64/ppc_regs.h" +#include "arch/powerpc/64le/macros.S" +#include "arch/powerpc/64le/ppc_regs.h" // offsets in struct b_info sz_unc = 0 @@ -57,7 +57,7 @@ section LINUX020 // adjust return value unfilter: //section ctok32.00 -#include "arch/ppc64le/64/bxx.S" +#include "arch/powerpc/64le/bxx.S" // ========== DECOMPRESSION @@ -82,13 +82,13 @@ SZ_DLINE=128 # size of data cache line in Apple G5 section NRV2B -#include "arch/ppc64le/64/nrv2b_d.S" +#include "arch/powerpc/64le/nrv2b_d.S" section NRV2D -#include "arch/ppc64le/64/nrv2d_d.S" +#include "arch/powerpc/64le/nrv2d_d.S" section NRV2E -#include "arch/ppc64le/64/nrv2e_d.S" +#include "arch/powerpc/64le/nrv2e_d.S" section NRV_TAIL eof_nrv: @@ -140,7 +140,7 @@ cfl_ret: #undef disp section LZMA -#include "arch/ppc64le/64/lzma_d.S" +#include "arch/powerpc/64le/lzma_d.S" // ========== IDENT diff --git a/src/stub/tmp/ppc64le-darwin.dylib-entry.bin.dump b/src/stub/tmp/powerpc64le-darwin.dylib-entry.bin.dump similarity index 100% rename from src/stub/tmp/ppc64le-darwin.dylib-entry.bin.dump rename to src/stub/tmp/powerpc64le-darwin.dylib-entry.bin.dump diff --git a/src/stub/tmp/ppc64le-darwin.macho-entry.bin.dump b/src/stub/tmp/powerpc64le-darwin.macho-entry.bin.dump similarity index 100% rename from src/stub/tmp/ppc64le-darwin.macho-entry.bin.dump rename to src/stub/tmp/powerpc64le-darwin.macho-entry.bin.dump diff --git a/src/stub/tmp/ppc64le-linux.elf-entry.bin.dump b/src/stub/tmp/powerpc64le-linux.elf-entry.bin.dump similarity index 100% rename from src/stub/tmp/ppc64le-linux.elf-entry.bin.dump rename to src/stub/tmp/powerpc64le-linux.elf-entry.bin.dump diff --git a/src/stub/tmp/ppc64le-linux.kernel.vmlinux.bin.dump b/src/stub/tmp/powerpc64le-linux.kernel.vmlinux.bin.dump similarity index 100% rename from src/stub/tmp/ppc64le-linux.kernel.vmlinux.bin.dump rename to src/stub/tmp/powerpc64le-linux.kernel.vmlinux.bin.dump