update for new structure

SCCS-vsn: lib/csu/i386/Makefile 5.9
SCCS-vsn: lib/csu/i386/crt0.c 5.8

diff --git a/usr/src/lib/csu/i386/Makefile b/usr/src/lib/csu/i386/Makefile
index bf4ec9a..ada76ac 100644 (file)
--- a/usr/src/lib/csu/i386/Makefile
+++ b/usr/src/lib/csu/i386/Makefile
@@ -1,8 +1,8 @@
-#      @(#)Makefile    5.8 (Berkeley) %G%
+#      @(#)Makefile    5.9 (Berkeley) %G%

 
 CFLAGS=        -O -DLIBC_SCCS
 OBJS=  crt0.o gcrt0.o
 
 CFLAGS=        -O -DLIBC_SCCS
 OBJS=  crt0.o gcrt0.o

-CLEANFILES+=   mcount.o moncrt0.o core a.out
+CLEANFILES+=   core a.out

 
 all: ${OBJS}
 
 
 all: ${OBJS}
 


@@ -11,19 +11,11 @@ crt0.o: crt0.c
        ${LD} -x -r ${.TARGET}
        mv a.out ${.TARGET}
 
        ${LD} -x -r ${.TARGET}
        mv a.out ${.TARGET}
 

-moncrt0.o: crt0.c
+gcrt0.o: crt0.c

        ${CC} ${CFLAGS} -c -DMCRT0 ${.ALLSRC} -o ${.TARGET}
        ${LD} -x -r ${.TARGET}
        mv a.out ${.TARGET}
 
        ${CC} ${CFLAGS} -c -DMCRT0 ${.ALLSRC} -o ${.TARGET}
        ${LD} -x -r ${.TARGET}
        mv a.out ${.TARGET}
 

-gcrt0.o: moncrt0.o mcount.o
-       ${LD} -x -r -o ${.TARGET} moncrt0.o mcount.o
-
-mcount.o: ../csu.gmon/gmon.c ../csu.gmon/gmon.h
-       ${CC} ${CFLAGS} -c ${DEFS} ${.IMPSRC}
-       ${LD} -x -r ${.TARGET}
-       mv a.out ${.TARGET}
-

 install:
        install -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
            ${DESTDIR}/usr/lib
 install:
        install -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
            ${DESTDIR}/usr/lib

diff --git a/usr/src/lib/csu/i386/crt0.c b/usr/src/lib/csu/i386/crt0.c
index 3a14d11..71caa61 100644 (file)
--- a/usr/src/lib/csu/i386/crt0.c
+++ b/usr/src/lib/csu/i386/crt0.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)crt0.c     5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)crt0.c     5.8 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -83,14 +83,11 @@ asm("eprol:");
 
 #ifdef CRT0
 /*
 
 #ifdef CRT0
 /*

- * null mcount and moncontrol,
- * just in case some routine is compiled for profiling
+ * null moncontrol just in case some routine is compiled for profiling

  */
 moncontrol(val)
        int val;
 {
 
 }
  */
 moncontrol(val)
        int val;
 {
 
 }

-asm(".globl mcount");
-asm("mcount: ret");
-#endif CRT0
+#endif /* CRT0 */