aboutsummaryrefslogtreecommitdiff
path: root/gcc/f
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/f')
-rw-r--r--gcc/f/ChangeLog13
-rw-r--r--gcc/f/Make-lang.in19
-rw-r--r--gcc/f/com.c2
-rw-r--r--gcc/f/g77spec.c5
-rw-r--r--gcc/f/parse.c2
-rw-r--r--gcc/f/version.c4
-rw-r--r--gcc/f/version.h6
7 files changed, 23 insertions, 28 deletions
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 7b70e60..ef81853 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-23 Zack Weinberg <zack@codesourcery.com>
+
+ * Make-lang.in (g77spec.o): Don't depend on f/version.h.
+ (f/parse.o): Depend on version.h not f/version.h.
+ (g77version.o, f/version.o): Delete all references.
+
+ * com.c (ffecom_init_0): Fix transposed array indices in bsearch test.
+ * g77spec.c: Don't include f/version.h or refer to ffe_version_string.
+ * parse.c: Use version_string, not ffe_version_string.
+ * version.c, version.h: Delete files.
+
2002-09-23 Kazu Hirata <kazu@cs.umass.edu>
* ChangeLog: Follow spelling conventions.
@@ -38,7 +49,7 @@
* bugs.texi (Known Bugs): Refer to gcc.gnu.org instead of
www.gnu.org for onlinedocs.
* news.texi (News): Ditto.
-
+
2002-09-07 Jan Hubicka <jh@suse.cz>
* com.c (ffe_type_for_mode): Handle long double.
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 95ec02c..df31b1a 100644
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -65,21 +65,17 @@ F77 f77: f771$(exeext)
f77.extraclean f77.maintainer-clean f77.rebuilt \
f77.stage1 f77.stage2 f77.stage3 f77.stage4
-g77spec.o: $(srcdir)/f/g77spec.c $(srcdir)/f/version.h $(SYSTEM_H) $(GCC_H) \
+g77spec.o: $(srcdir)/f/g77spec.c $(SYSTEM_H) $(GCC_H) \
$(CONFIG_H)
(SHLIB_LINK='$(SHLIB_LINK)' \
SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
$(INCLUDES) $(srcdir)/f/g77spec.c)
-g77version.o: $(srcdir)/f/version.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -o g77version.o \
- $(srcdir)/f/version.c
-
# Create the compiler driver for g77.
-g77$(exeext): gcc.o g77spec.o g77version.o version.o prefix.o intl.o \
+g77$(exeext): gcc.o g77spec.o version.o prefix.o intl.o \
$(LIBDEPS) $(EXTRA_GCC_OBJS)
- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o g77spec.o g77version.o \
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o g77spec.o \
version.o prefix.o intl.o $(EXTRA_GCC_OBJS) $(LIBS)
# Create a version of the g77 driver which calls the cross-compiler.
@@ -93,7 +89,7 @@ F77_OBJS = f/bad.o f/bit.o f/bld.o f/com.o f/data.o f/equiv.o f/expr.o \
f/global.o f/implic.o f/info.o f/intrin.o f/lab.o f/lex.o f/malloc.o \
f/name.o f/parse.o f/src.o f/st.o f/sta.o f/stb.o f/stc.o \
f/std.o f/ste.o f/storag.o f/stp.o f/str.o f/sts.o f/stt.o f/stu.o \
- f/stv.o f/stw.o f/symbol.o f/target.o f/top.o f/type.o f/version.o f/where.o
+ f/stv.o f/stw.o f/symbol.o f/target.o f/top.o f/type.o f/where.o
# Use loose warnings for this front end.
f-warn =
@@ -321,7 +317,7 @@ f77.mostlyclean:
-rm -f g77.aux g77.cps g77.ky g77.toc g77.vr g77.fn g77.kys \
g77.pg g77.tp g77.vrs g77.cp g77.fns g77.log g77.pgs g77.tps
f77.clean:
- -rm -f g77spec.o g77version.o
+ -rm -f g77spec.o
f77.distclean:
-rm -f f/Makefile
f77.extraclean:
@@ -332,7 +328,7 @@ f77.maintainer-clean:
# The main makefile has already created stage?/f.
G77STAGESTUFF = f/*$(objext) f/fini$(build_exeext) f/stamp-str \
- f/str-*.h f/str-*.j g77spec.o g77version.o
+ f/str-*.h f/str-*.j g77spec.o
f77.stage1: stage1-start
-mv -f $(G77STAGESTUFF) stage1/f
@@ -425,7 +421,7 @@ f/parse.o: f/parse.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/top.h f/malloc.h \
f/where.h glimits.h f/com.h f/com-rt.def $(TREE_H) f/bld.h f/bld-op.def \
f/bit.h f/info.h f/info-b.def f/info-k.def f/info-w.def f/target.h f/bad.h \
f/bad.def f/lex.h f/type.h f/intrin.h f/intrin.def f/lab.h f/symbol.h \
- f/symbol.def f/equiv.h f/storag.h f/global.h f/name.h f/version.h flags.h
+ f/symbol.def f/equiv.h f/storag.h f/global.h f/name.h version.h flags.h
f/src.o: f/src.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/src.h f/bad.h f/bad.def \
f/where.h glimits.h f/top.h f/malloc.h
f/st.o: f/st.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/st.h f/bad.h f/bad.def \
@@ -527,6 +523,5 @@ f/top.o: f/top.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/top.h f/malloc.h f/where.h \
f/intrin.def f/data.h f/expr.h f/implic.h f/src.h f/st.h flags.h \
toplev.h
f/type.o: f/type.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/type.h f/malloc.h
-f/version.o: f/version.c f/version.h
f/where.o: f/where.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/where.h glimits.h f/top.h \
f/malloc.h f/lex.h $(GGC_H) gt-f-where.h
diff --git a/gcc/f/com.c b/gcc/f/com.c
index b14b875..cc3af7e 100644
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -11124,7 +11124,7 @@ ffecom_init_0 ()
name = bsearch ("foo", &names[0], ARRAY_SIZE (names), sizeof (names[0]),
(int (*)(const void *, const void *)) strcmp);
- if (name != &names[0][2])
+ if (name != &names[2][0])
{
assert ("bsearch doesn't work, #define FFEPROJ_BSEARCH 0 in proj.h"
== NULL);
diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c
index 2e094d9..6aea81b3 100644
--- a/gcc/f/g77spec.c
+++ b/gcc/f/g77spec.c
@@ -47,7 +47,6 @@ Boston, MA 02111-1307, USA. */
#include "config.h"
#include "system.h"
#include "gcc.h"
-#include <f/version.h>
#ifndef MATH_LIBRARY
#define MATH_LIBRARY "-lm"
@@ -374,7 +373,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
case OPTION_version:
printf ("\
-GNU Fortran (GCC %s) %s\n\
+GNU Fortran (GCC) %s\n\
Copyright (C) 2002 Free Software Foundation, Inc.\n\
\n\
GNU Fortran comes with NO WARRANTY, to the extent permitted by law.\n\
@@ -382,7 +381,7 @@ You may redistribute copies of GNU Fortran\n\
under the terms of the GNU General Public License.\n\
For more information about these matters, see the file named COPYING\n\
or type the command `info -f g77 Copying'.\n\
-", version_string, ffe_version_string);
+", version_string);
exit (0);
break;
diff --git a/gcc/f/parse.c b/gcc/f/parse.c
index f687e59..106ff3f6 100644
--- a/gcc/f/parse.c
+++ b/gcc/f/parse.c
@@ -35,7 +35,7 @@ ffe_parse_file (set_yydebug)
ffewhereFile wf;
if (ffe_is_version ())
- fprintf (stderr, "GNU Fortran Front End version %s\n", ffe_version_string);
+ fprintf (stderr, "GNU Fortran Front End version %s\n", version_string);
if (!ffe_is_pedantic ())
ffe_set_is_pedantic (pedantic);
diff --git a/gcc/f/version.c b/gcc/f/version.c
deleted file mode 100644
index 8876e30..0000000
--- a/gcc/f/version.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "ansidecl.h"
-#include "f/version.h"
-
-const char *const ffe_version_string = "3.3 20020923 (experimental)";
diff --git a/gcc/f/version.h b/gcc/f/version.h
deleted file mode 100644
index fe77551..0000000
--- a/gcc/f/version.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GCC_F_VERSION_H
-#define GCC_F_VERSION_H
-
-extern const char *const ffe_version_string;
-
-#endif /* ! GCC_F_VERSION_H */
generated by cgit v1.1 at 2025-02-25 20:37:25 +0000