summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-05-12 12:44:04 +0000
committerobrien <obrien@FreeBSD.org>2002-05-12 12:44:04 +0000
commit1d595b254a844c0f89c8290879d6f590c6d1c7ce (patch)
treece0a22a43bb36fd7cbab7b184cd693b4bc61f167
parent25fbcd7dedb2ed8db7bbcd1ba84b9d70082747af (diff)
downloadFreeBSD-src-1d595b254a844c0f89c8290879d6f590c6d1c7ce.zip
FreeBSD-src-1d595b254a844c0f89c8290879d6f590c6d1c7ce.tar.gz
I was not strict enough with my ordering of things to satisfy make(1) nieve
symbol evaluation which causes it to be very sensitive to macro ordering.
-rw-r--r--gnu/lib/libgcc/Makefile54
1 files changed, 26 insertions, 28 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 2c1d01d..a292d04 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -44,34 +44,6 @@ 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}
-
-
-
#---------------------------------------------------------------------------
#
# When upgrading GCC, get the following defintions straight from Makefile.in
@@ -181,6 +153,32 @@ fp-bit.po: config/fp-bit.c
#-----------------------------------------------------------------------
+# 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}
+
COMMONHDRS= tconfig.h
SRCS+= ${COMMONHDRS}
CLEANFILES+= ${COMMONHDRS}
OpenPOWER on IntegriCloud