From owner-p4-projects  Thu May 16 21:12:10 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF14837B409; Thu, 16 May 2002 21:12:03 -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 3817E37B401
	for <perforce@freebsd.org>; Thu, 16 May 2002 21:12:03 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4H4C3g23183
	for perforce@freebsd.org; Thu, 16 May 2002 21:12:03 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Thu, 16 May 2002 21:12:03 -0700 (PDT)
Message-Id: <200205170412.g4H4C3g23183@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 11424 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11424

Change 11424 by peter@peter_daintree on 2002/05/16 21:11:37

	revert mismerged chunk

Affected files ...

... //depot/projects/ia64/gnu/lib/libgcc/Makefile#7 edit

Differences ...

==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#7 (text+ko) ====

@@ -134,37 +134,6 @@
 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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message