From d839abc71ed8659ff87e9e99a0f4345bd878a8a4 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 2 May 2010 04:20:03 +0000 Subject: 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 --- .../uml/patches-2.6.30/003-fix_memcpy_export_on_x86_64.patch | 11 +++++++++++ .../uml/patches-2.6.32/003-fix_memcpy_export_on_x86_64.patch | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 target/linux/uml/patches-2.6.30/003-fix_memcpy_export_on_x86_64.patch create mode 100644 target/linux/uml/patches-2.6.32/003-fix_memcpy_export_on_x86_64.patch (limited to 'target') 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 000000000..7d2efe462 --- /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 000000000..7d2efe462 --- /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 -- cgit v1.2.3