From db3212b37546201ce99d16cce3867ca5f6a895f9 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 23 Apr 2012 06:33:27 +0000
Subject: [PATCH] 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
---
 gnu/lib/csu/Makefile     | 1 -
 lib/clang/clang.build.mk | 6 ------
 lib/csu/powerpc/Makefile | 3 +--
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index 1c31a9876da..4999d06a578 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -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
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 7437a1df7b9..a14918dc5e6 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -11,12 +11,6 @@ CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \
 # 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\"
 
diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile
index 123391e12a5..bf4c7b15c42 100644
--- a/lib/csu/powerpc/Makefile
+++ b/lib/csu/powerpc/Makefile
@@ -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}