===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.4
retrieving revision 1.99
diff -u -r1.4 -r1.99
--- src/Makefile.cross	2005/01/19 18:31:34	1.4
+++ src/Makefile.cross	2018/02/04 21:11:32	1.99
@@ -1,48 +1,123 @@
-# $OpenBSD: Makefile.cross,v 1.4 2005/01/19 18:31:34 grange Exp $
+# $OpenBSD: Makefile.cross,v 1.99 2018/02/04 21:11:32 patrick Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
-cross-distrib:	cross-tools cross-bin cross-etc-root-var
+cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
+# cross-gnu \
 
-CROSSCPPFLAGS?=	-nostdinc -I${CROSSDIR}/usr/include
-CROSSLDFLAGS?=	-nostdlib -L${CROSSDIR}/usr/lib -static
-CROSSCFLAGS?=	${CROSSCPPFLAGS}
+# Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
+# this variable to work.
+.if	(${TARGET} == "arm64")
+TARGET_ARCH=	aarch64
+.elif	(${TARGET} == "armv7")
+TARGET_ARCH=	arm
+.elif	(${TARGET} == "luna88k")
+TARGET_ARCH=	m88k
+.elif	(${TARGET} == "sgi" || ${TARGET} == "octeon")
+TARGET_ARCH=	mips64
+.elif	(${TARGET} == "loongson")
+TARGET_ARCH=	mips64el
+TARGET_CPU=	mips64
+.elif	(${TARGET} == "macppc" || ${TARGET} == "socppc")
+TARGET_ARCH=	powerpc
+.elif	(${TARGET} == "landisk")
+TARGET_ARCH=	sh
+.else
+TARGET_ARCH=	${TARGET}
+.endif
+TARGET_CPU?=	${TARGET_ARCH}
+
+# List of LP64 archs
+# XXX move to bsd.*.mk?
+LP64_ARCH = aarch64 amd64 alpha mips64 sparc64
+
+TARGET_IS_LP64 =
+MACHINE_IS_LP64 =
+.for _ in ${LP64_ARCH}
+. if !empty(TARGET_ARCH:M$_)
+    TARGET_IS_LP64 = yes
+. endif
+. if !empty(MACHINE_ARCH:M$_)
+    MACHINE_IS_LP64 = yes
+. endif
+.endfor
+
+#CROSSCPPFLAGS?=	-nostdinc -I${CROSSDIR}/usr/include
+#CROSSLDFLAGS?=	-nostdlib -L${CROSSDIR}/usr/lib -static
+CROSSCFLAGS?=	${CROSSCPPFLAGS} -O2 ${PIPE} ${DEBUG}
 CROSSCXXFLAGS?=	${CROSSCPPFLAGS}
-LDSTATIC?=	-static
+#LDSTATIC?=	-static
 
 CROSSDIR=	${DESTDIR}/usr/cross/${TARGET}
-CROSSENV=	AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \
-		CC=${CROSSDIR}/usr/bin/cc CPP=${CROSSDIR}/usr/bin/cpp \
-		CXX=${CROSSDIR}/usr/bin/c++ \
-		LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \
-		LORDER=/usr/bin/lorder RANLIB=${CROSSDIR}/usr/bin/ranlib \
-		SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \
-		HOSTCC=\"${CC}\" HOSTCXX=\"${CXX}\" NOMAN= DESTDIR=${CROSSDIR} \
+CROSSENV=	AR=${CROSSDIR}/usr/${TARGET_CANON}/bin/ar \
+		AS=${CROSSDIR}/usr/${TARGET_CANON}/bin/as \
+		CC=${CROSSDIR}/usr/${TARGET_CANON}/bin/cc \
+		CPP=${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp \
+		CXX=${CROSSDIR}/usr/${TARGET_CANON}/bin/c++ \
+		LD=${CROSSDIR}/usr/${TARGET_CANON}/bin/ld \
+		OBJCOPY=${CROSSDIR}/usr/${TARGET_CANON}/bin/objcopy \
+		LORDER=/usr/bin/lorder RANLIB=${CROSSDIR}/usr/${TARGET_CANON}/bin/ranlib \
+		STRIP=${CROSSDIR}/usr/${TARGET_CANON}/bin/strip \
+		HOSTCC=\"${CC}\" HOSTCXX=\"${CXX}\" NOMAN= \
 		HOSTCFLAGS=\"${CFLAGS}\" HOSTCXXFLAGS=\"${CXXFLAGS}\" \
-		HOSTLDFLAGS=\"${LDFLAGS} \" \
+		HOSTLDFLAGS=\"${LDFLAGS}\" \
 		CFLAGS=\"${CROSSCFLAGS}\" CPPFLAGS=\"${CROSSCPPFLAGS}\" \
 		CXXFLAGS=\"${CROSSCXXFLAGS}\" \
-		LDFLAGS=\"${CROSSLDFLAGS}\"
-CROSSPATH=	${PATH}:${CROSSDIR}/usr/bin
+		LDFLAGS=\"${CROSSLDFLAGS}\" \
+		CROSSDIR=\"${CROSSDIR}\"
+CROSSADDPATH=:${CROSSDIR}/usr/${TARGET_CANON}/bin
+CROSSPATH=	/usr/bin:/bin:/usr/sbin:/sbin${CROSSADDPATH}
 CROSSLANGS?=	c c++
 
 TARGET_CANON=`cat ${CROSSDIR}/TARGET_CANON`
