===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** src/Makefile.cross	2009/09/21 19:44:23	1.28
--- src/Makefile.cross	2010/02/05 22:36:27	1.29
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.28 2009/09/21 19:44:23 matthieu Exp $
  
  cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
  cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
--- 1,4 ----
! # $OpenBSD: Makefile.cross,v 1.29 2010/02/05 22:36:27 miod Exp $
  
  cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
  cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
***************
*** 18,23 ****
--- 18,26 ----
  TARGET_ARCH=	m88k
  .elif	(${TARGET} == "sgi")
  TARGET_ARCH=	mips64
+ .elif	(${TARGET} == "loongson")
+ TARGET_ARCH=	mips64el
+ TARGET_CPU=	mips64
  .elif	(${TARGET} == "solbourne")
  TARGET_ARCH=	sparc
  .elif	(${TARGET} == "macppc" || ${TARGET} == "mvmeppc" || \
***************
*** 28,33 ****
--- 31,37 ----
  .else
  TARGET_ARCH=	${TARGET}
  .endif
+ TARGET_CPU?=	${TARGET_ARCH}
  
  #CROSSCPPFLAGS?=	-nostdinc -I${CROSSDIR}/usr/include
  #CROSSLDFLAGS?=	-nostdlib -L${CROSSDIR}/usr/lib -static
***************
*** 90,95 ****
--- 94,100 ----
  cross-env:
  	@echo ${CROSSENV} MACHINE=${TARGET} \
  	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
+ 	    MACHINE_CPU=`cat ${CROSSDIR}/TARGET_CPU` \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET}
  
***************
*** 97,104 ****
  	@-mkdir -p ${CROSSDIR}
  	@echo ${TARGET_ARCH} > ${CROSSDIR}/TARGET_ARCH
  	@echo TARGET_ARCH is `cat ${CROSSDIR}/TARGET_ARCH`
  	@eval `grep '^osr=' sys/conf/newvers.sh`; \
! 	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
  	   ${CROSSDIR}/TARGET_CANON
  	@-mkdir -p ${CROSSDIR}
  	@-mkdir -p ${CROSSDIR}/usr/${TARGET_CANON}
