diff options
| author | James Zern <jzern@google.com> | 2015-01-22 20:04:07 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-22 20:04:07 -0800 |
| commit | 880ca0ecad0ba62d8e08c39602dc00346ec26521 (patch) | |
| tree | ab046994b97d6ec4fac3aa0dd24e5d210a1abf8f | |
| parent | 0b6e35a90dea29cafe52a475e3e7be0dd58e31cd (diff) | |
| parent | 0373dbf5a50c03cd9facc4090ac68205c1b9e39d (diff) | |
| download | libvpx-880ca0ecad0ba62d8e08c39602dc00346ec26521.tar libvpx-880ca0ecad0ba62d8e08c39602dc00346ec26521.tar.gz libvpx-880ca0ecad0ba62d8e08c39602dc00346ec26521.tar.bz2 libvpx-880ca0ecad0ba62d8e08c39602dc00346ec26521.zip | |
Merge "workaround stack bashing by asm on 32-bit OpenBSD"
| -rw-r--r-- | build/make/configure.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 62835db4c..c527cd527 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -1251,10 +1251,14 @@ EOF fi 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 # non-Darwin target. if [ "${tgt_isa}" = "x86_64" ] || [ "${pic}" != "yes" ] || \ - [ "${tgt_os_no_version}" != "darwin" ]; then + [ "${openbsd_like}" != "yes" ]; then soft_enable use_x86inc fi |