-TARGET_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`
 
 CROSSDIRS=	${CROSSDIR}/.dirs_done
-CROSSOBJ=	${CROSSDIR}/usr/obj/.obj_done
-CROSSINCLUDES=	${CROSSDIR}/usr/include/.includes_done
-CROSSBINUTILS=	${CROSSDIR}/usr/bin/.binutils_done
-CROSSGCC=	${CROSSDIR}/usr/bin/.gcc_done
-NO_CROSS=	isakmpd tn3270 less sudo openssl libkeynote libssl \
-		photurisd keynote sectok ssh
+CROSSOBJ=	${CROSSDIR}/.obj_done
+CROSSINCLUDES=	${CROSSDIR}/.includes_done
+CROSSBINUTILS=	${CROSSDIR}/.binutils_done
+CROSSGCC=	${CROSSDIR}/.gcc_done
+#NO_CROSS=	isakmpd keynote ssh
 
+.include <bsd.own.mk>
+
+.for _arch in ${TARGET_ARCH}
+.if !empty(CLANG_ARCH:M${_arch})
+COMPILER_VERSION=clang
+BUILD_CLANG=yes
+CC=clang
+CXX=clang++
+.elif !empty(GCC3_ARCH:M${_arch})
+COMPILER_VERSION=gcc3
+CC=gcc
+CXX=g++
+.else
+COMPILER_VERSION=gcc4
+CC=gcc
+CXX=g++
+.endif
+
+.if !empty(PIE_ARCH:M${_arch})
+NOPIE_FLAGS=-fno-pie
+NOPIE_LDFLAGS=-nopie
+PIE_DEFAULT=${DEFAULT_PIE_DEF}
+.else
+NOPIE_FLAGS=
+PIE_DEFAULT=
+.endif
+
+BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
+		strings strip
+BINUTILS_DIR=gnu/usr.bin/binutils-2.17
+.endfor
+
 # no libcrypto.... these won't build
-NO_CROSS+=	telnetd login_krb5 login_krb5-or-pwd dc passwd telnet ppp \
-		tcpdump
-# need host setup for ydr
-NO_CROSS+=afs
+#NO_CROSS+=	dc passwd ppp tcpdump telnet ftp sasyncd vnconfig
+		
 # explicit cross-compile
+NO_CROSS+=microcode
+NO_CROSS+=groff binutils binutils-2.17 perl texinfo gcc cvs
+NO_CROSS+=nsd
 NO_CROSS+=bind
+NO_CROSS+=unbound
 
 cross-dirs:	${CROSSDIRS}
 cross-obj:	${CROSSOBJ}
@@ -52,27 +127,25 @@
 
 cross-env:
 	@echo ${CROSSENV} MACHINE=${TARGET} \
-	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`
+	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
+	    MACHINE_CPU=`cat ${CROSSDIR}/TARGET_CPU` \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET}
 
 ${CROSSDIRS}:
