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
commita1ae374e1d9ef3d30425da9e86eaa08fb8998c54 (patch)
treea2143f2297198095ef8541d8fb98bfb2b1fea793 /target
parent489c2adad3c17d0e58b6b9f2b6e02e0b347eb32b (diff)
downloadupstream-a1ae374e1d9ef3d30425da9e86eaa08fb8998c54.tar.gz
upstream-a1ae374e1d9ef3d30425da9e86eaa08fb8998c54.tar.bz2
upstream-a1ae374e1d9ef3d30425da9e86eaa08fb8998c54.zip
target/uml: fix memcpy export on x86_64 with gcc < 4.3 (closes: #6918)
SVN-Revision: 21293
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