aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-05-02 04:20:03 +0000
committerNicolas Thill <nico@openwrt.org>2010-05-02 04:20:03 +0000
commitc6493408985dbb5f7f695e1a8fead7fd1f444b4f (patch)
tree70024edc5864cbbf4e78bc58f7ec5e9dbde82dd1 /target
parent60cd28872f16fe0c33d3c4b87ad6effce14e5d6f (diff)
downloadupstream-c6493408985dbb5f7f695e1a8fead7fd1f444b4f.tar.gz
upstream-c6493408985dbb5f7f695e1a8fead7fd1f444b4f.tar.bz2
upstream-c6493408985dbb5f7f695e1a8fead7fd1f444b4f.zip
target/uml: fix memcpy export on x86_64 with gcc < 4.3 (closes: #6918)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21293 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/uml/patches-2.6.30/003-fix_memcpy_export_on_x86_64.patch11
-rw-r--r--target/linux/uml/patches-2.6.32/003-fix_memcpy_export_on_x86_64.patch11
2 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/uml/patches-2.6.30/003-fix_memcpy_export_on_x86_64.patch b/target/linux/uml/patches-2.6.30/003-fix_memcpy_export_on_x86_64.patch
new file mode 100644
index 0000000000..7d2efe4622
--- /dev/null
+++ b/target/linux/uml/patches-2.6.30/003-fix_memcpy_export_on_x86_64.patch
@@ -0,0 +1,11 @@
+--- a/arch/um/os-Linux/user_syms.c
++++ b/arch/um/os-Linux/user_syms.c
+@@ -23,7 +23,7 @@ extern int printf(const char *, ...);
+ EXPORT_SYMBOL(strstr);
+ #endif
+
+-#ifndef __x86_64__
++#if !defined(__x86_64) || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || (__GNUC__ < 4)
+ extern void *memcpy(void *, const void *, size_t);
+ EXPORT_SYMBOL(memcpy);
+ #endif
diff --git a/target/linux/uml/patches-2.6.32/003-fix_memcpy_export_on_x86_64.patch b/target/linux/uml/patches-2.6.32/003-fix_memcpy_export_on_x86_64.patch
new file mode 100644
index 0000000000..7d2efe4622
--- /dev/null
+++ b/target/linux/uml/patches-2.6.32/003-fix_memcpy_export_on_x86_64.patch
@@ -0,0 +1,11 @@
+--- a/arch/um/os-Linux/user_syms.c
++++ b/arch/um/os-Linux/user_syms.c
+@@ -23,7 +23,7 @@ extern int printf(const char *, ...);
+ EXPORT_SYMBOL(strstr);
+ #endif
+
+-#ifndef __x86_64__
++#if !defined(__x86_64) || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || (__GNUC__ < 4)
+ extern void *memcpy(void *, const void *, size_t);
+ EXPORT_SYMBOL(memcpy);
+ #endif