[src/trunk]: src/sys/arch/sparc64/conf Separate COPTS from CFLAGS to fix prob...

[eeh <eeh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/369b5c43d82c
branches:  trunk
changeset: 487593:369b5c43d82c
user:      eeh <eeh%NetBSD.org@localhost>
date:      Fri Jun 09 15:28:21 2000 +0000

description:
Separate COPTS from CFLAGS to fix problems w/unoptimized files, and add
lfs_loop.c to the list that breaks optimization.

diffstat:

 sys/arch/sparc64/conf/Makefile.sparc64 |  16 ++++++++--------
 sys/arch/sparc64/conf/files.sparc64    |   3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (80 lines):

diff -r e53e5c3015c6 -r 369b5c43d82c sys/arch/sparc64/conf/Makefile.sparc64
--- a/sys/arch/sparc64/conf/Makefile.sparc64    Fri Jun 09 15:27:35 2000 +0000
+++ b/sys/arch/sparc64/conf/Makefile.sparc64    Fri Jun 09 15:28:21 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc64,v 1.24 2000/06/08 21:25:18 eeh Exp $
+#      $NetBSD: Makefile.sparc64,v 1.25 2000/06/09 15:28:21 eeh Exp $
 
 # Makefile for NetBSD
 #
@@ -67,7 +67,7 @@
 CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL ${SVR4}
 CWARNFLAGS=    -Wimplicit -Wunused -Wswitch -Wcomment -Wtrigraphs -Wchar-subscripts -Wparentheses -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
 #CWARNFLAGS=   -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS=                ${DEBUG} ${COPTS} ${CWARNFLAGS} -O2 -Wa,-Av9a -mno-fpu
+CFLAGS=                ${DEBUG} ${CWARNFLAGS} -Wa,-Av9a -mno-fpu
 AFLAGS=                -x assembler-with-cpp -Wa,-Av9a -traditional-cpp -D_LOCORE
 LINKFLAGS=     -N -p -Ttext f1000000 -e start >lderr
 STRIPFLAGS=    -g
@@ -94,8 +94,8 @@
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # HOSTED, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
-NORMAL_C=      ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NOOPT_C=       ${CC} ${CPPFLAGS} ${PROF} -c $<
+NORMAL_C=      ${CC} ${COPTS} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+NOOPT_C=       ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
 NORMAL_S=      ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 
 %OBJS
@@ -132,13 +132,13 @@
 
 .if ${USE_GENASSYM} == "no"
 assym.h: $S/kern/genassym.sh ${SPARC64}/sparc64/genassym.cf
-       sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+       sh $S/kern/genassym.sh ${CC} ${COPTS} ${CFLAGS} ${CPPFLAGS} ${PROF} \
            < ${SPARC64}/sparc64/genassym.cf > assym.h.tmp && \
        mv -f assym.h.tmp assym.h
 .else
 HOSTED_CC=     ${CC}
 HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
-HOSTED_CFLAGS= ${CFLAGS}
+HOSTED_CFLAGS= ${COPTS} ${CFLAGS}
 
 HOSTED_C=      ${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
 
@@ -164,7 +164,7 @@
 
 newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
        sh $S/conf/newvers.sh
-       ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
+       ${CC} ${COPTS} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
 
 __CLEANKERNEL: .USE
@@ -205,7 +205,7 @@
 .if (${SFILES} != "")
        ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
 .endif
-       sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
+       sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${COPTS} ${CFLAGS} \
          ${CPPFLAGS} < ${SPARC64}/sparc64/genassym.cf
        @sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
        @rm -f assym.dep
diff -r e53e5c3015c6 -r 369b5c43d82c sys/arch/sparc64/conf/files.sparc64
--- a/sys/arch/sparc64/conf/files.sparc64       Fri Jun 09 15:27:35 2000 +0000
+++ b/sys/arch/sparc64/conf/files.sparc64       Fri Jun 09 15:28:21 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.sparc64,v 1.30 2000/06/08 21:25:18 eeh Exp $
+#      $NetBSD: files.sparc64,v 1.31 2000/06/09 15:28:23 eeh Exp $
 
 # @(#)files.sparc64    8.1 (Berkeley) 7/19/93
 # sparc64-specific configuration info
@@ -17,6 +17,7 @@
 file net/if_ppp.c      ppp     needs-count     compile-with "${NOOPT_C}"
 file net/if_loop.c     loop    needs-count     compile-with "${NOOPT_C}"
 file net/if_sl.c       sl      needs-count     compile-with "${NOOPT_C}"
+file ufs/lfs/lfs_debug.c                lfs    compile-with "${NOOPT_C}"
 
 #
 # XXXXXXXXXXX