diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-08-16 10:18:07 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-08-16 10:18:07 +0000 |
| commit | 591108bddae9fe9e06c962019848c44d722a3880 (patch) | |
| tree | bab245ca0004c262fa32f8082dfb787e5a096181 /target/linux/uml/patches | |
| parent | 993735e76a12c958cc722267a900d9bb6d3191d4 (diff) | |
[uml] bump to 2.6.30.4, apply fix from [15119] to x86_64
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17285 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/uml/patches')
| -rw-r--r-- | target/linux/uml/patches/002-gcc4_unfortify_source.patch | 10 | ||||
| -rw-r--r-- | target/linux/uml/patches/901-lib_zlib_deflate_visible.patch | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/target/linux/uml/patches/002-gcc4_unfortify_source.patch b/target/linux/uml/patches/002-gcc4_unfortify_source.patch index b13e5df52..2be33d02a 100644 --- a/target/linux/uml/patches/002-gcc4_unfortify_source.patch +++ b/target/linux/uml/patches/002-gcc4_unfortify_source.patch @@ -9,3 +9,13 @@ +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/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches/901-lib_zlib_deflate_visible.patch index bac8fcfa9..b71a67331 100644 --- a/target/linux/uml/patches/901-lib_zlib_deflate_visible.patch +++ b/target/linux/uml/patches/901-lib_zlib_deflate_visible.patch @@ -3,7 +3,7 @@ or as a module --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -83,7 +83,7 @@ config ZLIB_INFLATE +@@ -92,7 +92,7 @@ config ZLIB_INFLATE tristate config ZLIB_DEFLATE |