Date: Thu, 11 Nov 2010 15:13:12 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r215125 - in head: contrib/compiler-rt contrib/compiler-rt/BlocksRuntime contrib/compiler-rt/BlocksRuntime/tests contrib/compiler-rt/cmake contrib/compiler-rt/lib contrib/compiler-rt/li... Message-ID: <201011111513.oABFDCmN072216@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Thu Nov 11 15:13:11 2010 New Revision: 215125 URL: http://svn.freebsd.org/changeset/base/215125 Log: Import libcompiler_rt into HEAD and add Makefiles. Obtained from: user/ed/compiler-rt Added: head/contrib/compiler-rt/ - copied from r214849, vendor/compiler-rt/dist/ head/lib/libblocksruntime/ head/lib/libblocksruntime/Makefile (contents, props changed) head/lib/libblocksruntime/config.h (contents, props changed) head/lib/libcompiler_rt/ head/lib/libcompiler_rt/Makefile (contents, props changed) Deleted: head/contrib/compiler-rt/.gitignore head/contrib/compiler-rt/BlocksRuntime/CMakeLists.txt head/contrib/compiler-rt/BlocksRuntime/tests/ head/contrib/compiler-rt/CMakeLists.txt head/contrib/compiler-rt/Makefile head/contrib/compiler-rt/cmake/ head/contrib/compiler-rt/lib/CMakeLists.txt head/contrib/compiler-rt/lib/Makefile.mk head/contrib/compiler-rt/lib/arm/CMakeLists.txt head/contrib/compiler-rt/lib/arm/Makefile.mk head/contrib/compiler-rt/lib/i386/CMakeLists.txt head/contrib/compiler-rt/lib/i386/Makefile.mk head/contrib/compiler-rt/lib/ppc/CMakeLists.txt head/contrib/compiler-rt/lib/ppc/Makefile.mk head/contrib/compiler-rt/lib/sparc64/ head/contrib/compiler-rt/lib/x86_64/CMakeLists.txt head/contrib/compiler-rt/lib/x86_64/Makefile.mk head/contrib/compiler-rt/make/ head/contrib/compiler-rt/test/ head/contrib/compiler-rt/www/ Modified: head/contrib/compiler-rt/lib/clear_cache.c head/contrib/compiler-rt/lib/trampoline_setup.c Modified: head/contrib/compiler-rt/lib/clear_cache.c ============================================================================== --- vendor/compiler-rt/dist/lib/clear_cache.c Fri Nov 5 20:24:26 2010 (r214849) +++ head/contrib/compiler-rt/lib/clear_cache.c Thu Nov 11 15:13:11 2010 (r215125) @@ -8,6 +8,7 @@ * ===----------------------------------------------------------------------=== */ +#include "int_lib.h" #include <stdlib.h> #if __APPLE__ Modified: head/contrib/compiler-rt/lib/trampoline_setup.c ============================================================================== --- vendor/compiler-rt/dist/lib/trampoline_setup.c Fri Nov 5 20:24:26 2010 (r214849) +++ head/contrib/compiler-rt/lib/trampoline_setup.c Thu Nov 11 15:13:11 2010 (r215125) @@ -23,7 +23,7 @@ extern void __clear_cache(void* start, v * and then jumps to the target nested function. */ -#if __ppc__ +#if __ppc__ && !defined(__powerpc64__) void __trampoline_setup(uint32_t* trampOnStack, int trampSizeAllocated, const void* realFunc, void* localsPtr) { Added: head/lib/libblocksruntime/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libblocksruntime/Makefile Thu Nov 11 15:13:11 2010 (r215125) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +LIB= BlocksRuntime +SHLIB_MAJOR=0 +CFLAGS+=-I${.CURDIR} +WARNS?= 2 + +.PATH: ${.CURDIR}/../../contrib/compiler-rt/BlocksRuntime + +INCS= Block.h Block_private.h +SRCS= data.c runtime.c + +.include <bsd.lib.mk> Added: head/lib/libblocksruntime/config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libblocksruntime/config.h Thu Nov 11 15:13:11 2010 (r215125) @@ -0,0 +1,14 @@ +/* $FreeBSD$ */ + +/* #undef HAVE_SYS_BYTEORDER_H */ +/* #undef HAVE_AVAILABILITY_MACROS_H */ +/* #undef HAVE_TARGET_CONDITIONALS_H */ +/* #undef HAVE_LIBKERN_OSATOMIC_H */ + +#define HAVE_SYSCONF 1 + +/* #undef HAVE_OSATOMIC_COMPARE_AND_SWAP_INT */ +/* #undef HAVE_OSATOMIC_COMPARE_AND_SWAP_LONG */ + +#define HAVE_SYNC_BOOL_COMPARE_AND_SWAP_INT 1 +#define HAVE_SYNC_BOOL_COMPARE_AND_SWAP_LONG 1 Added: head/lib/libcompiler_rt/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libcompiler_rt/Makefile Thu Nov 11 15:13:11 2010 (r215125) @@ -0,0 +1,157 @@ +# $FreeBSD$ + +.include <bsd.own.mk> + +LIB= compiler_rt +NO_PIC= +WARNS?= 2 + +CFLAGS+=${PICFLAG} + +.if ${MACHINE_CPUARCH} == "amd64" +CRTARCH=x86_64 +.else +CRTARCH=${MACHINE_CPUARCH} +.endif + +CRTSRC=${.CURDIR}/../../contrib/compiler-rt/lib + +.PATH: ${CRTSRC}/${CRTARCH} ${CRTSRC} + +SRCF= absvdi2 \ + absvsi2 \ + absvti2 \ + addvdi3 \ + addvsi3 \ + addvti3 \ + ashldi3 \ + ashlti3 \ + ashrdi3 \ + ashrti3 \ + clear_cache \ + clzdi2 \ + clzsi2 \ + clzti2 \ + cmpdi2 \ + cmpti2 \ + comparedf2 \ + comparesf2 \ + ctzdi2 \ + ctzsi2 \ + ctzti2 \ + divdc3 \ + divdi3 \ + divsc3 \ + divti3 \ + divxc3 \ + enable_execute_stack \ + eprintf \ + ffsdi2 \ + ffsti2 \ + fixdfdi \ + fixdfti \ + fixsfdi \ + fixsfti \ + fixunsdfdi \ + fixunsdfsi \ + fixunsdfti \ + fixunssfdi \ + fixunssfsi \ + fixunssfti \ + fixunsxfdi \ + fixunsxfsi \ + fixunsxfti \ + fixxfdi \ + fixxfti \ + floatdidf \ + floatdisf \ + floatdixf \ + floattidf \ + floattisf \ + floattixf \ + floatundidf \ + floatundisf \ + floatundixf \ + floatunsidf \ + floatunsisf \ + floatuntidf \ + floatuntisf \ + floatuntixf \ + lshrdi3 \ + lshrti3 \ + moddi3 \ + modti3 \ + muldc3 \ + muldi3 \ + mulsc3 \ + multi3 \ + mulvdi3 \ + mulvsi3 \ + mulvti3 \ + mulxc3 \ + negdf2 \ + negdi2 \ + negsf2 \ + negti2 \ + negvdi2 \ + negvsi2 \ + negvti2 \ + paritydi2 \ + paritysi2 \ + parityti2 \ + popcountdi2 \ + popcountsi2 \ + popcountti2 \ + powidf2 \ + powisf2 \ + powitf2 \ + powixf2 \ + subvdi3 \ + subvsi3 \ + subvti3 \ + trampoline_setup \ + ucmpdi2 \ + ucmpti2 \ + udivdi3 \ + udivmoddi4 \ + udivmodti4 \ + udivti3 \ + umoddi3 \ + umodti3 + +# These are already shipped by libc.a on arm and mips +.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" +SRCF+= adddf3 \ + addsf3 \ + divdf3 \ + divsf3 \ + divsi3 \ + extendsfdf2 \ + fixdfsi \ + fixsfsi \ + floatsidf \ + floatsisf \ + modsi3 \ + muldf3 \ + mulsf3 \ + truncdfsf2 \ + udivsi3 \ + umodsi3 +.endif + +.for file in ${SRCF} +. if ${MACHINE_CPUARCH} != "arm" && exists(${CRTSRC}/${CRTARCH}/${file}.S) +SRCS+= ${file}.S +. else +SRCS+= ${file}.c +. endif +.endfor + +.if ${MK_INSTALLLIB} != "no" +SYMLINKS+=libcompiler_rt.a ${LIBDIR}/libgcc.a +.endif +.if ${MK_PROFILE} != "no" +SYMLINKS+=libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a +.endif + +.include <bsd.lib.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011111513.oABFDCmN072216>