svn commit: r291666 - head/libexec/rtld-elf

[Nathan Whitehorn]

Author: nwhitehorn
Date: Thu Dec  3 00:06:59 2015
New Revision: 291666
URL: https://svnweb.freebsd.org/changeset/base/291666

Log:
  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

Modified:
  head/libexec/rtld-elf/Makefile

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Thu Dec  3 00:02:01 2015	(r291665)
+++ head/libexec/rtld-elf/Makefile	Thu Dec  3 00:06:59 2015	(r291666)
@@ -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