svn commit: r234596 - in head: gnu/lib/csu lib/clang lib/csu/powerpc

[Dimitry Andric]

Author: dim
Date: Mon Apr 23 06:33:27 2012
New Revision: 234596
URL: http://svn.freebsd.org/changeset/base/234596

Log:
  Revert r234356 for now, as it leads to run-time problems on 32-bit
  PowerPC.  Note this will break world.
  
  Reported by:	andreast
  Pointy hat to:	dim

Modified:
  head/gnu/lib/csu/Makefile
  head/lib/clang/clang.build.mk
  head/lib/csu/powerpc/Makefile

Modified: head/gnu/lib/csu/Makefile
==============================================================================
--- head/gnu/lib/csu/Makefile	Mon Apr 23 03:42:23 2012	(r234595)
+++ head/gnu/lib/csu/Makefile	Mon Apr 23 06:33:27 2012	(r234596)
@@ -34,7 +34,6 @@ CFLAGS+=	-include osreldate.h
 .if ${MACHINE_CPUARCH} == "powerpc"
 TGTOBJS=	crtsavres.o
 SRCS+=		crtsavres.asm
-CFLAGS+=	-mlongcall
 .endif
 .if ${MACHINE_CPUARCH} == "sparc64"
 TGTOBJS=	crtfastmath.o

Modified: head/lib/clang/clang.build.mk
==============================================================================
--- head/lib/clang/clang.build.mk	Mon Apr 23 03:42:23 2012	(r234595)
+++ head/lib/clang/clang.build.mk	Mon Apr 23 06:33:27 2012	(r234596)
@@ -11,12 +11,6 @@ CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG
 # LLVM is not strict aliasing safe as of 12/31/2011
 CFLAGS+= -fno-strict-aliasing
 
-# Work around an issue on 32-bit PowerPC, where the clang executable can get
-# too big, causing 'relocation truncated to fit' errors at link time.
-.if ${MACHINE_ARCH} == "powerpc"
-CFLAGS+=-mlongcall
-.endif
-
 TARGET_ARCH?=	${MACHINE_ARCH}
 CFLAGS+=-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0\"
 

Modified: head/lib/csu/powerpc/Makefile
==============================================================================
--- head/lib/csu/powerpc/Makefile	Mon Apr 23 03:42:23 2012	(r234595)
+++ head/lib/csu/powerpc/Makefile	Mon Apr 23 06:33:27 2012	(r234596)
@@ -6,8 +6,7 @@ SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
 CFLAGS+=	-I${.CURDIR}/../common \
-		-I${.CURDIR}/../../libc/include \
-		-mlongcall
+		-I${.CURDIR}/../../libc/include
 
 all: ${OBJS}