Patchwork Suppress optionrom build on Solaris x86

login
register
mail settings
Submitter Andreas Färber
Date Nov. 27, 2009, 9:18 p.m.
Message ID <6CB020B9-D3FA-4A12-85F7-2C23DEC0E3B5@web.de>
Download mbox | patch
Permalink /patch/39641/
State New
Headers show

Comments

Andreas Färber - Nov. 27, 2009, 9:18 p.m.
To avoid the build failing with:

gcc -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno- 
builtin -I/export/home/andreas/QEMU/qemu   -Wall -Wstrict-prototypes - 
Werror -fomit-frame-pointer -fno-builtin -I/export/home/andreas/QEMU/ 
qemu   -c -o multiboot.o multiboot.S
/var/tmp//ccd3aWyk.s: Assembler messages:
/var/tmp//ccd3aWyk.s:15: Error: value of 512 too large for field of 1  
bytes at 0000000000000002
gmake[1]: *** [multiboot.o] Error 1

disable recursion into pc-bios/optionrom, as done for Darwin already.

Signed-off-by: Andreas Faerber <andreas.faerber@web.de>
---
  configure |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/configure b/configure
index 1223fc8..0c3f252 100755
--- a/configure
+++ b/configure
@@ -2103,7 +2103,7 @@  echo "TOOLS=$tools" >> $config_host_mak
  # Mac OS X ships with a broken assembler
  roms=
  if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
-        "$targetos" != "Darwin" -a \
+        "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
          `expr "$target_list" : ".*softmmu.*"` != 0 ; then
    roms="optionrom"
  fi