summaryrefslogtreecommitdiffstats
path: root/target/linux/rdc-2.6/patches/600-x86_lzma.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-26 21:18:21 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-26 21:18:21 +0000
commit14a08a0fb2aca744be4d0549ec17f6e40a306c76 (patch)
treec1ba8f9d6c3fd9ef5c1a368eedd0d8683f9941d5 /target/linux/rdc-2.6/patches/600-x86_lzma.patch
parent060c85b4cbcec4bd77bf5485c6bbc7539aecb62b (diff)
Use the new x86 code, thanks sn9 !
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8185 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rdc-2.6/patches/600-x86_lzma.patch')
-rw-r--r--target/linux/rdc-2.6/patches/600-x86_lzma.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/rdc-2.6/patches/600-x86_lzma.patch b/target/linux/rdc-2.6/patches/600-x86_lzma.patch
index b370827b9..51e487848 100644
--- a/target/linux/rdc-2.6/patches/600-x86_lzma.patch
+++ b/target/linux/rdc-2.6/patches/600-x86_lzma.patch
@@ -980,7 +980,7 @@ diff -Naur linux-old/arch/i386/boot/compressed/lzma_misc.c linux-lzma/arch/i386/
diff -Naur linux-old/arch/i386/boot/compressed/Makefile linux-lzma/arch/i386/boot/compressed/Makefile
--- linux-old/arch/i386/boot/compressed/Makefile 2005-06-04 21:53:40.000000000 -0400
+++ linux-lzma/arch/i386/boot/compressed/Makefile 2005-06-05 00:25:23.000000000 -0400
-@@ -4,15 +4,15 @@
+@@ -4,7 +4,7 @@
# create a compressed vmlinux image from the original vmlinux
#
@@ -989,17 +989,16 @@ diff -Naur linux-old/arch/i386/boot/compressed/Makefile linux-lzma/arch/i386/boo
vmlinux.bin.all vmlinux.relocs
EXTRA_AFLAGS := -traditional
- LDFLAGS_vmlinux := -T
--CFLAGS_misc.o += -fPIC
-+CFLAGS_lzma_misc.o += -fPIC
- hostprogs-y := relocs
+@@ -17,7 +17,7 @@
+ $(call cc-option,-fno-stack-protector)
+ LDFLAGS := -m elf_i386
-$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/lzma_misc.o $(obj)/piggy.o FORCE
$(call if_changed,ld)
@:
-@@ -32,14 +32,14 @@
+@@ -37,14 +37,14 @@
$(call if_changed,relocbin)
ifdef CONFIG_RELOCATABLE