+.if ${TARGET_ARCH} == "arm" &&  ${MACHINE_IS_LP64} == "yes"
+	# this config is allowed
+.elif ${TARGET_IS_LP64} != ${MACHINE_IS_LP64}
+	@echo "host and target have different size longs"
+	@echo "cross compiler generates bad code; aborting"; exit 1
+.endif
 	@-mkdir -p ${CROSSDIR}
-	@case ${TARGET} in \
-		alpha|amd64|hppa|hppa64|i386|m68k|m88k|powerpc|sparc|sparc64|vax) \
-			echo ${TARGET} ;;\
-		amiga|hp300|mac68k|mvme68k) \
-			echo m68k ;;\
-		luna88k|mvme88k) \
-			echo m88k ;;\
-		macppc|mvmeppc) \
-			echo powerpc ;;\
-		sgi) \
-			echo mips64 ;;\
-		*) \
-			(echo Unknown arch ${TARGET} >&2) ; exit 1;; \
-	esac > ${CROSSDIR}/TARGET_ARCH
+	@echo ${TARGET_ARCH} > ${CROSSDIR}/TARGET_ARCH
 	@echo TARGET_ARCH is `cat ${CROSSDIR}/TARGET_ARCH`
+	@echo ${TARGET_CPU} > ${CROSSDIR}/TARGET_CPU
+	@echo TARGET_CPU is `cat ${CROSSDIR}/TARGET_CPU`
 	@eval `grep '^osr=' sys/conf/newvers.sh`; \
-	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
+	   echo ${TARGET_ARCH}-unknown-openbsd$$osr > \
 	   ${CROSSDIR}/TARGET_CANON
 	@-mkdir -p ${CROSSDIR}
 	@-mkdir -p ${CROSSDIR}/usr/${TARGET_CANON}
@@ -86,10 +159,13 @@
 
 ${CROSSOBJ}:	${CROSSDIRS}
 	@-mkdir -p ${CROSSDIR}/usr/obj
+	@-chgrp ${WOBJGROUP} ${CROSSDIR}/usr/obj
+	@-chmod g+w ${CROSSDIR}/usr/obj
 	@(cd ${.CURDIR} && \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    COMPILER_VERSION=${COMPILER_VERSION} \
 	    MACHINE=${TARGET} \
-	    MACHINE_ARCH=${TARGET_ARCH} \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} obj)
 	@touch ${CROSSOBJ}
@@ -97,174 +173,252 @@
 ${CROSSINCLUDES}:	${CROSSOBJ}
 	@-mkdir -p ${CROSSDIR}/usr/include
 	@(cd ${.CURDIR}/include && \
-	    MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
+	    COMPILER_VERSION=${COMPILER_VERSION} \
+	    MACHINE=${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    TARGET_ARCH=${TARGET_ARCH} \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    ${MAKE} prereq && \
-	    MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
+	    COMPILER_VERSION=${COMPILER_VERSION} \
+	    MACHINE=${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    TARGET_ARCH=${TARGET_ARCH} \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    ${MAKE} DESTDIR=${CROSSDIR} includes)
 	@touch ${CROSSINCLUDES}
 
-.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m88k" || \
-    ${MACHINE_ARCH} == "vax"
-BINUTILS=	ar as ld nm ranlib objcopy objdump strings strip
-NEW_BINUTILS?=	No
-.else
-BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
-		strings strip
-NEW_BINUTILS?=	Yes
-.endif
-
 ${CROSSBINUTILS}:	${CROSSINCLUDES}
-.if ${NEW_BINUTILS:L} == "yes"
-	(cd ${.CURDIR}/gnu/usr.bin/binutils; \
+	(cd ${.CURDIR}/${BINUTILS_DIR}; \
+	    env CROSSDIR=${CROSSDIR} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    TARGET_ARCH=${TARGET_ARCH} \
+	    PIE_DEFAULT=${PIE_DEFAULT} \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
+	    PATH=${CROSSPATH} \
 	    ${MAKE} -f Makefile.bsd-wrapper depend && \
+	    env CROSSDIR=${CROSSDIR} \
+	    CC=${CC} CXX=${CXX} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    TARGET_ARCH=${TARGET_ARCH} \
+	    PIE_DEFAULT=${PIE_DEFAULT} \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    ${MAKE} -f Makefile.bsd-wrapper all && \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} -f Makefile.bsd-wrapper install)
-.else
-	(cd ${.CURDIR}/gnu/usr.bin/gas; \
-	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} depend all; \
-	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN= install)
-	ln -sf ${CROSSDIR}/usr/bin/as \
-	    ${CROSSDIR}/usr/${TARGET_ARCH}/bin/as
-	(cd ${.CURDIR}/gnu/usr.bin/ld; \
-	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
+	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
+	    COMPILER_VERSION=${COMPILER_VERSION} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOPIC= NOMAN= depend all; \
-	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOPIC= NOMAN= install)
-	ln -sf ${CROSSDIR}/usr/bin/ld \
-	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld
-	(cd ${.CURDIR}/usr.bin/ar; \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN= install)
-	ln -sf ${CROSSDIR}/usr/bin/ar \
-	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ar
-	(cd ${.CURDIR}/usr.bin/ranlib; \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN= install)
-	ln -sf ${CROSSDIR}/usr/bin/ranlib \
-	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ranlib
-	(cd ${.CURDIR}/usr.bin/strip; \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET_ARCH} \
-	    NOMAN= depend all; \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET_ARCH} \
-	    NOMAN= install)
-	ln -sf ${CROSSDIR}/usr/bin/strip \
-	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/strip
-.endif
+	    PIE_DEFAULT=${PIE_DEFAULT} \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
+	    ${MAKE} -f Makefile.bsd-wrapper install)
 	@for cmd in ${BINUTILS}; do \
