From 67e09fb342c80057583594d2b83aa001b7ba4769 Mon Sep 17 00:00:00 2001 From: John Reiser Date: Wed, 28 Jun 2006 19:44:02 -0700 Subject: [PATCH] kernel Makefile; fix cross-platform endian trouble --- src/p_vmlinx.cpp | 2 ++ src/p_vmlinx.h | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/p_vmlinx.cpp b/src/p_vmlinx.cpp index b9894f4a..71e19852 100644 --- a/src/p_vmlinx.cpp +++ b/src/p_vmlinx.cpp @@ -486,6 +486,7 @@ void PackVmlinuxI386::unpack(OutputFile *fo) //$(obj)/upx-piggy.o: vmlinux FORCE // rm -f $@ // upx --best -o $@ $< +// touch $@ //----- // //----- arch/i386/boot/compressed/upx-head.S @@ -560,6 +561,7 @@ void PackVmlinuxI386::unpack(OutputFile *fo) //upx-piggy.o: $(SYSTEM) // $(RM) -f $@ // upx --best -o $@ $< +// touch $@ // //clean: // rm -f vmlinux bvmlinux _tmp_* diff --git a/src/p_vmlinx.h b/src/p_vmlinx.h index 9974ca1c..75050a4a 100644 --- a/src/p_vmlinx.h +++ b/src/p_vmlinx.h @@ -60,12 +60,12 @@ protected: int n_ptload; unsigned sz_ptload; - Elf32_Phdr *phdri; // from input file - Elf32_Shdr *shdri; // from input file - Elf32_Shdr *p_text; - Elf32_Shdr *p_note0; - Elf32_Shdr *p_note1; - Elf32_Ehdr ehdri; // from input file + Elf_LE32_Phdr *phdri; // from input file + Elf_LE32_Shdr *shdri; // from input file + Elf_LE32_Shdr *p_text; + Elf_LE32_Shdr *p_note0; + Elf_LE32_Shdr *p_note1; + Elf_LE32_Ehdr ehdri; // from input file };