From: Kevin O'Connor <kevin@koconnor.net>
Date: Wed, 12 Nov 2014 22:49:33 +0000 (-0500)
Subject: Fix build issue on gcc34
X-Git-Tag: rel-1.8.0~44
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=83c82769d1246a00e1773764505184cb95d4f663;p=seabios.git

Fix build issue on gcc34

Older versions of gcc may not inline on_extra_stack() and thus cause a
link error when compiling in 32bit segmented mode.  Test for MODE16
explicitly in stack_hop_back() to prevent the problem.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---

diff --git a/src/stacks.c b/src/stacks.c
index 6f40cbe..0c033d1 100644
--- a/src/stacks.c
+++ b/src/stacks.c
@@ -430,7 +430,7 @@ stack_hop_back(u32 eax, u32 edx, void *func)
 {
     if (!MODESEGMENT)
         return call16_back(eax, edx, func);
-    if (!on_extra_stack())
+    if (!MODE16 || !on_extra_stack())
         return ((u32 (*)(u32, u32))func)(eax, edx);
     ASSERT16();
     u16 bkup_ss;