From owner-svn-src-all@FreeBSD.ORG Wed May 12 19:59:33 2010 Return-Path: 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 28A5B106566C; Wed, 12 May 2010 19:59:33 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 160DE8FC13; Wed, 12 May 2010 19:59:33 +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 o4CJxWEO008794; Wed, 12 May 2010 19:59:32 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4CJxWHc008785; Wed, 12 May 2010 19:59:32 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201005121959.o4CJxWHc008785@svn.freebsd.org> From: "David E. O'Brien" Date: Wed, 12 May 2010 19:59:32 +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: r207995 - in head: . etc/mtree gnu/lib/libgcc gnu/lib/libstdc++ gnu/lib/libsupc++ gnu/usr.bin/cc gnu/usr.bin/cc/cc_tools gnu/usr.bin/cc/include 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2010 19:59:33 -0000 Author: obrien Date: Wed May 12 19:59:32 2010 New Revision: 207995 URL: http://svn.freebsd.org/changeset/base/207995 Log: Non-GCC gcc compatible compilers may provide the same multimedia intrinsic headers as GCC, but of their own implementation. So put the GCC ones into their own header "namespace". Requested by: ed Modified: head/ObsoleteFiles.inc head/etc/mtree/BSD.include.dist head/gnu/lib/libgcc/Makefile head/gnu/lib/libstdc++/Makefile head/gnu/lib/libsupc++/Makefile head/gnu/usr.bin/cc/Makefile.inc head/gnu/usr.bin/cc/cc_tools/freebsd-native.h head/gnu/usr.bin/cc/include/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed May 12 19:35:13 2010 (r207994) +++ head/ObsoleteFiles.inc Wed May 12 19:59:32 2010 (r207995) @@ -14,6 +14,24 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100511: move GCC-specific headers to /usr/include/gcc +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/emmintrin.h +OLD_FILES+=usr/include/mm_malloc.h +OLD_FILES+=usr/include/pmmintrin.h +OLD_FILES+=usr/include/xmmintrin.h +.endif +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm" +OLD_FILES+=usr/include/mmintrin.h +.endif +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=usr/include/ia64intrin.h +.endif +.if ${TARGET_ARCH} == "powerpc" +OLD_FILES+=usr/include/altivec.h +OLD_FILES+=usr/include/ppc-asm.h +OLD_FILES+=usr/include/spe.h +.endif # 20100416: [mips] removed .if ${TARGET_ARCH} == "mips" OLD_FILES+=usr/include/machine/psl.h Modified: head/etc/mtree/BSD.include.dist ============================================================================== --- head/etc/mtree/BSD.include.dist Wed May 12 19:35:13 2010 (r207994) +++ head/etc/mtree/BSD.include.dist Wed May 12 19:59:32 2010 (r207995) @@ -159,6 +159,10 @@ unionfs .. .. + gcc + 4.2 + .. + .. geom cache .. Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Wed May 12 19:35:13 2010 (r207994) +++ head/gnu/lib/libgcc/Makefile Wed May 12 19:59:32 2010 (r207995) @@ -1,4 +1,5 @@ # $FreeBSD$ + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs Modified: head/gnu/lib/libstdc++/Makefile ============================================================================== --- head/gnu/lib/libstdc++/Makefile Wed May 12 19:35:13 2010 (r207994) +++ head/gnu/lib/libstdc++/Makefile Wed May 12 19:59:32 2010 (r207995) @@ -1,5 +1,6 @@ # $FreeBSD$ +GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -94,7 +95,7 @@ CLEANFILES+= atomicity.cc INCSGROUPS= BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \ TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS PBHDRS0 PBHDRS1 -CXXINCLUDEDIR= ${INCLUDEDIR}/c++/4.2 +CXXINCLUDEDIR= ${INCLUDEDIR}/c++/${GCCVER} STDHDRS= std_algorithm.h std_bitset.h std_complex.h std_deque.h \ std_fstream.h std_functional.h std_iomanip.h std_ios.h \ Modified: head/gnu/lib/libsupc++/Makefile ============================================================================== --- head/gnu/lib/libsupc++/Makefile Wed May 12 19:35:13 2010 (r207994) +++ head/gnu/lib/libsupc++/Makefile Wed May 12 19:59:32 2010 (r207995) @@ -1,10 +1,11 @@ # $FreeBSD$ +GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${.CURDIR}/../../../contrib/libstdc++/libsupc++ -.PATH: ${SRCDIR} ${GCCLIB}/libiberty +.PATH: ${SRCDIR} ${GCCLIB}/libiberty # Static only. LIB= supc++ @@ -27,7 +28,7 @@ PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-s HDRS= exception new typeinfo cxxabi.h exception_defines.h INCS= ${HDRS:S;^;${SRCDIR}/;} -INCSDIR=${INCLUDEDIR}/c++/4.2 +INCSDIR=${INCLUDEDIR}/c++/${GCCVER} unwind.h: ${GCCDIR}/unwind-generic.h ln -sf ${.ALLSRC} ${.TARGET} Modified: head/gnu/usr.bin/cc/Makefile.inc ============================================================================== --- head/gnu/usr.bin/cc/Makefile.inc Wed May 12 19:35:13 2010 (r207994) +++ head/gnu/usr.bin/cc/Makefile.inc Wed May 12 19:59:32 2010 (r207995) @@ -6,6 +6,7 @@ .if !defined(__CC_MAKEFILE_INC__) __CC_MAKEFILE_INC__= ${MFILE} +GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs @@ -15,6 +16,7 @@ GCCLIB= ${.CURDIR}/../../../../contrib/g MD_FILE= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md GCC_TARGET= ${TARGET_ARCH}-undermydesk-freebsd +CFLAGS+= -DGCCVER=\"${GCCVER}\" CFLAGS+= -DIN_GCC -DHAVE_CONFIG_H CFLAGS+= -DPREFIX=\"${TOOLS_PREFIX}/usr\" #CFLAGS+= -DWANT_COMPILER_INVARIANTS Modified: head/gnu/usr.bin/cc/cc_tools/freebsd-native.h ============================================================================== --- head/gnu/usr.bin/cc/cc_tools/freebsd-native.h Wed May 12 19:35:13 2010 (r207994) +++ head/gnu/usr.bin/cc/cc_tools/freebsd-native.h Wed May 12 19:59:32 2010 (r207995) @@ -15,9 +15,9 @@ #undef LOCAL_INCLUDE_DIR /* We don't wish to support one. */ /* Look for the include files in the system-defined places. */ -#define GPLUSPLUS_INCLUDE_DIR PREFIX"/include/c++/4.2" -#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/4.2/backward" -#define GCC_INCLUDE_DIR PREFIX"/include" +#define GPLUSPLUS_INCLUDE_DIR PREFIX"/include/c++/"GCCVER +#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/"GCCVER"/backward" +#define GCC_INCLUDE_DIR PREFIX"/include/gcc/"GCCVER #ifdef CROSS_COMPILE #define CROSS_INCLUDE_DIR PREFIX"/include" #else Modified: head/gnu/usr.bin/cc/include/Makefile ============================================================================== --- head/gnu/usr.bin/cc/include/Makefile Wed May 12 19:35:13 2010 (r207994) +++ head/gnu/usr.bin/cc/include/Makefile Wed May 12 19:59:32 2010 (r207995) @@ -2,6 +2,8 @@ .include "../Makefile.inc" +INCSDIR=${INCLUDEDIR}/gcc/${GCCVER} + .PATH: ${GCCDIR}/config/${GCC_CPU} .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"