fix up libkern dependencies so we can get a profiling version

SCCS-vsn: sys/hp300/conf/Makefile.hp300 7.20

diff --git a/usr/src/sys/hp300/conf/Makefile.hp300 b/usr/src/sys/hp300/conf/Makefile.hp300
index 0a07820..916b83a 100644 (file)
--- a/usr/src/sys/hp300/conf/Makefile.hp300
+++ b/usr/src/sys/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-#      @(#)Makefile.hp300      7.19 (Berkeley) %G%
+#      @(#)Makefile.hp300      7.20 (Berkeley) %G%

 #
 # Makefile for 4.4 BSD
 #
 #
 # Makefile for 4.4 BSD
 #


@@ -32,7 +32,7 @@ S=    ../..
 HP300= $S/hp300
 
 INCLUDES= -I. -I$S -I$S/sys
 HP300= $S/hp300
 
 INCLUDES= -I. -I$S -I$S/sys

-COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Dmc68020 -Dhp300 -DFPCOPROC -DREFBIT
+COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Dmc68020 -Dhp300 -DFPCOPROC

 CFLAGS=        -O ${COPTS}
 
 # compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
 CFLAGS=        -O ${COPTS}
 
 # compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}


@@ -64,15 +64,15 @@ NORMAL_S_C= ${CPP} ${COPTS} ${PARAM} $< | ${AS} -o $@
 #      ${SYSTEM_LD} swapxxx.o
 #      ${SYSTEM_LD_TAIL}
 SYSTEM_OBJ=    locore.o ${OBJS} param.o ioconf.o vnode_if.o
 #      ${SYSTEM_LD} swapxxx.o
 #      ${SYSTEM_LD_TAIL}
 SYSTEM_OBJ=    locore.o ${OBJS} param.o ioconf.o vnode_if.o

-#SYSTEM_DEP=   Makefile symbols.sort ${SYSTEM_OBJ}
-SYSTEM_DEP=    Makefile ${SYSTEM_OBJ}
+#SYSTEM_DEP=   Makefile symbols.sort ${SYSTEM_OBJ} libkern.a
+SYSTEM_DEP=    Makefile ${SYSTEM_OBJ} libkern.a

 SYSTEM_LD_HEAD=        rm -f $@
 SYSTEM_LD=     -@if [ X${DEBUG} = X-g ]; \
                then strip=-X; \
                else strip=-x; \
                fi; \
 SYSTEM_LD_HEAD=        rm -f $@
 SYSTEM_LD=     -@if [ X${DEBUG} = X-g ]; \
                then strip=-X; \
                else strip=-x; \
                fi; \

-               echo ${LD} $$strip -n -o $@ -e start '$${SYSTEM_OBJ}' vers.o $S/libkern/obj/libkern.a; \
-               ${LD} $$strip -n -o $@ -e start ${SYSTEM_OBJ} vers.o $S/libkern/obj/libkern.a
+               echo ${LD} $$strip -n -o $@ -e start '$${SYSTEM_OBJ}' vers.o libkern.a; \
+               ${LD} $$strip -n -o $@ -e start ${SYSTEM_OBJ} vers.o libkern.a

 #SYSTEM_LD_TAIL= @echo rearranging symbols;\
 #              symorder symbols.sort $@;\
 SYSTEM_LD_TAIL=        @size $@; chmod 755 $@; \
 #SYSTEM_LD_TAIL= @echo rearranging symbols;\
 #              symorder symbols.sort $@;\
 SYSTEM_LD_TAIL=        @size $@; chmod 755 $@; \


@@ -82,6 +82,13 @@ SYSTEM_LD_TAIL=      @size $@; chmod 755 $@; \
 
 %LOAD
 
 
 %LOAD
 

+libkern.a:
+       -@if [ X${PROF} = X ]; \
+       then ln -s ../../libkern/obj/libkern.a libkern.a; \
+       else ln -s ../../libkern/obj/libkern_p.a libkern.a; \
+       fi; \
+       echo ln -s ../../libkern/obj/libkern.a libkern.a
+

 newvers:
        sh $S/conf/newvers.sh
        ${CC} $(CFLAGS) -c vers.c
 newvers:
        sh $S/conf/newvers.sh
        ${CC} $(CFLAGS) -c vers.c


@@ -111,7 +118,7 @@ autoconf.o: Makefile
 
 # the following are necessary because the files depend on the types of
 # hp cpu's included in the system configuration
 
 # the following are necessary because the files depend on the types of
 # hp cpu's included in the system configuration

-clock.o machdep.o autoconf.o conf.o: Makefile
+machdep.o sys_machdep.o pmap.o pmap_bootstrap.o trap.o dma.o: Makefile

 
 # depend on network or filesystem configuration
 af.o uipc_proto.o vfs_conf.o locore.o: Makefile
 
 # depend on network or filesystem configuration
 af.o uipc_proto.o vfs_conf.o locore.o: Makefile