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
This commit is contained in:
David E. O'Brien 2010-05-12 19:59:32 +00:00
parent 42ebc8c692
commit 680e78b305
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=207995
8 changed files with 35 additions and 6 deletions

View File

@ -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 <machine/psl.h>
.if ${TARGET_ARCH} == "mips"
OLD_FILES+=usr/include/machine/psl.h

View File

@ -159,6 +159,10 @@
unionfs
..
..
gcc
4.2
..
..
geom
cache
..

View File

@ -1,4 +1,5 @@
# $FreeBSD$
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs

View File

@ -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 \

View File

@ -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-sections}
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}

View File

@ -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/gcclibs
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

View File

@ -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

View File

@ -2,6 +2,8 @@
.include "../Makefile.inc"
INCSDIR=${INCLUDEDIR}/gcc/${GCCVER}
.PATH: ${GCCDIR}/config/${GCC_CPU}
.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"