diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/module.c | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4bf46250472..5d972c2edda 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2009-02-27 Tobias Burnus <burnus@net-b.de> + + PR fortran/39309 + * module.c (read_md5_from_module_file): Include mod version + in had-changed test. + 2009-02-26 Paul Thomas <pault@gcc.gnu.org> PR fortran/39295 diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index bfc4ef9f0d2..c234879a2a1 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -4739,8 +4739,18 @@ read_md5_from_module_file (const char * filename, unsigned char md5[16]) return -1; /* Read two lines. */ - if (fgets (buf, sizeof (buf) - 1, file) == NULL - || fgets (buf, sizeof (buf) - 1, file) == NULL) + if (fgets (buf, sizeof (buf) - 1, file) == NULL) + { + fclose (file); + return -1; + } + + /* The file also needs to be overwritten if the version number changed. */ + n = strlen ("GFORTRAN module version " MOD_VERSION " created"); + if (strncmp (buf, "GFORTRAN module version " MOD_VERSION " created", n) != 0) + return -1; + + if (fgets (buf, sizeof (buf) - 1, file) == NULL) { fclose (file); return -1; |