summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRichard Henderson2016-07-08 06:49:36 +0200
committerRichard Henderson2016-07-10 19:05:46 +0200
commitcdbd727c20ad7aac7797dc8c95e485e1a4c6901b (patch)
tree31cfc311911c1ba23ce44fde29aa68445b7fd75b /configure
parentlinux-user: Fix i386 safe-syscall.S (diff)
downloadqemu-cdbd727c20ad7aac7797dc8c95e485e1a4c6901b.tar.gz
qemu-cdbd727c20ad7aac7797dc8c95e485e1a4c6901b.tar.xz
qemu-cdbd727c20ad7aac7797dc8c95e485e1a4c6901b.zip
build: Use $(AS) for optionrom explicitly
For clang before 3.5, -fno-integrated-as does not exist, so the workaround in 5f6f0e27fb24 fails to build. Use clang's default assembler for linux-user/safe-syscall.S, and explicitly change to use the system assembler for the option roms. Tested-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 3 insertions, 7 deletions
diff --git a/configure b/configure
index e9090a0d29..5ada56d984 100755
--- a/configure
+++ b/configure
@@ -368,6 +368,7 @@ else
fi
ar="${AR-${cross_prefix}ar}"
+as="${AS-${cross_prefix}as}"
ccas="${CCAS-$cc}"
cpp="${CPP-$cc -E}"
objcopy="${OBJCOPY-${cross_prefix}objcopy}"
@@ -4490,13 +4491,6 @@ if test "$fortify_source" != "no"; then
fi
fi
-#################################################
-# clang does not support the 16-bit assembly for roms
-
-if echo | $ccas -dM -E - | grep __clang__ > /dev/null 2>&1 ; then
- ccas="$ccas -fno-integrated-as"
-fi
-
##########################################
# check if struct fsxattr is available via linux/fs.h
@@ -5515,6 +5509,7 @@ echo "CXX=$cxx" >> $config_host_mak
echo "OBJCC=$objcc" >> $config_host_mak
echo "AR=$ar" >> $config_host_mak
echo "ARFLAGS=$ARFLAGS" >> $config_host_mak
+echo "AS=$as" >> $config_host_mak
echo "CCAS=$ccas" >> $config_host_mak
echo "CPP=$cpp" >> $config_host_mak
echo "OBJCOPY=$objcopy" >> $config_host_mak
@@ -5988,6 +5983,7 @@ for rom in seabios vgabios ; do
config_mak=roms/$rom/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak
echo "SRC_PATH=$source_path/roms/$rom" >> $config_mak
+ echo "AS=$as" >> $config_mak
echo "CCAS=$ccas" >> $config_mak
echo "CC=$cc" >> $config_mak
echo "BCC=bcc" >> $config_mak