[Pkg-uml-commit] r321 - in trunk/src/user-mode-linux/debian: . patches

[malattia at alioth.debian.org]

Author: malattia
Date: 2008-07-23 22:22:51 +0000 (Wed, 23 Jul 2008)
New Revision: 321

Added:
   trunk/src/user-mode-linux/debian/patches/06_conditionally_export_memcpy.patch
Modified:
   trunk/src/user-mode-linux/debian/changelog
   trunk/src/user-mode-linux/debian/patches/series
Log:
new revision with build fix for amd64


Modified: trunk/src/user-mode-linux/debian/changelog
===================================================================
--- trunk/src/user-mode-linux/debian/changelog	2008-07-21 11:16:29 UTC (rev 320)
+++ trunk/src/user-mode-linux/debian/changelog	2008-07-23 22:22:51 UTC (rev 321)
@@ -1,3 +1,11 @@
+user-mode-linux (2.6.25-1um-2) unstable; urgency=medium
+
+  * Fix build error in amd64 (Closes: #491921)
+  * slightly bump urgency to try to be in testing quicker to allow a new
+    upload uml 2.6.26 when the kernel team uploads linux-source-2.6.26
+
+ -- Mattia Dongili <malattia at debian.org>  Thu, 24 Jul 2008 07:18:01 +0900
+
 user-mode-linux (2.6.25-1um-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/src/user-mode-linux/debian/patches/06_conditionally_export_memcpy.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/06_conditionally_export_memcpy.patch	                        (rev 0)
+++ trunk/src/user-mode-linux/debian/patches/06_conditionally_export_memcpy.patch	2008-07-23 22:22:51 UTC (rev 321)
@@ -0,0 +1,25 @@
+Backport a build fix on x86_64 (8bfd04b974689f700bbd053ad6e66b0a95fb80c9)
+
+From: Jeff Dike <jdike at linux.intel.com>
+
+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 at googlemail.com>
+Signed-off-by: Jeff Dike <jdike at linux.intel.com>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+Index: linux-source-2.6.25/arch/um/sys-x86_64/ksyms.c
+===================================================================
+--- linux-source-2.6.25.orig/arch/um/sys-x86_64/ksyms.c	2008-07-24 07:02:07.607642178 +0900
++++ linux-source-2.6.25/arch/um/sys-x86_64/ksyms.c	2008-07-24 07:10:42.959643438 +0900
+@@ -13,4 +13,8 @@ EXPORT_SYMBOL(__down_failed_trylock);
+ EXPORT_SYMBOL(__up_wakeup);
+ 
+ /*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

Modified: trunk/src/user-mode-linux/debian/patches/series
===================================================================
--- trunk/src/user-mode-linux/debian/patches/series	2008-07-21 11:16:29 UTC (rev 320)
+++ trunk/src/user-mode-linux/debian/patches/series	2008-07-23 22:22:51 UTC (rev 321)
@@ -2,3 +2,4 @@
 03_uml_switch.patch
 04_workaround_gcc4.3_ICE.patch
 05_down_interruptible_asmregparam.patch
+06_conditionally_export_memcpy.patch