-	 if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a \
-	 -e ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ]; then \
-	    ln -sf ${TARGET_CANON}-$$cmd ${CROSSDIR}/usr/bin/$$cmd ;\
-	 elif [ -e ${CROSSDIR}/usr/bin/$$cmd -a \
-	 ! -e ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ]; then \
-	    ln -sf $$cmd ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd; \
+	 if [ -e ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ] ; then \
+	    cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd \
+	        ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-$$cmd ; \
+	    ln -sf ${TARGET_CANON}-$$cmd \
+		${CROSSDIR}/usr/${TARGET_CANON}/bin/$$cmd ;\
+	   if [ -e ${CROSSDIR}/usr/bin/$$cmd ] ; then \
+	    rm -f ${CROSSDIR}/usr/bin/$$cmd ;\
+	   fi ;\
+	 elif [ -e ${CROSSDIR}/usr/bin/$$cmd ] ; then \
+	    cp -f ${CROSSDIR}/usr/bin/$$cmd \
+	        ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-$$cmd ; \
+	    ln -sf ${TARGET_CANON}-$$cmd \
+		${CROSSDIR}/usr/${TARGET_CANON}/bin/$$cmd ;\
+	    mv ${CROSSDIR}/usr/bin/$$cmd \
+		${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ;\
 	 fi ;\
-	 if [ -e ${CROSSDIR}/usr/bin/$$cmd -a \
-	 ! -e ${CROSSDIR}/usr/${TARGET_CANON}/bin/$$cmd ]; then \
-	    ln -sf ${CROSSDIR}/usr/bin/$$cmd \
-	        ${CROSSDIR}/usr/${TARGET_CANON}/bin/$$cmd; \
-	 fi ;\
 	done
 	@touch ${CROSSBINUTILS}
 
-# bsd.own.mk can't do it for us
-.if ${TARGET} == "amd64" || ${TARGET} == "cats" || \
-    ${TARGET} == "hppa" || ${TARGET} == "hppa64" || \
-    ${TARGET} == "i386" || \
-    ${TARGET} == "sparc64" || ${TARGET} == "sgi"
-TARGET_USE_GCC3=Yes
-.else
-TARGET_USE_GCC3=No
-.endif
 
 ${CROSSGCC}:		${CROSSBINUTILS}
-.if ${TARGET_USE_GCC3:L} == "yes"
+.if ${COMPILER_VERSION:L} == "clang"
+	(cd ${.CURDIR}/gnu/usr.bin/clang; \
+	    CC=${CC} CXX=${CXX} \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} \
+	    ${MAKE} all)
+	(cd ${.CURDIR}/gnu/usr.bin/clang; \
+	    DESTDIR=${CROSSDIR} \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} \
+	    ${MAKE} install)
+	(cd ${.CURDIR}/gnu/usr.bin/clang; \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} \
+	    ${MAKE} clean)
+	mv ${CROSSDIR}/usr/bin/clang ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang
+	mv ${CROSSDIR}/usr/bin/clang++ ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang++
+	cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang
+	ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
+	ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
+	@if [ -e ${CROSSDIR}/usr/bin/ld ]; then \
+		mv ${CROSSDIR}/usr/bin/ld ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld ;\
+		cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld \
+		    ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-ld ;\
+		ln -sf ${TARGET_CANON}-ld ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld ;\
+	fi
+	echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc; \
+	chmod +x ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc;
+	echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --driver-mode=g++ --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++; \
+	chmod +x ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++;
+.elif ${COMPILER_VERSION:L} == "gcc3"
 	(cd ${.CURDIR}/gnu/usr.bin/gcc; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    TARGET_ARCH=${TARGET_ARCH} CROSSDIR=${CROSSDIR} \
-	    ${MAKE} -f Makefile.bsd-wrapper depend && \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
+	    CROSSDIR=${CROSSDIR} \
+	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper depend && \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    TARGET_ARCH=${TARGET_ARCH} CROSSDIR=${CROSSDIR} \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
+	    CROSSDIR=${CROSSDIR} \
+	    CC=${CC} CXX=${CXX} \
 	    ${MAKE} -f Makefile.bsd-wrapper all && \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} -f Makefile.bsd-wrapper install)
