Merge "workaround stack bashing by asm on 32-bit OpenBSD"

This commit is contained in:
James Zern 2015-01-22 20:04:07 -08:00 committed by Gerrit Code Review
commit 880ca0ecad

View File

@ -1251,10 +1251,14 @@ EOF
fi fi
tgt_os_no_version=$(echo "${tgt_os}" | tr -d "[0-9]") tgt_os_no_version=$(echo "${tgt_os}" | tr -d "[0-9]")
if [ "${tgt_os_no_version}" = "darwin" ] || \
[ "${tgt_os_no_version}" = "openbsd" ] || [ "`uname`" = "OpenBSD" ]; then
openbsd_like=yes
fi
# Default use_x86inc to yes when we are 64 bit, non-pic, or on any # Default use_x86inc to yes when we are 64 bit, non-pic, or on any
# non-Darwin target. # non-Darwin target.
if [ "${tgt_isa}" = "x86_64" ] || [ "${pic}" != "yes" ] || \ if [ "${tgt_isa}" = "x86_64" ] || [ "${pic}" != "yes" ] || \
[ "${tgt_os_no_version}" != "darwin" ]; then [ "${openbsd_like}" != "yes" ]; then
soft_enable use_x86inc soft_enable use_x86inc
fi fi