From owner-svn-src-all@FreeBSD.ORG  Fri Nov 12 15:52:28 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 512F91065679;
	Fri, 12 Nov 2010 15:52:28 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DDE98FC0C;
	Fri, 12 Nov 2010 15:52:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oACFqSfu013722;
	Fri, 12 Nov 2010 15:52:28 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACFqSWN013719;
	Fri, 12 Nov 2010 15:52:28 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201011121552.oACFqSWN013719@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 12 Nov 2010 15:52:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215185 - in head: gnu/lib/libgcc lib/libcompiler_rt
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Nov 2010 15:52:28 -0000

Author: ed
Date: Fri Nov 12 15:52:27 2010
New Revision: 215185
URL: http://svn.freebsd.org/changeset/base/215185

Log:
  Revert to libgcc for sparc64.
  
  I've had a report of a sparc64 system where cc1 generates illegal
  instructions. We still have to diagnose this properly, but instead of
  hosing all sparc64 boxes out there, fall back to libgcc to prevent more
  damage.
  
  Reported by:	Florian Smeets

Modified:
  head/gnu/lib/libgcc/Makefile
  head/lib/libcompiler_rt/Makefile

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Fri Nov 12 15:40:00 2010	(r215184)
+++ head/gnu/lib/libgcc/Makefile	Fri Nov 12 15:52:27 2010	(r215185)
@@ -15,6 +15,10 @@ MK_SSP=	no
 
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
+.if ${TARGET_CPUARCH} == "sparc64"
+LIB=		gcc
+.endif
+
 .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}/config ${GCCDIR}
 
 CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \

Modified: head/lib/libcompiler_rt/Makefile
==============================================================================
--- head/lib/libcompiler_rt/Makefile	Fri Nov 12 15:40:00 2010	(r215184)
+++ head/lib/libcompiler_rt/Makefile	Fri Nov 12 15:52:27 2010	(r215185)
@@ -147,11 +147,13 @@ SRCS+=	${file}.c
 . endif
 .endfor
 
-.if ${MK_INSTALLLIB} != "no"
+.if ${MACHINE_CPUARCH} != "sparc64"
+. if ${MK_INSTALLLIB} != "no"
 SYMLINKS+=libcompiler_rt.a ${LIBDIR}/libgcc.a
-.endif
-.if ${MK_PROFILE} != "no"
+. endif
+. if ${MK_PROFILE} != "no"
 SYMLINKS+=libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a
+. endif
 .endif
 
 .include <bsd.lib.mk>