From owner-p4-projects@FreeBSD.ORG Tue Mar 2 20:20:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1034E16A4D0; Tue, 2 Mar 2004 20:20:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8D2616A4CE for ; Tue, 2 Mar 2004 20:20:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B850C43D39 for ; Tue, 2 Mar 2004 20:20:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i234KGGe030005 for ; Tue, 2 Mar 2004 20:20:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i234KGcs030002 for perforce@freebsd.org; Tue, 2 Mar 2004 20:20:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Date: Tue, 2 Mar 2004 20:20:16 -0800 (PST) Message-Id: <200403030420.i234KGcs030002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 48029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Mar 2004 04:20:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=48029 Change 48029 by jmallett@jmallett_oingo on 2004/03/02 20:19:32 IFC, do evil things to the order for MIPS! Affected files ... .. //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#10 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.73 2004/01/15 10:07:59 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.75 2004/02/26 07:08:33 bde Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -7,16 +7,19 @@ # SRCS to get dependencies. # +# # ../Makefile.inc will put an absolute path to our objdir in CFLAGS. # Prevent mkdep from using it, so that we don't have to give rules for # aliases of generated headers. +# +CFLAGS+= -I. -CFLAGS+= -I. -static -DGENERATOR_FILE - .include "../Makefile.inc" .PATH: ${GCCDIR} +CFLAGS+= -DGENERATOR_FILE + #----------------------------------------------------------------------- # insn-* gunk @@ -160,6 +163,9 @@ # The list of headers to go into tconfig.h # TARGET_INC= ansidecl.h +.if ${TARGET_ARCH} == "mips" +TARGET_INC+= ${GCC_CPU}/freebsd.h +.endif TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h @@ -183,7 +189,9 @@ TARGET_INC+= ${GCC_CPU}/sysv4.h .endif .endif +.if ${TARGET_ARCH} != "mips" TARGET_INC+= ${GCC_CPU}/freebsd.h +.endif .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h TARGET_INC+= ${GCC_CPU}/freebsd64.h @@ -256,16 +264,16 @@ .for L in ${GTFILES_LANG_DIR_NAMES} c .if exists(${GCCDIR}/$L-config-lang.in) # Source the language config file -$L_GTFILES!= sh -c '. ${GCCDIR}/$L-config-lang.in; echo $$gtfiles' +L_GTFILES!= sh -c '. ${GCCDIR}/$L-config-lang.in; echo $$gtfiles' .else -$L_GTFILES!= sh -c '. ${GCCDIR}/$L/config-lang.in; echo $$gtfiles' +L_GTFILES!= sh -c '. ${GCCDIR}/$L/config-lang.in; echo $$gtfiles' .endif -GTFILES+= ${$L_GTFILES} -.for F in ${$L_GTFILES} +.for F in ${L_GTFILES} GTFILES_FILES+= $F GTFILES_LANGS+= $L .endfor .endfor +GTFILES+= ${GTFILES_FILES} #----------------------------------------------------------------------- # the host/target compiler config.