[uml] update to 2.6.38
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26803 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
b7a045a261
commit
d78ee5b5be
|
@ -587,6 +587,7 @@ CONFIG_EPOLL=y
|
|||
# CONFIG_ETHOC is not set
|
||||
CONFIG_EVENTFD=y
|
||||
CONFIG_EXPERIMENTAL=y
|
||||
CONFIG_EXPERT=y
|
||||
# CONFIG_EXPORTFS is not set
|
||||
# CONFIG_EXT2_FS is not set
|
||||
# CONFIG_EXT2_FS_XATTR is not set
|
||||
|
|
|
@ -22,7 +22,7 @@ BOARD:=uml
|
|||
BOARDNAME:=User Mode Linux
|
||||
FEATURES:=ext4 audio
|
||||
|
||||
LINUX_VERSION:=2.6.37.6
|
||||
LINUX_VERSION:=2.6.38.2
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
|
|
|
@ -101,6 +101,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
|
|||
# CONFIG_PREEMPT_RCU is not set
|
||||
CONFIG_PRINT_QUOTA_WARNING=y
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_PROCESSOR_SELECT is not set
|
||||
CONFIG_PTY_CHAN=y
|
||||
CONFIG_QFMT_V1=y
|
||||
CONFIG_QFMT_V2=y
|
||||
|
|
|
@ -82,6 +82,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
|
|||
# CONFIG_PREEMPT_RCU is not set
|
||||
# CONFIG_PRINT_QUOTA_WARNING is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_PROCESSOR_SELECT is not set
|
||||
CONFIG_PTY_CHAN=y
|
||||
CONFIG_QFMT_V1=y
|
||||
CONFIG_QFMT_V2=y
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- 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 ;)
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
--- 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)
|
|
@ -0,0 +1,24 @@
|
|||
--- 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 : {
|
|
@ -0,0 +1,14 @@
|
|||
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
|
||||
@@ -98,7 +98,7 @@ config ZLIB_INFLATE
|
||||
tristate
|
||||
|
||||
config ZLIB_DEFLATE
|
||||
- tristate
|
||||
+ tristate "Zlib compression"
|
||||
|
||||
config LZO_COMPRESS
|
||||
tristate
|
Loading…
Reference in New Issue