diff options
author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2015-12-03 00:06:59 +0000 |
---|---|---|
committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2015-12-03 00:06:59 +0000 |
commit | e9024539df03d528c1f2ec44de520d0bc6b43236 (patch) | |
tree | 7579e5d2cec0fcc6b09e93c845a4f6bc6fc3e9d4 | |
parent | d4430a264e277dfb19e333292446c205d8a36d4c (diff) | |
download | FreeBSD-src-e9024539df03d528c1f2ec44de520d0bc6b43236.zip FreeBSD-src-e9024539df03d528c1f2ec44de520d0bc6b43236.tar.gz |
Fix build on GCC 5.2 where, at least on PPC64, the compiler would "optimize"
the malloc() + memset() in the local implementation of calloc() into a call
to calloc(), helpfully turning it into an infinite loop. Clean up some
unneeded flags on PPC64 while here.
MFC after: 1 month
-rw-r--r-- | libexec/rtld-elf/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 764c025..e10fe42 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -13,7 +13,7 @@ SRCS= rtld_start.S \ malloc.c xmalloc.c debug.c libmap.c MAN= rtld.1 CSTD?= gnu99 -CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD +CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -fno-builtin CFLAGS+= -I${SRCTOP}/lib/csu/common .if exists(${.CURDIR}/${MACHINE_ARCH}) RTLD_ARCH= ${MACHINE_ARCH} @@ -22,7 +22,6 @@ RTLD_ARCH= ${MACHINE_CPUARCH} .endif CFLAGS+= -I${.CURDIR}/${RTLD_ARCH} -I${.CURDIR} .if ${MACHINE_ARCH} == "powerpc64" -CFLAGS+= -mcall-aixdesc LDFLAGS+= -nostdlib -e _rtld_start .else LDFLAGS+= -nostdlib -e .rtld_start |