diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2019-08-03 19:36:57 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2019-08-03 19:36:57 +0000 |
| commit | bf41cc16b305b5e7b040f3c5b89f9174591b2836 (patch) | |
| tree | 31c3c5e470437a9c4f49859c2985a3287addf419 /libexec/ld.so | |
| parent | ede0690f435bd771cbf2f9c756e1ba35a20974a2 (diff) | |
Suppress DWARF2 warnings on clang archs by building with -gdwarf-4
ok deraadt@, kettenis@
Diffstat (limited to 'libexec/ld.so')
| -rw-r--r-- | libexec/ld.so/Makefile | 6 | ||||
| -rw-r--r-- | libexec/ld.so/aarch64/Makefile.inc | 5 | ||||
| -rw-r--r-- | libexec/ld.so/amd64/Makefile.inc | 5 | ||||
| -rw-r--r-- | libexec/ld.so/arm/Makefile.inc | 5 |
4 files changed, 15 insertions, 6 deletions
diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile index e978fcb9674..7ff91bc5504 100644 --- a/libexec/ld.so/Makefile +++ b/libexec/ld.so/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.75 2019/07/14 03:23:12 guenther Exp $ +# $OpenBSD: Makefile,v 1.76 2019/08/03 19:36:55 guenther Exp $ SUBDIR=ldconfig ldd MAN= ld.so.1 @@ -70,12 +70,12 @@ $(test_prog): $(PROG): $(test_prog) ${VERSION_SCRIPT} $(OBJS) ${LD_SCRIPT} .if defined(SYSPATCH_PATH) - $(LD) ${DEBUG} -e _dl_start $(ELF_LDFLAGS) -o $(candidate) \ + $(LD) -e _dl_start $(ELF_LDFLAGS) -o $(candidate) \ `readelf -Ws ${SYSPATCH_PATH}/usr/libexec/${.TARGET} | \ awk '/ FILE/{sub(".*/", "", $$NF); gsub(/\..*/, ".o", $$NF); print $$NF}' | \ awk '!x[$$0]++'` .else - $(LD) ${DEBUG} -e _dl_start $(ELF_LDFLAGS) -o $(candidate) \ + $(LD) -e _dl_start $(ELF_LDFLAGS) -o $(candidate) \ `echo ${OBJS} | tr " " "\n" | sort -R` .endif .ifndef CROSSDIR diff --git a/libexec/ld.so/aarch64/Makefile.inc b/libexec/ld.so/aarch64/Makefile.inc index 4d952565dc1..5bbc62afe14 100644 --- a/libexec/ld.so/aarch64/Makefile.inc +++ b/libexec/ld.so/aarch64/Makefile.inc @@ -1,7 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.4 2019/05/10 13:29:21 guenther Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2019/08/03 19:36:55 guenther Exp $ CFLAGS += -fpic CFLAGS += -march=armv8-a+nofp+nosimd # this is -msoft-float AFLAGS += -D_STANDALONE CPPFLAGS += -I${.CURDIR}/../../lib/libc/arch/aarch64 LD_SCRIPT = ${.CURDIR}/${MACHINE_CPU}/ld.script + +# Suppress DWARF2 warnings +DEBUG?= -gdwarf-4 diff --git a/libexec/ld.so/amd64/Makefile.inc b/libexec/ld.so/amd64/Makefile.inc index cfd3018d9f8..ce6c0ef290a 100644 --- a/libexec/ld.so/amd64/Makefile.inc +++ b/libexec/ld.so/amd64/Makefile.inc @@ -1,5 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.5 2019/05/10 13:29:21 guenther Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2019/08/03 19:36:56 guenther Exp $ CFLAGS += -fPIC -mno-sse2 -mno-sse -mno-3dnow -mno-mmx AFLAGS += -fpic LD_SCRIPT = ${.CURDIR}/${MACHINE_CPU}/ld.script + +# Suppress DWARF2 warnings +DEBUG?= -gdwarf-4 diff --git a/libexec/ld.so/arm/Makefile.inc b/libexec/ld.so/arm/Makefile.inc index 1de862f8d44..0d53bacd83b 100644 --- a/libexec/ld.so/arm/Makefile.inc +++ b/libexec/ld.so/arm/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2019/05/10 13:29:21 guenther Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2019/08/03 19:36:56 guenther Exp $ CFLAGS += -fpic -msoft-float AFLAGS += -D_STANDALONE @@ -7,3 +7,6 @@ CPPFLAGS += -I${.CURDIR}/../../lib/libc/arch/arm SRCS+= divsi3.S LIBCSRCDIR=${.CURDIR}/../../lib/libc .PATH: ${LIBCSRCDIR}/arch/arm/gen + +# Suppress DWARF2 warnings +DEBUG?= -gdwarf-4 |