-	ln -sf ${TARGET_CANON}-g++ ${CROSSDIR}/usr/bin/c++
-	ln -sf ${CROSSDIR}/usr/libexec/cpp \
-	    ${CROSSDIR}/usr/bin/cpp
+	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install)
+	cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++
+	cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
+	cp -f ${CROSSDIR}/usr/libexec/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
+	rm -f ${CROSSDIR}/usr/bin/gcc  ${CROSSDIR}/usr/bin/cc ${CROSSDIR}/usr/libexec/cpp 
+	ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
+	ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
+	rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
+	sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \
+	    -e 's/@GNUC@/-D__GNUC__/' \
+	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
+	    -e 's/@dollaropt@//' \
+	    ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
+	chmod ${BINMODE} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
+	chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
+	ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
 .else
-	(cd ${CROSSDIR}/usr/obj/gnu/egcs/gcc; \
-	    /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \
-	    --with-gnu-as --with-gnu-ld --prefix ${CROSSDIR}/usr \
-	    --target ${TARGET_CANON} \
-	    --enable-languages="c,c++" --enable-cpp --disable-nls \
-	    --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \
-	    PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" \
-	    CFLAGS="${CFLAGS} -I${.CURDIR}/gnu/lib/libiberty/include" \
-	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
-	    DEMANGLER_PROG= DEMANGLE_H= LDFLAGS="${LDSTATIC}" build_infodir=. \
-	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
-	    ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" LDFLAGS="${LDSTATIC}" \
-	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \
-	    CFLAGS="${CFLAGS} -I${.CURDIR}/gnu/lib/libiberty/include" \
-	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
-	    build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)
-	ln -sf ${TARGET_CANON}-gcc ${CROSSDIR}/usr/bin/cc
-	ln -sf ${TARGET_CANON}-g++ ${CROSSDIR}/usr/bin/c++
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${CROSSDIR}/usr/obj/gnu/egcs/gcc/cpp \
-	    ${CROSSDIR}/usr/libexec/cpp
-	sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \
+	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+	    env CROSSDIR=${CROSSDIR} \
+	    PIE_DEFAULT=${PIE_DEFAULT} \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
+	    MACHINE=${TARGET} \
+	    PATH=${CROSSPATH} ${MAKE} depend  )
+	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+	    env CROSSDIR=${CROSSDIR} \
+	    COMPILER_VERSION=${COMPILER_VERSION} \
+	    CC=${CC} CXX=${CXX} \
+	    PIE_DEFAULT=${PIE_DEFAULT} \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
+	    MACHINE=${TARGET} \
+	    ${MAKE} all )
+	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
+	    COMPILER_VERSION=${COMPILER_VERSION} \
+	    PIE_DEFAULT=${PIE_DEFAULT} \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
+	    MACHINE=${TARGET} \
+	    PATH=${CROSSPATH} ${MAKE} install)
+	cp -f ${CROSSDIR}/usr/bin/g++  ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ 
+	cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++
+	cp -f ${CROSSDIR}/usr/libexec/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
+	cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
+	ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
+
+	cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc
+	rm -f ${CROSSDIR}/usr/bin/gcc  ${CROSSDIR}/usr/bin/g++  ${CROSSDIR}/usr/bin/cc ${CROSSDIR}/usr/libexec/cpp 
+	# fix links
+	rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
+	sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \
+	    -e 's/@GNUC@//' \
 	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
