mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure, pc-bios/optionrom: pass cross CFLAGS correctly

Browse Source 
The optionrom build is disregarding the flags passed to the configure
script via --cross-cflags-i386.  Pass it down and add it to the Makefile.

This will make it possible to get the -m32 flag from $target_cflags to
force a 32-bit build on 64-bit hosts, instead of supplying manually the
arcane -Wa,-32 and linker emulation options.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-06-15 11:42:01 +02:00
parent ebca847d05
commit 640aabc8ae
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure vendored
View File

@ -2057,19 +2057,22 @@ probe_target_compiler() {
compute_target_variable $1 target_objcopy objcopy compute_target_variable $1 target_objcopy objcopy
compute_target_variable $1 target_ranlib ranlib compute_target_variable $1 target_ranlib ranlib
compute_target_variable $1 target_strip strip compute_target_variable $1 target_strip strip
if test "$1" = $cpu; then case "$1:$cpu" in
: ${target_cc:=$cc} i386:x86_64 | \
: ${target_ccas:=$ccas} "$cpu:$cpu")
: ${target_as:=$as} : ${target_cc:=$cc}
: ${target_ld:=$ld} : ${target_ccas:=$ccas}
: ${target_ar:=$ar} : ${target_as:=$as}
: ${target_as:=$as} : ${target_ld:=$ld}
: ${target_ld:=$ld} : ${target_ar:=$ar}
: ${target_nm:=$nm} : ${target_as:=$as}
: ${target_objcopy:=$objcopy} : ${target_ld:=$ld}
: ${target_ranlib:=$ranlib} : ${target_nm:=$nm}
: ${target_strip:=$strip} : ${target_objcopy:=$objcopy}
fi : ${target_ranlib:=$ranlib}
: ${target_strip:=$strip}
;;
esac
if test -n "$target_cc"; then if test -n "$target_cc"; then
case $1 in case $1 in
i386|x86_64) i386|x86_64)
@ -2238,7 +2241,7 @@ done
# Mac OS X ships with a broken assembler # Mac OS X ships with a broken assembler
roms= roms=
probe_target_compilers i386 x86_64 probe_target_compiler i386
if test -n "$target_cc" && if test -n "$target_cc" &&
test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ test "$targetos" != "darwin" && test "$targetos" != "sunos" && \
test "$targetos" != "haiku" && test "$softmmu" = yes ; then test "$targetos" != "haiku" && test "$softmmu" = yes ; then
@ -2257,6 +2260,7 @@ if test -n "$target_cc" &&
echo "# Automatically generated by configure - do not modify" > $config_mak echo "# Automatically generated by configure - do not modify" > $config_mak
echo "TOPSRC_DIR=$source_path" >> $config_mak echo "TOPSRC_DIR=$source_path" >> $config_mak
echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_mak echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_mak
echo "EXTRA_CFLAGS=$target_cflags" >> $config_mak
write_target_makefile >> $config_mak write_target_makefile >> $config_mak
fi fi
fi fi

2
pc-bios/optionrom/Makefile
View File

@ -11,7 +11,7 @@ CFLAGS = -O2 -g
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
cc-option = $(if $(shell $(CC) $1 -c -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo OK), $1, $2) cc-option = $(if $(shell $(CC) $1 -c -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo OK), $1, $2)
override CFLAGS += -march=i486 -Wall -m16 override CFLAGS += -march=i486 -Wall $(EXTRA_CFLAGS) -m16
# If -fcf-protection is enabled in flags or compiler defaults that will # If -fcf-protection is enabled in flags or compiler defaults that will
# conflict with -march=i486 # conflict with -march=i486