[uml-devel] [PATCH 4/6] UML - memcpy export needs to follow host declaration

[uml-devel] [PATCH 4/6] UML - memcpy export needs to follow host declaration

[Jeff Dike]

x86_64 defines either memcpy or __memcpy depending on the gcc version,
and it looks like UML needs to follow that in its exporting.

Cc: Gabriel C <nix.or.die@googlemail.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
---
 arch/um/sys-x86_64/ksyms.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: linux-2.6-git/arch/um/sys-x86_64/ksyms.c
===================================================================
--- linux-2.6-git.orig/arch/um/sys-x86_64/ksyms.c	2008-05-28 12:32:34.000000000 -0400
+++ linux-2.6-git/arch/um/sys-x86_64/ksyms.c	2008-06-02 15:49:43.000000000 -0400
@@ -3,5 +3,9 @@
 #include <asm/checksum.h>
 
 /*XXX: we need them because they would be exported by x86_64 */
+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4
+EXPORT_SYMBOL(memcpy);
+#else
 EXPORT_SYMBOL(__memcpy);
+#endif
 EXPORT_SYMBOL(csum_partial);

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

[PATCH 4/6] UML - memcpy export needs to follow host declaration

[Jeff Dike]

x86_64 defines either memcpy or __memcpy depending on the gcc version,
and it looks like UML needs to follow that in its exporting.

Cc: Gabriel C <nix.or.die@googlemail.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
---
 arch/um/sys-x86_64/ksyms.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: linux-2.6-git/arch/um/sys-x86_64/ksyms.c
===================================================================
--- linux-2.6-git.orig/arch/um/sys-x86_64/ksyms.c	2008-05-28 12:32:34.000000000 -0400
+++ linux-2.6-git/arch/um/sys-x86_64/ksyms.c	2008-06-02 15:49:43.000000000 -0400
@@ -3,5 +3,9 @@
 #include <asm/checksum.h>
 
 /*XXX: we need them because they would be exported by x86_64 */
+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4
+EXPORT_SYMBOL(memcpy);
+#else
 EXPORT_SYMBOL(__memcpy);
+#endif
 EXPORT_SYMBOL(csum_partial);