diff options
| author | andrew <andrew@FreeBSD.org> | 2014-10-01 16:08:19 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2014-10-01 16:08:19 +0000 |
| commit | 47431db4e9e945e13f4f501b09cb6721006ff747 (patch) | |
| tree | 1db6bc21e5524b4588644495a70ff02149eca062 /lib | |
| parent | 732fbf8303d8a3b666e2cffb9a9e26859a430a58 (diff) | |
| download | FreeBSD-src-47431db4e9e945e13f4f501b09cb6721006ff747.zip FreeBSD-src-47431db4e9e945e13f4f501b09cb6721006ff747.tar.gz | |
Clean up detection of hard-float ABIs. As with big-endian in r272368 we
can check against arm*hf*.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/arm/Makefile.inc | 2 | ||||
| -rw-r--r-- | lib/libc/arm/aeabi/Makefile.inc | 2 | ||||
| -rw-r--r-- | lib/libcompiler_rt/Makefile | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/arm/Makefile.inc b/lib/libc/arm/Makefile.inc index 923b4d0..418f54d 100644 --- a/lib/libc/arm/Makefile.inc +++ b/lib/libc/arm/Makefile.inc @@ -11,7 +11,7 @@ SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol.map .include "${LIBC_SRCTOP}/arm/aeabi/Makefile.inc" -.if ${MACHINE_ARCH} == "armv6hf" +.if ${MACHINE_ARCH:Marm*hf*} != "" SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol_vfp.map .endif diff --git a/lib/libc/arm/aeabi/Makefile.inc b/lib/libc/arm/aeabi/Makefile.inc index 0957c92..c0ce512 100644 --- a/lib/libc/arm/aeabi/Makefile.inc +++ b/lib/libc/arm/aeabi/Makefile.inc @@ -5,7 +5,7 @@ SRCS+= aeabi_atexit.c \ aeabi_unwind_cpp.c \ aeabi_unwind_exidx.c -.if ${MACHINE_ARCH} != "armv6hf" +.if ${MACHINE_ARCH:Marm*hf*} == "" SRCS+= aeabi_double.c \ aeabi_float.c .endif diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index d29e2a2..c31eced 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -164,9 +164,9 @@ SRCF+= stdatomic .endif .for file in ${SRCF} -. if ${MACHINE_ARCH} == "armv6hf" && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S) +. if ${MACHINE_ARCH:Marm*hf*} != "" && exists(${CRTSRC}/${CRTARCH}/${file}vfp.S) SRCS+= ${file}vfp.S -. elif (${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH} == "armv6hf") && exists(${CRTSRC}/${CRTARCH}/${file}.S) +. elif !(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH:Marm*hf*} == "") && exists(${CRTSRC}/${CRTARCH}/${file}.S) SRCS+= ${file}.S . else SRCS+= ${file}.c |