--- 102,111 ----
  	@-mkdir -p ${CROSSDIR}
  	@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`; \
! 	   echo ${TARGET_ARCH}-unknown-openbsd$$osr > \
  	   ${CROSSDIR}/TARGET_CANON
  	@-mkdir -p ${CROSSDIR}
  	@-mkdir -p ${CROSSDIR}/usr/${TARGET_CANON}
***************
*** 115,121 ****
  	@(cd ${.CURDIR} && \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    MACHINE=${TARGET} \
! 	    MACHINE_ARCH=${TARGET_ARCH} \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj)
  	@touch ${CROSSOBJ}
--- 122,128 ----
  	@(cd ${.CURDIR} && \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    MACHINE=${TARGET} \
! 	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj)
  	@touch ${CROSSOBJ}
***************
*** 123,135 ****
  ${CROSSINCLUDES}:	${CROSSOBJ}
  	@-mkdir -p ${CROSSDIR}/usr/include
  	@(cd ${.CURDIR}/include && \
! 	    MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    TARGET_ARCH=${TARGET_ARCH} \
  	    ${MAKE} prereq && \
! 	    MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    TARGET_ARCH=${TARGET_ARCH} \
  	    ${MAKE} DESTDIR=${CROSSDIR} includes)
  	@touch ${CROSSINCLUDES}
  
--- 130,144 ----
  ${CROSSINCLUDES}:	${CROSSOBJ}
  	@-mkdir -p ${CROSSDIR}/usr/include
  	@(cd ${.CURDIR}/include && \
! 	    MACHINE=${TARGET} \
! 	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} prereq && \
! 	    MACHINE=${TARGET} \
! 	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} DESTDIR=${CROSSDIR} includes)
  	@touch ${CROSSINCLUDES}
  
***************
*** 147,160 ****
  	(cd ${.CURDIR}/gnu/usr.bin/binutils; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
! 	    TARGET_ARCH=${TARGET_ARCH} PATH=${CROSSPATH} \
  	    ${MAKE} -f Makefile.bsd-wrapper depend && \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
! 	    TARGET_ARCH=${TARGET_ARCH} \
  	    ${MAKE} -f Makefile.bsd-wrapper all && \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
  	    ${MAKE} -f Makefile.bsd-wrapper install)
  .if ${NEW_BINUTILS:L} != "yes"
  	(cd ${.CURDIR}/gnu/usr.bin/gas; \
--- 156,173 ----
  	(cd ${.CURDIR}/gnu/usr.bin/binutils; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
! 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
! 	    PATH=${CROSSPATH} \
  	    ${MAKE} -f Makefile.bsd-wrapper depend && \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
! 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper all && \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
+ 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+ 	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
+ 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper install)
  .if ${NEW_BINUTILS:L} != "yes"
  	(cd ${.CURDIR}/gnu/usr.bin/gas; \
***************
*** 232,241 ****
  .if ${TARGET_USE_GCC3:L} == "yes"
  	(cd ${.CURDIR}/gnu/usr.bin/gcc; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    TARGET_ARCH=${TARGET_ARCH} CROSSDIR=${CROSSDIR} \
  	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper depend && \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    TARGET_ARCH=${TARGET_ARCH} CROSSDIR=${CROSSDIR} \
  	    ${MAKE} -f Makefile.bsd-wrapper all && \
  	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install)
--- 245,256 ----
  .if ${TARGET_USE_GCC3:L} == "yes"
  	(cd ${.CURDIR}/gnu/usr.bin/gcc; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    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} TARGET_CPU=${TARGET_CPU} \
! 	    CROSSDIR=${CROSSDIR} \
  	    ${MAKE} -f Makefile.bsd-wrapper all && \
  	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install)
***************
*** 290,297 ****
  
  # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
  cross-lib:	${CROSSGCC}
! 	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \
! 	export MACHINE MACHINE_ARCH; \
  	(cd ${.CURDIR}/lib; \
  	    for lib in csu libc; do \
  	    (cd $$lib; \
--- 305,313 ----
  
  # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
  cross-lib:	${CROSSGCC}
! 	MACHINE=${TARGET} \
! 	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU}; \
! 	export MACHINE MACHINE_ARCH MACHINE_CPU; \
  	(cd ${.CURDIR}/lib; \
  	    for lib in csu libc; do \
  	    (cd $$lib; \
***************
*** 308,315 ****
  	        ${MAKE} WANTLINT=no install)
  
  cross-bin:	${CROSSOBJ}
! 	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \
! 	export MACHINE MACHINE_ARCH; \
  	for i in libexec bin sbin usr.bin usr.sbin; do \
  	(cd ${.CURDIR}/$$i; \
  	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
--- 324,332 ----
  	        ${MAKE} WANTLINT=no install)
  
  cross-bin:	${CROSSOBJ}
! 	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} \
***************
*** 321,328 ****
  	done
  
  cross-gnu:	${CROSSOBJ}
! 	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \
! 	export MACHINE MACHINE_ARCH; \
  	for i in gnu/lib gnu/usr.sbin gnu/usr.bin ; do \
  	(cd ${.CURDIR}/$$i; \
  	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
--- 338,346 ----
  	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} \
***************
*** 334,341 ****
  	done
  
  cross-share:   ${CROSSOBJ}
! 	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
! 	export MACHINE MACHINE_ARCH; \
  	for i in share; do \
  	    (cd ${.CURDIR}/$$i; \
  	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
--- 352,360 ----
  	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} \
***************
*** 344,351 ****
  	done
  
  cross-sys:   ${CROSSOBJ}
! 	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
! 	export MACHINE MACHINE_ARCH; \
  	for i in sys; do \
  	    (cd ${.CURDIR}/$$i; \
  	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
--- 363,371 ----
  	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} \
***************
*** 355,362 ****
  
  cross-etc-root-var:	${CROSSOBJ}
  	(cd ${.CURDIR}/etc && \
! 	    MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
! 	    DESTDIR=${CROSSDIR} ${MAKE} distribution-etc-root-var)
  
  cross-depend:
  	@(cd ${.CURDIR} && \
--- 375,384 ----
  
  cross-etc-root-var:	${CROSSOBJ}
  	(cd ${.CURDIR}/etc && \
! 	    MACHINE=${TARGET} \
! 	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
! 	    DESTDIR=${CROSSDIR} \
! 	    ${MAKE} distribution-etc-root-var)
  
  cross-depend:
  	@(cd ${.CURDIR} && \