Attached patch changes the name of the language in --enable-languages
from "f95" to "fortran", and in a few other places. There are still lots
of places which are refered to as f95 (such as f951 ;-), but they are
all internal uses.
I'm not very familiar with the mechanism of language names, so I might
have forgotten some changes. Built and regtested on i686-linux. Comments?
FX
2005-08-31 Francois-Xavier Coudert <[EMAIL PROTECTED]>
* configure.in: Recognize f95 in the --enable-languages option,
and substitute it for fortran, issuing a warning.
* configure: Regenerate.
2005-08-31 Francois-Xavier Coudert <[EMAIL PROTECTED]>
* Make-lang.in: Change targets prefixes from f95 to fortran.
* config-lang.in: Change language name to "fortran".
* lang.opt: Change language name to "fortran".
* options.c: Change CL_F95 to CL_Fortran.
Index: configure.in
===================================================================
RCS file: /cvsroot/gcc/gcc/configure.in,v
retrieving revision 1.363
diff -u -3 -p -r1.363 configure.in
--- configure.in 12 Aug 2005 14:18:41 -0000 1.363
+++ configure.in 31 Aug 2005 19:28:22 -0000
@@ -506,15 +506,15 @@ case "${target}" in
unsupported_languages="$unsupported_languages java"
case "${target}" in
*-*-aout)
- unsupported_languages="$unsupported_languages f95"
+ unsupported_languages="$unsupported_languages fortran"
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
*-*-elf)
- unsupported_languages="$unsupported_languages f95"
+ unsupported_languages="$unsupported_languages fortran"
noconfigdirs="$noconfigdirs target-boehm-gc";;
*-*-linux*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
*)
- unsupported_languages="$unsupported_languages f95"
+ unsupported_languages="$unsupported_languages fortran"
noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
esac
;;
@@ -665,7 +665,7 @@ case "${target}" in
;;
mmix-*-*)
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss"
- unsupported_languages="$unsupported_languages f95 java"
+ unsupported_languages="$unsupported_languages fortran java"
;;
mn10200-*-*)
noconfigdirs="$noconfigdirs ${libgcj}"
@@ -1142,6 +1142,15 @@ if test -d ${srcdir}/gcc; then
fi
fi
enable_languages=`echo "${enable_languages}" | sed -e 's/[[ ,]][[
,]]*/,/g' -e 's/,$//'`
+
+ # 'f95' is the old name for the 'fortran' language. We issue a warning
+ # and make the substitution.
+ case ,${enable_languages}, in
+ *,f95,*)
+ echo configure.in: warning: 'f95' as language name is deprecated, use
'fortran' instead 1>&2
+ enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
+ ;;
+ esac
# First scan to see if an enabled language requires some other language.
# We assume that a given config-lang.in will list all the language
Index: gcc/fortran/Make-lang.in
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/fortran/Make-lang.in,v
retrieving revision 1.20
diff -u -3 -p -r1.20 Make-lang.in
--- gcc/fortran/Make-lang.in 13 Jul 2005 13:33:31 -0000 1.20
+++ gcc/fortran/Make-lang.in 31 Aug 2005 19:28:24 -0000
@@ -82,7 +82,7 @@ F95_LIBS = $(GMPLIBS) $(LIBS)
#
# Define the names for selecting gfortran in LANGUAGES.
-F95 f95: f951$(exeext)
+FORTRAN fortran: f951$(exeext)
# Tell GNU make to ignore files by these names if they exist.
.PHONY: F95 f95
@@ -118,31 +118,31 @@ gt-fortran-trans-intrinsic.h : s-
#
# Build hooks:
-f95.all.build: gfortran$(exeext)
-f95.all.cross: gfortran-cross$(exeext)
+fortran.all.build: gfortran$(exeext)
+fortran.all.cross: gfortran-cross$(exeext)
-f95.start.encap: gfortran$(exeext)
-f95.rest.encap:
+fortran.start.encap: gfortran$(exeext)
+fortran.rest.encap:
-f95.srcinfo: doc/gfortran.info
+fortran.srcinfo: doc/gfortran.info
-cp -p $^ $(srcdir)/fortran
-f95.tags: force
+fortran.tags: force
cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \
etags --include TAGS.sub --include ../TAGS.sub
-f95.info: doc/gfortran.info
+fortran.info: doc/gfortran.info
dvi:: doc/gfortran.dvi
html:: $(htmldir)/gfortran/index.html
F95_MANFILES = doc/gfortran.1
-f95.man: $(F95_MANFILES)
+fortran.man: $(F95_MANFILES)
-f95.srcman: $(F95_MANFILES)
+fortran.srcman: $(F95_MANFILES)
-cp -p $^ $(srcdir)/doc
-f95.srcextra:
+fortran.srcextra:
check-f95 : check-gfortran
lang_checks += check-gfortran
@@ -182,11 +182,11 @@ gfortran.pod: $(GFORTRAN_TEXI)
# f951 is installed elsewhere as part of $(COMPILERS).
# Nothing to do here.
-f95.install-normal:
+fortran.install-normal:
# Install the driver program as $(target)-gfortran
# and also as either gfortran (if native) or $(tooldir)/bin/gfortran.
-f95.install-common: installdirs
+fortran.install-common: installdirs
-if [ -f f951$(exeext) ] ; then \
if [ -f gfortran-cross$(exeext) ] ; then \
rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \
@@ -207,7 +207,7 @@ f95.install-common: installdirs
install-info:: $(DESTDIR)$(infodir)/gfortran.info
-f95.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)
+fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)
$(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext): doc/gfortran.1 \
installdirs
@@ -215,7 +215,7 @@ $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_
-$(INSTALL_DATA) $< $@
-chmod a-x $@
-f95.uninstall:
+fortran.uninstall:
if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i
debian' >/dev/null 2>&1; then \
echo " install-info --delete --info-dir=$(DESTDIR)$(infodir)
$(DESTDIR)$(infodir)/gfortran.info"; \
install-info --delete --info-dir=$(DESTDIR)$(infodir)
$(DESTDIR)$(infodir)/gfortran.info || : ; \
@@ -230,16 +230,16 @@ f95.uninstall:
# A lot of the ancillary files are deleted by the main makefile.
# We just have to delete files specific to us.
-f95.mostlyclean:
+fortran.mostlyclean:
-rm -f f951$(exeext)
-rm -f fortran/*.o
-f95.clean:
-f95.distclean:
+fortran.clean:
+fortran.distclean:
-rm -f fortran/config.status fortran/Makefile
-f95.extraclean:
-f95.maintainer-clean:
+fortran.extraclean:
+fortran.maintainer-clean:
-rm -f doc/gfortran.info* fortran/gfortran.*aux
-rm -f $(docobjdir)/gfortran.1
@@ -247,17 +247,17 @@ f95.maintainer-clean:
# Stage hooks:
# The toplevel makefile has already created stage?/fortran at this point.
-f95.stage1: stage1-start
+fortran.stage1: stage1-start
-mv fortran/*$(objext) stage1/fortran
-f95.stage2: stage2-start
+fortran.stage2: stage2-start
-mv fortran/*$(objext) stage2/fortran
-f95.stage3: stage3-start
+fortran.stage3: stage3-start
-mv fortran/*$(objext) stage3/fortran
-f95.stage4: stage4-start
+fortran.stage4: stage4-start
-mv fortran/*$(objext) stage4/fortran
-f95.stageprofile: stageprofile-start
+fortran.stageprofile: stageprofile-start
-mv fortran/*$(objext) stageprofile/fortran
-f95.stagefeedback: stageprofile-start
+fortran.stagefeedback: stageprofile-start
-mv fortran/*$(objext) stagefeedback/fortran
#
Index: gcc/fortran/config-lang.in
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/fortran/config-lang.in,v
retrieving revision 1.3
diff -u -3 -p -r1.3 config-lang.in
--- gcc/fortran/config-lang.in 25 Aug 2004 21:18:35 -0000 1.3
+++ gcc/fortran/config-lang.in 31 Aug 2005 19:28:24 -0000
@@ -6,7 +6,7 @@
# stagestuff - files to add to $(STAGESTUFF)
# diff_excludes - files to ignore when building diffs between two
versions.
-language="f95"
+language="fortran"
compilers="f951\$(exeext)"
Index: gcc/fortran/lang.opt
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/fortran/lang.opt,v
retrieving revision 1.17
diff -u -3 -p -r1.17 lang.opt
--- gcc/fortran/lang.opt 21 Aug 2005 15:28:23 -0000 1.17
+++ gcc/fortran/lang.opt 31 Aug 2005 19:28:24 -0000
@@ -23,158 +23,158 @@
; Please try to keep this file in ASCII collating order.
Language
-F95
+Fortran
I
-F95 Joined
+Fortran Joined
-I<directory> Add a directory for INCLUDE and MODULE searching
J
-F95 Joined
+Fortran Joined
-J<directory> Put MODULE files in 'directory'
Wall
-F95 RejectNegative
+Fortran RejectNegative
; Documented in C
Waliasing
-F95
+Fortran
Warn about possible aliasing of dummy arguments
Wconversion
-F95
+Fortran
Warn about implicit conversion
Wimplicit-interface
-F95
+Fortran
Warn about calls with implicit interface
Wline-truncation
-F95
+Fortran
Warn about truncated source lines
Wnonstd-intrinsics
-F95
+Fortran
Warn about usage of non-standard intrinsics
Wsurprising
-F95
+Fortran
Warn about \"suspicious\" constructs
Wunderflow
-F95
+Fortran
Warn about underflow of numerical constant expressions
Wunused-labels
-F95
+Fortran
Warn when a label is unused
fbackslash
-F95
+Fortran
Specify that backslash in string introduces an escape character
fdefault-double-8
-F95
+Fortran
Set the default double precision kind to an 8 byte wide type
fdefault-integer-8
-F95
+Fortran
Set the default integer kind to an 8 byte wide type
fdefault-real-8
-F95
+Fortran
Set the default real kind to an 8 byte wide type
fd-lines-as-code
-F95 RejectNegative
+Fortran RejectNegative
Ignore 'D' in column one in fixed form
fd-lines-as-comments
-F95 RejectNegative
+Fortran RejectNegative
Treat lines with 'D' in column one as comments
fdollar-ok
-F95
+Fortran
Allow dollar signs in entity names
fdump-parse-tree
-F95
+Fortran
Display the code tree after parsing
ff2c
-F95
+Fortran
Use f2c calling convention
ffixed-form
-F95
+Fortran
Assume that the source file is fixed form
ffree-form
-F95
+Fortran
Assume that the source file is free form
funderscoring
-F95
+Fortran
Append underscores to externally visible names
fsecond-underscore
-F95
+Fortran
Append a second underscore if the name already contains an underscore
fimplicit-none
-F95
+Fortran
Specify that no implicit typing is allowed, unless overridden by explicit
IMPLICIT statements
ffixed-line-length-none
-F95 RejectNegative
+Fortran RejectNegative
Allow arbitrary character line width in fixed mode
ffixed-line-length-
-F95 RejectNegative Joined UInteger
+Fortran RejectNegative Joined UInteger
-ffixed-line-length-<n> Use n as character line width in fixed
mode
fmax-identifier-length=
-F95 RejectNegative Joined UInteger
+Fortran RejectNegative Joined UInteger
-fmax-identifier-length=<n> Maximum identifier length
fmax-stack-var-size=
-F95 RejectNegative Joined UInteger
+Fortran RejectNegative Joined UInteger
-fmax-stack-var-size=<n> Size in bytes of the largest array that will be
put on the stack
fmodule-private
-F95
+Fortran
Set default accessibility of module entities to PRIVATE
fno-backend
-F95 RejectNegative
+Fortran RejectNegative
Don't generate code, just do syntax and semantics checking
fpack-derived
-F95
+Fortran
Try to layout derived types as compact as possible
frepack-arrays
-F95
+Fortran
Copy array sections into a contiguous block on procedure entry
qkind=
-F95 RejectNegative Joined UInteger
+Fortran RejectNegative Joined UInteger
-qkind=<n> Set the kind for a real with the 'q' exponent to 'n'
std=f95
-F95
+Fortran
Conform to the ISO Fortran 95 standard
std=f2003
-F95
+Fortran
Conform to the ISO Fortran 2003 standard
std=gnu
-F95
+Fortran
Conform nothing in particular
std=legacy
-F95
+Fortran
Accept extensions to support legacy code
; This comment is to ensure we retain the blank line above.
Index: gcc/fortran/options.c
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/fortran/options.c,v
retrieving revision 1.23
diff -u -3 -p -r1.23 options.c
--- gcc/fortran/options.c 21 Aug 2005 15:28:23 -0000 1.23
+++ gcc/fortran/options.c 31 Aug 2005 19:39:57 -0000
@@ -86,7 +86,7 @@ gfc_init_options (unsigned int argc ATTR
gfc_option.warn_nonstd_intrinsics = 0;
- return CL_F95;
+ return CL_Fortran;
}
