svn commit: r215127 - in head: . gnu/lib/libgcc lib sys/sys

[Ed Schouten]

Author: ed
Date: Thu Nov 11 15:48:27 2010
New Revision: 215127
URL: http://svn.freebsd.org/changeset/base/215127

Log:
  Replace libgcc.a by libcompiler_rt.a.
  
  libcompiler_rt.a is a BSD licensed C language runtime, which implements
  many routines which are linked into binaries on architectures where
  certain functionality is missing (e.g. 64 bits mul/div on i386).
  
  Unfortunately, libcompiler_rt cannot replace libgcc entirely. Certain
  features, such as an unwinder for exception handling, are missing.
  That's why only libgcc.a is replaced for now, because this one does seem
  to be complete.
  
  Tested by:	rene (amd64), nwhitehorn (powerpc), droso (i386 exprun)
  		and many others. Thanks!
  Obtained from:	user/ed/compiler-rt

Modified:
  head/Makefile.inc1
  head/gnu/lib/libgcc/Makefile
  head/lib/Makefile
  head/sys/sys/param.h

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Nov 11 15:24:57 2010	(r215126)
+++ head/Makefile.inc1	Thu Nov 11 15:48:27 2010	(r215127)
@@ -1123,7 +1123,7 @@ libraries:
 #
 # static libgcc.a prerequisite for shared libc
 #
-_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc
+_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt
 
 # These dependencies are not automatically generated:
 #
@@ -1139,6 +1139,7 @@ _startup_libs+=	lib/csu/${MACHINE_ARCH}
 _startup_libs+=	lib/csu/${MACHINE_CPUARCH}
 .endif
 _startup_libs+=	gnu/lib/libgcc
+_startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
 
 gnu/lib/libgcc__L: lib/libc__L

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Thu Nov 11 15:24:57 2010	(r215126)
+++ head/gnu/lib/libgcc/Makefile	Thu Nov 11 15:48:27 2010	(r215127)
@@ -3,7 +3,6 @@
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 
-LIB=		gcc
 SHLIB_NAME=	libgcc_s.so.1
 SHLIBDIR?=	/lib
 

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Thu Nov 11 15:24:57 2010	(r215126)
+++ head/lib/Makefile	Thu Nov 11 15:48:27 2010	(r215127)
@@ -34,6 +34,7 @@ SUBDIR_ORDERED=	${_csu} \
 	libbsm \
 	libauditd \
 	libcom_err \
+	libcompiler_rt \
 	libcrypt \
 	libelf \
 	libkvm \
@@ -53,6 +54,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libarchive \
 	${_libatm} \
 	libbegemot \
+	libblocksruntime \
 	${_libbluetooth} \
 	${_libbsnmp} \
 	libbz2 \

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Thu Nov 11 15:24:57 2010	(r215126)
+++ head/sys/sys/param.h	Thu Nov 11 15:48:27 2010	(r215127)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 900023	/* Master, propagated to newvers */
+#define __FreeBSD_version 900024	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>