[PATCH v2 0/2] Fix runtime issue in XenBusDxe when compiled with GCC 6.2

[PATCH v2 0/2] Fix runtime issue in XenBusDxe when compiled with GCC 6.2

[Anthony PERARD]

Anthony PERARD (2):
  OvmfPkg/XenHypercallLib: Add EFIAPI
  OvmfPkg/build.sh: Use GCC49 toolchains with GCC 6.[0-2]

 OvmfPkg/Include/Library/XenHypercallLib.h      | 3 +++
 OvmfPkg/Library/XenHypercallLib/XenHypercall.c | 3 +++
 OvmfPkg/build.sh                               | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

-- 
Anthony PERARD

[PATCH v2 1/2] OvmfPkg/XenHypercallLib: Add EFIAPI

[Anthony PERARD]

Because EFIAPI is necessary for functions declared in library class header
files.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 OvmfPkg/Include/Library/XenHypercallLib.h      | 3 +++
 OvmfPkg/Library/XenHypercallLib/XenHypercall.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/OvmfPkg/Include/Library/XenHypercallLib.h b/OvmfPkg/Include/Library/XenHypercallLib.h
index 509855d..36e3344 100644
--- a/OvmfPkg/Include/Library/XenHypercallLib.h
+++ b/OvmfPkg/Include/Library/XenHypercallLib.h
@@ -58,6 +58,7 @@ XenHypercall2 (
   @return   The value of the asked parameter or 0 in case of error.
 **/
 UINT64
+EFIAPI
 XenHypercallHvmGetParam (
   UINT32 Index
   );
@@ -72,6 +73,7 @@ XenHypercallHvmGetParam (
            otherwise, an error code.
 **/
 INTN
+EFIAPI
 XenHypercallMemoryOp (
   IN     UINTN Operation,
   IN OUT VOID *Arguments
@@ -87,6 +89,7 @@ XenHypercallMemoryOp (
            otherwise, an error code.
 **/
 INTN
+EFIAPI
 XenHypercallEventChannelOp (
   IN     INTN Operation,
   IN OUT VOID *Arguments
diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercall.c b/OvmfPkg/Library/XenHypercallLib/XenHypercall.c
index 82cdbd9..5ea5c45 100644
--- a/OvmfPkg/Library/XenHypercallLib/XenHypercall.c
+++ b/OvmfPkg/Library/XenHypercallLib/XenHypercall.c
@@ -22,6 +22,7 @@
 #include <Library/XenHypercallLib.h>
 
 UINT64
+EFIAPI
 XenHypercallHvmGetParam (
   IN UINT32        Index
   )
@@ -43,6 +44,7 @@ XenHypercallHvmGetParam (
 }
 
 INTN
+EFIAPI
 XenHypercallMemoryOp (
   IN     UINTN Operation,
   IN OUT VOID *Arguments
@@ -53,6 +55,7 @@ XenHypercallMemoryOp (
 }
 
 INTN
+EFIAPI
 XenHypercallEventChannelOp (
   IN     INTN Operation,
   IN OUT VOID *Arguments
-- 
Anthony PERARD

[PATCH v2 2/2] OvmfPkg/build.sh: Use GCC49 toolchains with GCC 6.[0-2]

[Anthony PERARD]

The goal of the patch is to avoid using -flto with GCC 6.0 to 6.2.

This is to workaround a GCC bug:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70955

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 OvmfPkg/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index 95fe8fb..b6e9360 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -102,7 +102,7 @@ case `uname` in
       4.8.*)
         TARGET_TOOLS=GCC48
         ;;
-      4.9.*)
+      4.9.*|6.[0-2].*)
         TARGET_TOOLS=GCC49
         ;;
       *)
-- 
Anthony PERARD

Re: [PATCH v2 0/2] Fix runtime issue in XenBusDxe when compiled with GCC 6.2

[Laszlo Ersek]

On 12/06/16 13:03, Anthony PERARD wrote:
> 
> 
> Anthony PERARD (2):
>   OvmfPkg/XenHypercallLib: Add EFIAPI
>   OvmfPkg/build.sh: Use GCC49 toolchains with GCC 6.[0-2]
> 
>  OvmfPkg/Include/Library/XenHypercallLib.h      | 3 +++
>  OvmfPkg/Library/XenHypercallLib/XenHypercall.c | 3 +++
>  OvmfPkg/build.sh                               | 2 +-
>  3 files changed, 7 insertions(+), 1 deletion(-)
> 

For patch #1:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Build-tested-by: Laszlo Ersek <lersek@redhat.com>

(With "OvmfPkg/OvmfPkgX64.dsc" and "ArmVirtPkg/ArmVirtXen.dsc".)

For patch #2:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Regression-tested-by: Laszlo Ersek <lersek@redhat.com>

(I still use gcc-4.8, on RHEL-7.)

Series pushed as 919278054f43..432f1d83f77a.

I also closed <https://bugzilla.tianocore.org/show_bug.cgi?id=281> as
RESOLVED|INVALID.

Thanks!
Laszlo