Merge lp:~yolanda.robla/ubuntu/saucy/ipxe/ftbfs into lp:ubuntu/saucy/ipxe

[Yolanda Robla]

Fix FTBFS (LP: #1194914)

[James Page (james-page)]

Hi Yolanda

Thanks for preparing this fix.

I'm assuming that the patch comes from https://github.com/ipxe/ipxe/commit/238050dfd46e3c4a87329da1d48b4d8dde5af8a1; if so please can you annotate the patch using dep-3 headers so the origin of the patch is clear.

alternatively leave the headers from https://github.com/ipxe/ipxe/commit/238050dfd46e3c4a87329da1d48b4d8dde5af8a1.patch intact and just refresh the patch itself for the version in Ubuntu.

Thanks

James

review: Needs Fixing

[lp:~yolanda.robla/ubuntu/saucy/ipxe/ftbfs]

17. By Yolanda Robla on 2013-07-02

refreshed patch

[Yolanda Robla (yolanda.robla)]

added dep-3- headers, recheck

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-20 16:08:21 +0000
+++ debian/changelog	2013-07-02 15:31:27 +0000
@@ -1,3 +1,9 @@
+ipxe (1.0.0+git-4.d6b0b76-0ubuntu3) saucy; urgency=low
+
+  * debian/patches/fix-bp-bug.patch: fixes FTBFS (LP: #1194914)
+
+ -- Yolanda Robla <[e-mail]>  Thu, 27 Jun 2013 11:22:43 +0200
+
 ipxe (1.0.0+git-4.d6b0b76-0ubuntu2) raring; urgency=low
 
   * d/control: Add ipxe-qemu virtual package for use with qemu.

=== added file 'debian/patches/fix-bp-bug.patch'
--- debian/patches/fix-bp-bug.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-bp-bug.patch	2013-07-02 15:31:27 +0000
@@ -0,0 +1,49 @@
+From 238050dfd46e3c4a87329da1d48b4d8dde5af8a1 Mon Sep 17 00:00:00 2001
+From: Michael Brown <[e-mail]>
+Date: Fri, 7 Jun 2013 13:46:27 +0100
+Subject: [PATCH] [build] Work around bug in gcc >= 4.8
+
+gcc 4.8 and 4.9 fail to compile pxe_call.c with the error "bp cannot
+be used in asm here".  Other points in the codebase which use "ebp" in
+the asm clobber list do not seem to be affected.
+
+Unfortunately gcc provides no way to specify %ebp as an output
+register, so we cannot use this as a workaround.  The only viable
+solution is to explicitly push/pop %ebp within the asm itself.  This
+is ugly for two reasons: firstly, it may be unnecessary; secondly, it
+may cause gcc to generate invalid %esp-relative addresses if the asm
+happens to use memory operands.  This specific block of asm uses no
+memory operands and so will not generate invalid code.
+
+Reported-by: Daniel P. Berrange <[e-mail]>
+Reported-by: Christian Hesse <[e-mail]>
+Originally-fixed-by: Christian Hesse <[e-mail]>
+Signed-off-by: Michael Brown <[e-mail]>
+--- a/src/arch/i386/interface/pxe/pxe_call.c	2013-06-26 13:05:23.311155000 +0000
++++ b/src/arch/i386/interface/pxe/pxe_call.c	2013-06-26 13:05:23.311155000 +0000
+@@ -265,12 +265,14 @@
+ 		DBG ( "Restarting NBP (%x)\n", jmp );
+ 
+ 	/* Far call to PXE NBP */
+-	__asm__ __volatile__ ( REAL_CODE ( "movw %%cx, %%es\n\t"
++	__asm__ __volatile__ ( REAL_CODE ( "pushl %%ebp\n\t" /* gcc bug */
++					   "movw %%cx, %%es\n\t"
+ 					   "pushw %%es\n\t"
+ 					   "pushw %%di\n\t"
+ 					   "sti\n\t"
+ 					   "lcall $0, $0x7c00\n\t"
+-					   "addw $4, %%sp\n\t" )
++					   "popl %%ebp\n\t" /* discard */
++					   "popl %%ebp\n\t" /* gcc bug */ )
+ 			       : "=a" ( rc ), "=b" ( discard_b ),
+ 				 "=c" ( discard_c ), "=d" ( discard_d ),
+ 				 "=D" ( discard_D )
+@@ -278,7 +280,7 @@
+ 			         "c" ( rm_cs ),
+ 			         "d" ( virt_to_phys ( &pxenv ) ),
+ 				 "D" ( __from_text16 ( &ppxe ) )
+-			       : "esi", "ebp", "memory" );
++			       : "esi", "memory" );
+ 
+ 	return rc;
+ }

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-14 15:47:31 +0000
+++ debian/patches/series	2013-07-02 15:31:27 +0000
@@ -4,3 +4,4 @@
 rom-set-banner-timeout-0.diff
 qemu-target-fix-names.diff
 enable-https.patch
+fix-bp-bug.patch