From c24a03791530ce8477c3ed81646e6ac74fe512b6 Mon Sep 17 00:00:00 2001 From: mmel Date: Wed, 29 Apr 2020 16:05:50 +0000 Subject: [PATCH] Move ARM specific flags to arm/Makefile.inc Requested by: kib MFC with: r360463 --- libexec/rtld-elf/Makefile | 4 +--- libexec/rtld-elf/arm/Makefile.inc | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index de5cc5c22adc..b83c8357284c 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -48,9 +48,7 @@ MLINKS?= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 CFLAGS+= -fpic -DPIC $(DEBUG) -CFLAGS.armv6+= -mfpu=none -CFLAGS.armv7+= -mfpu=none - + LDFLAGS+= -shared -Wl,-Bsymbolic -Wl,-z,defs -nostdlib -e ${RTLD_ENTRY} # Pull in the dependencies that we use from libc .include "rtld-libc/Makefile.inc" diff --git a/libexec/rtld-elf/arm/Makefile.inc b/libexec/rtld-elf/arm/Makefile.inc index 2ef884cfe1d0..25bd4120edae 100644 --- a/libexec/rtld-elf/arm/Makefile.inc +++ b/libexec/rtld-elf/arm/Makefile.inc @@ -5,3 +5,4 @@ # correctly linked. As some of the functions are used before we have # shared libraries. LIBADD+= compiler_rt +CFLAGS+= -mfpu=none