This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[Patch,Fortran] PR 38259 - add module version number
- From: Tobias Burnus <burnus at net-b dot de>
- To: gcc-patches at gcc dot gnu dot org, fortran at gcc dot gnu dot org
- Date: Fri, 13 Feb 2009 22:11:52 +0100
- Subject: [Patch,Fortran] PR 38259 - add module version number
Hi all,
so far, the .mod files between major versions were always incompatible.
However, as the .mod files do not have a version number, the error
messages can be rather cryptic. The attached patch finally implements
a .mod version number.
The patch is by Mikael (attached to the PR); Jakub and Richard
strongly suggest that this patch should still go into 4.4.0.
Build and regtested on x86-64-linux.
OK for the 4.4 trunk?
Tobias
PS: The MD5 sum remains unchanged, only the first line of the .mod file
changes.
2009-02-13 Mikael Morin <mikael.morin@tele2.fr>
PR fortran/38259
* module.c (gfc_dump_module,gfc_use_module): Add module
version number.
Index: gcc/fortran/module.c
===================================================================
--- gcc/fortran/module.c (Revision 144161)
+++ gcc/fortran/module.c (Arbeitskopie)
@@ -75,6 +75,10 @@ along with GCC; see the file COPYING3.
#define MODULE_EXTENSION ".mod"
+/* Don't put any single quote (') in MOD_VERSION,
+ if yout want it to be recognized. */
+#define MOD_VERSION "0"
+
/* Structure that describes a position within a module file. */
@@ -4817,8 +4821,8 @@ gfc_dump_module (const char *name, int d
*strchr (p, '\n') = '\0';
- fprintf (module_fp, "GFORTRAN module created from %s on %s\nMD5:",
- gfc_source_file, p);
+ fprintf (module_fp, "GFORTRAN module version '%s' created from %s on %s\n"
+ "MD5:", MOD_VERSION, gfc_source_file, p);
fgetpos (module_fp, &md5_pos);
fputs ("00000000000000000000000000000000 -- "
"If you edit this, you'll get what you deserve.\n\n", module_fp);
@@ -5220,12 +5224,27 @@ gfc_use_module (void)
c = module_char ();
if (c == EOF)
bad_module ("Unexpected end of module");
- if (start++ < 2)
+ if (start++ < 3)
parse_name (c);
if ((start == 1 && strcmp (atom_name, "GFORTRAN") != 0)
|| (start == 2 && strcmp (atom_name, " module") != 0))
gfc_fatal_error ("File '%s' opened at %C is not a GFORTRAN module "
"file", filename);
+ if (start == 3)
+ {
+ if (strcmp (atom_name, " version") != 0
+ || module_char () != ' '
+ || parse_atom () != ATOM_STRING)
+ gfc_fatal_error ("Parse error when checking module version"
+ " for file '%s' opened at %C", filename);
+
+ if (strcmp (atom_string, MOD_VERSION))
+ {
+ gfc_fatal_error ("Wrong module version '%s' (expected '"
+ MOD_VERSION "') for file '%s' opened"
+ " at %C", atom_string, filename);
+ }
+ }
if (c == '\n')
line++;