From owner-p4-projects Fri May 10 9:58:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0935537B40A; Fri, 10 May 2002 09:57:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D4AE37B409 for ; Fri, 10 May 2002 09:57:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AGvu851969 for perforce@freebsd.org; Fri, 10 May 2002 09:57:56 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 09:57:56 -0700 (PDT) Message-Id: <200205101657.g4AGvu851969@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11127 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11127 Change 11127 by peter@peter_ia64 on 2002/05/10 09:56:57 This is a bit brutal, but the current Makefile doesn't actually assemble the lib1asmfucs stuff. Most of this is moving around so that the .if defined(FOO) stuff could see the definitions. Unfortunately, bmake is very order sensitive for macros. _exit and __main are still empty, as are some of the fix* entries. Affected files ... ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#5 edit Differences ... ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#5 (text+ko) ==== @@ -43,35 +43,8 @@ CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \ -I${GCCDIR}/config -I${GCCDIR} -I. LDFLAGS= -nostdlib - -# Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are -# defined as optimized assembly code in LIB1ASMFUNCS. -.if defined(LIB1ASMFUNCS) -.for sym in ${LIB1ASMFUNCS} -LIB2FUNCS_1= ${LIB2FUNCS_1:S/${sym}//g} -LIB2FUNCS_2= ${LIB2FUNCS_2:S/${sym}//g} -LIB2_DIVMOD_FUNCS= ${LIB2_DIVMOD_FUNCS:S/${sym}//g} -.endfor -.endif - -SYMS= ${LIB1ASMFUNCS} \ - ${LIB2FUNCS_1} \ - ${LIB2FUNCS_2} \ - ${LIB2_DIVMOD_FUNCS} -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" -SYMS+= ${FPBIT_FUNCS} ${DPBIT_FUNCS} -.endif -SYMS_ST= ${LIB2FUNCS_ST} \ - ${LIB2ADD_ST} -OBJS_T= ${SYMS:S/$/.o/} ${SYMS_ST:S/$/.o/} -OBJS_P= ${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/} -OBJS_S= ${SYMS:S/$/.So/} -OBJS= ${SYMS:S/$/.o/} -STATICOBJS= ${SYMS_ST:S/$/.o/} -SRCS= ${LIB2ADD} ${LIB2ADDEH} +OBJS= - - #--------------------------------------------------------------------------- # # When upgrading GCC, get the following defintions straight from Makefile.in @@ -161,6 +134,39 @@ OBJS+= dp-bit.o fp-bit.o .endif +# Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are +# defined as optimized assembly code in LIB1ASMFUNCS. +.if defined(LIB1ASMFUNCS) +.for sym in ${LIB1ASMFUNCS} +LIB2FUNCS_1:= ${LIB2FUNCS_1:S/${sym}//g} +LIB2FUNCS_2:= ${LIB2FUNCS_2:S/${sym}//g} +LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g} +.endfor +.endif + +#----------------------------------------------------------------------- + +SYMS= ${LIB2FUNCS_1} \ + ${LIB2FUNCS_2} \ + ${LIB2_DIVMOD_FUNCS} +.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" +SYMS+= ${FPBIT_FUNCS} ${DPBIT_FUNCS} +.endif +SYMS_ST= ${LIB2FUNCS_ST} \ + ${LIB2ADD_ST} +OBJS_T= ${SYMS:S/$/.o/} ${SYMS_ST:S/$/.o/} +OBJS_P= ${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/} +OBJS_S= ${SYMS:S/$/.So/} +ASM_T= ${LIB1ASMFUNCS:S/$/.o/} +ASM_P= ${LIB1ASMFUNCS:S/$/.po/} +ASM_S= ${LIB1ASMFUNCS:S/$/.So/} +OBJS+= ${SYMS:S/$/.o/} ${LIB1ASMFUNCS:S/$/.o/} +STATICOBJS= ${SYMS_ST:S/$/.o/} +SRCS= ${LIB2ADD} ${LIB2ADDEH} + + +#----------------------------------------------------------------------- + dp-bit.o: config/fp-bit.c ${XCC} -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*} @@ -209,4 +215,25 @@ @mv ${.TARGET}.tmp ${.TARGET} .endif +.if defined(LIB1ASMSRC) +${ASM_T}: ${LIB1ASMSRC} + ${XCC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${GCCDIR}/config/${LIB1ASMSRC} + @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} + +.if !defined(NOPIC) +${ASM_S}: ${LIB1ASMSRC} + ${XCC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${GCCDIR}/config/${LIB1ASMSRC} + @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} +.endif + +.if !defined(NOPROFILE) +${ASM_P}: ${LIB1ASMSRC} + ${XCC} -x assembler-with-cpp -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${GCCDIR}/config/${TARGET_ARCH}/${LIB1ASMSRC} + @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} +.endif +.endif + .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message