From 11e863545f9aeae4c5e3b02b2a37f52e2aa5fcdd Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Mon, 18 Dec 2006 16:56:14 +0100
Subject: [PATCH] Strip trailing whitespace.

---
 src/p_vmlinx.cpp           | 24 ++++++++++++------------
 src/stub/scripts/xstrip.py | 12 ++++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/p_vmlinx.cpp b/src/p_vmlinx.cpp
index e6a101b6..cf030c1f 100644
--- a/src/p_vmlinx.cpp
+++ b/src/p_vmlinx.cpp
@@ -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  /*}*/
diff --git a/src/stub/scripts/xstrip.py b/src/stub/scripts/xstrip.py
index c813d6b7..1a6dc4ef 100644
--- a/src/stub/scripts/xstrip.py
+++ b/src/stub/scripts/xstrip.py
@@ -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)