aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-03-18 13:40:48 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-03-18 13:40:48 +0000
commitde1c12f7a181a27b8463f60fd88cb30f858ab517 (patch)
treefc03176ff0d31c934b0a2e41b9fff6b1683837fd /target/linux/uml
parent4c8f56fd1d62382fac641e58218da022a76be131 (diff)
downloadmaster-187ad058-de1c12f7a181a27b8463f60fd88cb30f858ab517.tar.gz
master-187ad058-de1c12f7a181a27b8463f60fd88cb30f858ab517.tar.bz2
master-187ad058-de1c12f7a181a27b8463f60fd88cb30f858ab517.zip
remove 2.6.34 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26229 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/uml')
-rw-r--r--target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch11
-rw-r--r--target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch21
-rw-r--r--target/linux/uml/patches-2.6.34/003-fix_text_section.patch38
-rw-r--r--target/linux/uml/patches-2.6.34/006-uml_libc_link_errors.patch54
-rw-r--r--target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch14
5 files changed, 0 insertions, 138 deletions
diff --git a/target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch b/target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch
deleted file mode 100644
index 442c0ec76e..0000000000
--- a/target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/um/Makefile-i386
-+++ b/arch/um/Makefile-i386
-@@ -35,7 +35,7 @@ cflags-y += -ffreestanding
- # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
- # a lot more stack due to the lack of sharing of stacklots. Also, gcc
- # 4.3.0 needs -funit-at-a-time for extern inline functions.
--KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \
-+KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0403 ] ; then \
- echo $(call cc-option,-fno-unit-at-a-time); \
- else echo $(call cc-option,-funit-at-a-time); fi ;)
-
diff --git a/target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch b/target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch
deleted file mode 100644
index 2be33d02a3..0000000000
--- a/target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/arch/um/Makefile-i386
-+++ b/arch/um/Makefile-i386
-@@ -39,4 +39,8 @@ KBUILD_CFLAGS += $(shell if [ $(call cc-
- echo $(call cc-option,-fno-unit-at-a-time); \
- else echo $(call cc-option,-funit-at-a-time); fi ;)
-
-+# disable compile-time buffer checks, enabled by default on Ubuntu 8.10
-+# and later
-+KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE)
-+
- KBUILD_CFLAGS += $(cflags-y)
---- a/arch/um/Makefile-x86_64
-+++ b/arch/um/Makefile-x86_64
-@@ -24,3 +24,7 @@ LINK-y += -m64
-
- # Do unit-at-a-time unconditionally on x86_64, following the host
- KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
-+
-+# disable compile-time buffer checks, enabled by default on Ubuntu 8.10
-+# and later
-+KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE)
diff --git a/target/linux/uml/patches-2.6.34/003-fix_text_section.patch b/target/linux/uml/patches-2.6.34/003-fix_text_section.patch
deleted file mode 100644
index 210435eb3e..0000000000
--- a/target/linux/uml/patches-2.6.34/003-fix_text_section.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-um: remove PAGE_SIZE alignment in linker script causing kernel segfault.
-
-The linker script cleanup that I did in commit
-5d150a97f9391f5bcd7ba0d59d7a11c3de3cea80 accidentally introduced an
-ALIGN(PAGE_SIZE) when converting to use INIT_TEXT_SECTION; Richard
-Weinberger reported that this causes the kernel to segfault with
-CONFIG_STATIC_LINK=y.
-
-I'm not certain why this extra alignment is a problem, but it seems likely
-it is because previously
-
-__init_begin = _stext = _text = _sinittext
-
-and with the extra ALIGN(PAGE_SIZE), _sinittext becomes different from the
-rest. So there is likely a bug here where something is assuming that
-_sinittext is the same as one of those other symbols. But reverting the
-accidental change fixes the regression, so it seems worth committing that
-now.
-
-Signed-off-by: Tim Abbott <tabbott@ksplice.com>
-Reported-by: richard -rw- weinberger <richard.weinberger@gmail.com>
-Cc: Jeff Dike <jdike@addtoit.com>
-Cc: user-mode-linux-devel@lists.sourceforge.net
----
- arch/um/kernel/uml.lds.S | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/arch/um/kernel/uml.lds.S
-+++ b/arch/um/kernel/uml.lds.S
-@@ -22,7 +22,7 @@ SECTIONS
- _text = .;
- _stext = .;
- __init_begin = .;
-- INIT_TEXT_SECTION(PAGE_SIZE)
-+ INIT_TEXT_SECTION(0)
- . = ALIGN(PAGE_SIZE);
-
- .text :
diff --git a/target/linux/uml/patches-2.6.34/006-uml_libc_link_errors.patch b/target/linux/uml/patches-2.6.34/006-uml_libc_link_errors.patch
deleted file mode 100644
index 340a5f2668..0000000000
--- a/target/linux/uml/patches-2.6.34/006-uml_libc_link_errors.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
-index 7fcad58..85babf5 100644
---- a/arch/um/kernel/dyn.lds.S
-+++ b/arch/um/kernel/dyn.lds.S
-@@ -50,8 +50,21 @@ SECTIONS
- .rela.got : { *(.rela.got) }
- .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
- .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-- .rel.plt : { *(.rel.plt) }
-- .rela.plt : { *(.rela.plt) }
-+ /* Deal with multilib libc */
-+ .rel.plt :
-+ {
-+ *(.rel.plt)
-+ PROVIDE_HIDDEN (__rel_iplt_start = .);
-+ *(.rel.iplt)
-+ PROVIDE_HIDDEN (__rel_iplt_end = .);
-+ }
-+ .rela.plt :
-+ {
-+ *(.rela.plt)
-+ PROVIDE_HIDDEN (__rela_iplt_start = .);
-+ *(.rela.iplt)
-+ PROVIDE_HIDDEN (__rela_iplt_end = .);
-+ }
- .init : {
- KEEP (*(.init))
- } =0x90909090
-diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
-index e7a6cca..50d80e8 100644
---- a/arch/um/kernel/uml.lds.S
-+++ b/arch/um/kernel/uml.lds.S
-@@ -35,6 +35,21 @@ SECTIONS
- *(.gnu.warning)
- *(.gnu.linkonce.t*)
- }
-+ /* Deal with multilib libc */
-+ .rel.plt :
-+ {
-+ *(.rel.plt)
-+ PROVIDE_HIDDEN (__rel_iplt_start = .);
-+ *(.rel.iplt)
-+ PROVIDE_HIDDEN (__rel_iplt_end = .);
-+ }
-+ .rela.plt :
-+ {
-+ *(.rela.plt)
-+ PROVIDE_HIDDEN (__rela_iplt_start = .);
-+ *(.rela.iplt)
-+ PROVIDE_HIDDEN (__rela_iplt_end = .);
-+ }
-
- . = ALIGN(PAGE_SIZE);
- .syscall_stub : {
diff --git a/target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch
deleted file mode 100644
index 116d76fcfa..0000000000
--- a/target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-make ZLIB_DEFLATE visible, so that we can choose whether we want it built-in
-or as a module
-
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -95,7 +95,7 @@ config ZLIB_INFLATE
- tristate
-
- config ZLIB_DEFLATE
-- tristate
-+ tristate "Zlib compression"
-
- config LZO_COMPRESS
- tristate