Magic-Mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx.git synced 2025-03-03 05:16:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Strip trailing whitespace.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2006-12-18 16:56:14 +01:00
parent dde49f0bb4
commit 11e863545f
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/p_vmlinx.cpp
View File

@ -799,7 +799,7 @@ void PackVmlinuxARM::pack(OutputFile *fo)
shdro[1].sh_type = Elf32_Shdr::SHT_PROGBITS;
shdro[1].sh_flags = Elf32_Shdr::SHF_ALLOC | Elf32_Shdr::SHF_EXECINSTR;
shdro[1].sh_offset = fo_off;
shdro[1].sh_size = sizeof(stub_arm_linux_kernel_vmlinux_head) +
shdro[1].sh_size = sizeof(stub_arm_linux_kernel_vmlinux_head) +
txt_c_len + (3& -txt_c_len) + lsize;
shdro[1].sh_addralign = 1;
@ -1110,47 +1110,47 @@ void PackVmlinuxARM::unpack(OutputFile *fo)
+++ ./debian/build/build-arm-none-ixp4xx/arch/arm/boot/compressed/Makefile 2006-12-16 02:39:38.000000000 -0800
@@ -5,7 +5,7 @@
#
HEAD = head.o
-OBJS = misc.o
+OBJS =
+OBJS =
FONTC = drivers/video/console/font_acorn_8x8.c
FONT = $(addprefix ../../../../drivers/video/console/, font_acorn_8x8.o)
@@ -73,8 +73,8 @@
SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
-targets := vmlinux vmlinux.lds piggy.gz piggy.o $(FONT) \
- head.o misc.o $(OBJS)
+targets := vmlinux vmlinux.lds upx-piggy.o $(FONT) \
+ head.o $(OBJS)
EXTRA_CFLAGS := -fpic
EXTRA_AFLAGS :=
@@ -95,20 +95,16 @@
# would otherwise mess up our GOT table
CFLAGS_misc.o := -Dstatic=
-$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
- $(addprefix $(obj)/, $(OBJS)) FORCE
+$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) \
+ $(addprefix $(obj)/, $(OBJS)) $(obj)/upx-piggy.o FORCE
$(call if_changed,ld)
@:
-$(obj)/piggy.gz: $(obj)/../Image FORCE
- $(call if_changed,gzip)
-
-$(obj)/piggy.o: $(obj)/piggy.gz FORCE
+$(obj)/upx-piggy.o: vmlinux FORCE
+ rm -f $@; upx --lzma -o $@ $<; touch $@
CFLAGS_font_acorn_8x8.o := -Dstatic=
$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config
@sed "$(SEDFLAGS)" < $< > $@
-$(obj)/misc.o: $(obj)/misc.c include/asm/arch/uncompress.h lib/inflate.c
-
#endif /*}*/

12
src/stub/scripts/xstrip.py
View File

@ -97,17 +97,17 @@ def create_bindump(bindump_fn, dump_fn):
if not l: continue
f = l.split(" ")
if len(f) == 6:
assert f[1] in "gl", (l, f)
assert f[2] in "dFO", (l, f)
assert f[1] in "gl", (l, f)
assert f[2] in "dFO", (l, f)
section = section_names[f[3]]
elif len(f) == 5:
assert f[1] in "gl", (l, f)
assert f[1] in "gl", (l, f)
section = section_names[f[2]]
elif len(f) == 4:
assert f[1] in ["*UND*"], (l, f)
assert f[1] in ["*UND*"], (l, f)
section = None
else:
assert 0, (l, f)
assert 0, (l, f)
pass
# preprocessRelocations
relocs = []
@ -120,7 +120,7 @@ def create_bindump(bindump_fn, dump_fn):
continue
f = l.split(" ")
if f[0] == "OFFSET": continue
assert len(f) == 3, (l, f)
assert len(f) == 3, (l, f)
pass
fp = open(bindump_fn, "wb")
fp.write(data)