svn commit: r215185 - in head: gnu/lib/libgcc lib/libcompiler_rt

[Ed Schouten]

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>