-	    ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp
-	chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
-	chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/bin/cpp
+	    -e 's/@dollaropt@//' \
+	    ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
+	chmod ${BINMODE} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
+	chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp 
+	ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
 .endif
 	@touch ${CROSSGCC}
 
 # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
 cross-lib:	${CROSSGCC}
-	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \
-	export MACHINE MACHINE_ARCH; \
+	MACHINE=${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj; \
+	export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \
 	(cd ${.CURDIR}/lib; \
-	    for lib in csu libc; do \
+	    for lib in csu libcompiler_rt libc; do \
 	    (cd $$lib; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-		    ${MAKE} depend all install); \
+		    ${MAKE} depend all ;\
+	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
+		    ${MAKE} install); \
 	    done; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	        SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \
-	        ${MAKE} depend all install)
+	        SKIPDIR=\"${NO_CROSS}\" \
+	        ${MAKE} depend all ; \
+	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
+	        SKIPDIR=\"${NO_CROSS}\" \
+	        ${MAKE} install)
 
 cross-bin:	${CROSSOBJ}
-	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \
-	export MACHINE MACHINE_ARCH; \
+	MACHINE=${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU}; \
+	export MACHINE MACHINE_ARCH MACHINE_CPU; \
 	for i in libexec bin sbin usr.bin usr.sbin; do \
 	(cd ${.CURDIR}/$$i; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	        SKIPDIR=\"${BINUTILS} ${NO_CROSS}\" \
-	        ${MAKE} depend all install); \
+	        ${MAKE} depend all ; \
+	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
+	        SKIPDIR=\"${BINUTILS} ${NO_CROSS}\" \
+	        ${MAKE} install); \
 	done
 
+cross-gnu:	${CROSSOBJ}
+	MACHINE=${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU}; \
+	export MACHINE MACHINE_ARCH MACHINE_CPU; \
+	for i in gnu/lib gnu/usr.sbin gnu/usr.bin ; do \
+	(cd ${.CURDIR}/$$i; \
+	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	        SKIPDIR=\"${NO_CROSS}\" \
+	        ${MAKE} depend all ; \
+	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
+	        SKIPDIR=\"${NO_CROSS}\" \
+	        ${MAKE} install); \
+	done
+
+cross-share:   ${CROSSOBJ}
+	MACHINE=${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU}; \
+	export MACHINE MACHINE_ARCH MACHINE_CPU; \
+	for i in share; do \
+	    (cd ${.CURDIR}/$$i; \
+	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		SKIPDIR=\"${NO_CROSS}\" \
+		DESTDIR=${CROSSDIR} \
+		${MAKE} depend all install); \
+	done
+
+cross-sys:   ${CROSSOBJ}
+	MACHINE=${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU}; \
+	export MACHINE MACHINE_ARCH MACHINE_CPU; \
+	for i in sys; do \
+	    (cd ${.CURDIR}/$$i; \
+	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		SKIPDIR=\"${NO_CROSS}\" \
+		${MAKE} depend all); \
+	    (cd ${.CURDIR}/$$i; \
+	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		SKIPDIR=\"${NO_CROSS}\" \
+		DESTDIR=${CROSSDIR} \
+		${MAKE} install); \
+	done
+
 cross-etc-root-var:	${CROSSOBJ}
 	(cd ${.CURDIR}/etc && \
-	    DESTDIR=${CROSSDIR} ${MAKE} distribution-etc-root-var)
+	    MACHINE=${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
+	    DESTDIR=${CROSSDIR} \
+	    ${MAKE} distribution-etc-root-var)
 
 cross-depend:
 	@(cd ${.CURDIR} && \
@@ -286,4 +440,3 @@
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    SKIPDIR="${NO_CROSS}" \
 	    ${MAKE} cleandir)
-