diff options
| author | Thomas Orgis | 2007-03-17 13:45:04 +0100 |
|---|---|---|
| committer | Jaka Kranjc | 2007-03-29 17:54:43 +0200 |
| commit | d9a1440ce3b00cb5e4335d365057296c866459d4 (patch) | |
| tree | 7224985e1e7d695b2e881c021fedf96dbb6b796d | |
| parent | 2d505a72117b2df1de1c034dc25210fb845a7219 (diff) | |
qemu: reduce more post-penitum and athlons to pentium-mmx to fix build and bug 13596
(cherry picked from commit 5e5126f174b2bdde58dc01549f6cb35f0d7fc9cc)
| -rwxr-xr-x | utils/qemu/BUILD | 16 | ||||
| -rw-r--r-- | utils/qemu/HISTORY | 3 |
2 files changed, 15 insertions, 4 deletions
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD index 4ab878aa42..90f81e08b6 100755 --- a/utils/qemu/BUILD +++ b/utils/qemu/BUILD @@ -2,12 +2,20 @@ message "Target list:$QEMU_ARCHS" && # # Disable PIC if building soft MMU targets -# Pentium3/4 breaks on building soft MMU, downgrade to pentium-mmx +# Pentium3/4 or athlon(-xp) breaks on building soft MMU +# generally shrinking march down to pentium-mmx # if grep -q softmmu <<< "$QEMU_ARCHS"; then - CFLAGS=${CFLAGS/pentium4/pentium-mmx} && - CFLAGS=${CFLAGS/pentium3/pentium-mmx} && - CFLAGS=${CFLAGS/-march=athlon-xp/} && + message "${MESSAGE_COLOR}Qemu 0.9 has a build problem with advanced CFLAGS.${DEFAULT_COLOR}" && + message "${MESSAGE_COLOR}Trying to make it work, starting with removal of any sse flags.${DEFAULT_COLOR}" && + # sse seems to be bad; -march=pentium -m3dnow worked, though + list_remove CFLAGS -msse -msse2 -msse3 -mfpmath=sse && + if [[ "$CFLAGS" =~ -march=pentium[^[:space:]]+ ]] || + [[ "$CFLAGS" =~ -march=athlon[^[:space:]]* ]]; then + message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to pentium-mmx.${DEFAULT_COLOR}" && + list_remove CFLAGS $BASH_REMATCH && + CFLAGS="$CFLAGS -march=pentium-mmx" + fi && disable_pic fi && diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY index 24c215d508..e0bebdca70 100644 --- a/utils/qemu/HISTORY +++ b/utils/qemu/HISTORY @@ -1,3 +1,6 @@ +2007-03-17 Thomas Orgis <sobukus@sourcemage.org> + * BUILD: more general CFLAGS fixup to reduce more stuff to pentium-mmx and fix bug 13596 + 2007-02-25 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * BUILD: also remove -march=athlon-xp from CFLAGS for MMU use grep instead of list_find, the api was changed in devel sorcery |