about summary refs log tree commit diff
path: root/ports/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-21 21:04:33 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-21 21:04:33 +0000
commita451ee33afe03b8c16a0d166be380182b9587f59 (patch)
tree65cacb4681b8fdf280d16a3852a3f005d078435b /ports/sysdeps/unix/sysv
parent988d15f5bdcf1be7d54b8602509d67a6aabb17e0 (diff)
downloadglibc-a451ee33afe03b8c16a0d166be380182b9587f59.tar.gz
glibc-a451ee33afe03b8c16a0d166be380182b9587f59.tar.xz
glibc-a451ee33afe03b8c16a0d166be380182b9587f59.zip
Avoid $(shell) in determining default ARM ABI.
Diffstat (limited to 'ports/sysdeps/unix/sysv')
-rw-r--r--ports/sysdeps/unix/sysv/linux/arm/Makefile23
1 files changed, 7 insertions, 16 deletions
diff --git a/ports/sysdeps/unix/sysv/linux/arm/Makefile b/ports/sysdeps/unix/sysv/linux/arm/Makefile
index bda3ea9f71..be7946e966 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/Makefile
+++ b/ports/sysdeps/unix/sysv/linux/arm/Makefile
@@ -70,25 +70,16 @@ LDFLAGS-tst-rfc3484-2 += $(common-objpfx)csu/libc-do-syscall.o
 LDFLAGS-tst-rfc3484-3 += $(common-objpfx)csu/libc-do-syscall.o
 endif
 
-define default-abi-prog
-echo '#ifdef __ARM_PCS_VFP';
-echo 'hard';
-echo '#else';
-echo 'soft';
-echo '#endif'
-endef
-default-abi := $(strip $(shell \
-    ($(default-abi-prog)) | $(CC) $(CFLAGS) $(CPPFLAGS) -E -P -))
-ifeq ($(default-abi),hard)
-# OK.
-else
-ifneq ($(default-abi),soft)
-Unknown ABI, must be "hard" or "soft".
-endif
+# Get value of default-abi.
+include $(common-objpfx)default-abi.make
+
+abi-variants := soft hard
+
+ifeq (,$(filter $(default-abi),$(abi-variants)))
+Unknown ABI, must be one of $(abi-variants)
 endif
 
 abi-includes :=
-abi-variants := soft hard
 abi-soft-options := -U__ARM_PCS_VFP
 abi-soft-condition := !defined __ARM_PCS_VFP
 abi-soft-ld-soname := ld-linux.so.3