patch f77_abort(), delete no_lg.c for better way to detect -lg.

SCCS-vsn: usr.bin/f77/libI77/Makefile 5.3
SCCS-vsn: usr.bin/f77/libI77/f77_abort.c 5.2

diff --git a/usr/src/usr.bin/f77/libI77/Makefile b/usr/src/usr.bin/f77/libI77/Makefile
index 57b6580..cf0386d 100644 (file)
--- a/usr/src/usr.bin/f77/libI77/Makefile
+++ b/usr/src/usr.bin/f77/libI77/Makefile
@@ -3,7 +3,7 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    5.2 (Berkeley) %G%
+#      @(#)Makefile    5.3 (Berkeley) %G%

 #
 
 # Makefile for f77 I/O lib, libI77.a
 #
 
 # Makefile for f77 I/O lib, libI77.a


@@ -48,7 +48,6 @@ OBJS        = backspace.o \
                inquire.o \
                lread.o \
                lwrite.o \
                inquire.o \
                lread.o \
                lwrite.o \

-               no_lg.o \

                open.o \
                rdfe.o \
                rdfmt.o \
                open.o \
                rdfe.o \
                rdfmt.o \


@@ -86,7 +85,6 @@ SRCS        = backspace.c \
                inquire.c \
                lread.c \
                lwrite.c \
                inquire.c \
                lread.c \
                lwrite.c \

-               no_lg.c \

                open.c \
                rdfe.c \
                rdfmt.c \
                open.c \
                rdfe.c \
                rdfmt.c \


@@ -199,4 +197,3 @@ wrtfmt.o:   fio.h f_errno.h fiodefs.h format.h wrtfmt.c
 err.o:         fio.h f_errno.h fiodefs.h err.c
 fmtlib.o:      fio.h f_errno.h fiodefs.h fmtlib.c
 f77_abort.o:   fio.h f_errno.h fiodefs.h f77_abort.c
 err.o:         fio.h f_errno.h fiodefs.h err.c
 fmtlib.o:      fio.h f_errno.h fiodefs.h fmtlib.c
 f77_abort.o:   fio.h f_errno.h fiodefs.h f77_abort.c

-no_lg.o:       no_lg.c

diff --git a/usr/src/usr.bin/f77/libI77/f77_abort.c b/usr/src/usr.bin/f77/libI77/f77_abort.c
index 71374c0..f793472 100644 (file)
--- a/usr/src/usr.bin/f77/libI77/f77_abort.c
+++ b/usr/src/usr.bin/f77/libI77/f77_abort.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)f77_abort.c 5.1     %G%
+ *     @(#)f77_abort.c 5.2     %G%

  *
  *     all f77 aborts eventually call f77_abort.
  *     f77_abort cleans up open files and terminates with a dump if needed,
  *
  *     all f77 aborts eventually call f77_abort.
  *     f77_abort cleans up open files and terminates with a dump if needed,


@@ -16,7 +16,7 @@
 
 char *getenv();
 extern int errno;
 
 char *getenv();
 extern int errno;

-extern int _dbsubc;    /* dbsubc is non-zero if -lg was specified to ld */
+int _lg_flag;  /* _lg_flag is non-zero if -lg was specified to ld */

 
 f77_abort( err_val, act_core )
 {
 
 f77_abort( err_val, act_core )
 {


@@ -34,7 +34,7 @@ f77_abort( err_val, act_core )
                second line checks if -lg specified to ld (e.g. by saying
                        -g to f77) and checks the f77_dump_flag var. */
        core_dump = ((nargs() != 2) || act_core) &&
                second line checks if -lg specified to ld (e.g. by saying
                        -g to f77) and checks the f77_dump_flag var. */
        core_dump = ((nargs() != 2) || act_core) &&

-           ( (_dbsubc && (first_char != 'n')) || first_char == 'y');
+           ( (_lg_flag && (first_char != 'n')) || first_char == 'y');

 
        if( !core_dump )
                fprintf(units[STDERR].ufd,"*** Execution terminated\n");
 
        if( !core_dump )
                fprintf(units[STDERR].ufd,"*** Execution terminated\n");