From 06f7731a1eed31f9be70b6d1c71491c28733f4ac Mon Sep 17 00:00:00 2001
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Wed, 4 Aug 2004 03:13:51 +0000
Subject: [PATCH] Add missing patch which was forgotten during GCC 3.4.2
 import. libgcc.a gets most of it content back now, when symbols from
 LIB2FUNCS are actually compiled.

Noticed by: Steve Kargl <gk at troutmask dot apl dot washington dot edu>
Pointy hat to: kan
---
 gnu/lib/libgcc/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index f272e6580e7..48eee7a655c 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -157,8 +157,7 @@ fp-bit.po: config/fp-bit.c
 # 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}
+LIB2FUNCS:=	${LIB2FUNCS:S/${sym}//g}
 LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g}
 .endfor
 .endif
@@ -167,8 +166,7 @@ ASM_T=		${LIB1ASMFUNCS:S/$/.o/}
 ASM_P=		${LIB1ASMFUNCS:S/$/.po/}
 ASM_S=		${LIB1ASMFUNCS:S/$/.So/}
 
-SYMS=		${LIB2FUNCS_1}		\
-		${LIB2FUNCS_2}		\
+SYMS=		${LIB2FUNCS}		\
 		${LIB2_DIVMOD_FUNCS}
 .if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
 SYMS+=		${FPBIT_FUNCS} ${DPBIT_FUNCS}