Doh... don't add the ABI to 'os'. Hopefully arm is really fixed now.

This commit is contained in:
skrll 2016-05-12 10:55:03 +00:00
parent f4ea937e9d
commit 74f1f7b042
4 changed files with 5 additions and 33 deletions

View File

@ -193,16 +193,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case "${UNAME_MACHINE_ARCH}" in
coldfire) os=netbsdelf ;;
earm*)
eval $set_cc_for_build
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
os=netbsdelf-eabi
else
os=netbsdelf-eabihf
fi
os=netbsdelf
;;
arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__

View File

@ -193,14 +193,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case "${UNAME_MACHINE_ARCH}" in
coldfire) os=netbsdelf ;;
earm*)
eval $set_cc_for_build
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
os=netbsdelf-eabi
else
os=netbsdelf-eabihf
fi
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build

View File

@ -193,14 +193,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case "${UNAME_MACHINE_ARCH}" in
coldfire) os=netbsdelf ;;
earm*)
eval $set_cc_for_build
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
os=netbsdelf-eabi
else
os=netbsdelf-eabihf
fi
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build

View File

@ -193,14 +193,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case "${UNAME_MACHINE_ARCH}" in
coldfire) os=netbsdelf ;;
earm*)
eval $set_cc_for_build
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
os=netbsdelf-eabi
else
os=netbsdelf-eabihf
fi
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build