[patch, fortran] Support .F03 and .f03 file extensions

[patch, fortran] Support .F03 and .f03 file extensions

[Tobias Burnus]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

:ADDPATCH fortran:

Support the .f03 and .F03 file extensions.

Ok for the trunk?

Bootstrapped, tested and regression tested on x86_64-unknown-linux-gnu


Tobias


2007-01-06  Tobias Burnus  <burnus@net-b.de>

    * lang-specs.h: Add support for .f03 and .F03 extensions.
    * gfortran.texi: Document .f03 extension.
    * options.c (form_from_filename): Recognize .f03.

[-- Attachment #2: f03.diff --]
[-- Type: text/x-patch, Size: 2195 bytes --]

Index: gcc/fortran/gfortran.texi
===================================================================
--- gcc/fortran/gfortran.texi	(Revision 120520)
+++ gcc/fortran/gfortran.texi	(Arbeitskopie)
@@ -367,8 +367,8 @@
 Fortran) for each file in the source code, and then calls the assembler
 and linker as appropriate to produce the compiled output. In a copy of
 GCC which has been compiled with Fortran language support enabled,
-@command{gcc} will recognize files with @file{.f}, @file{.f90}, and
-@file{.f95} extensions as Fortran source code, and compile it
+@command{gcc} will recognize files with @file{.f}, @file{.f90}, @file{.f95},
+and @file{.f03} extensions as Fortran source code, and compile it
 accordingly.  A @command{gfortran} driver program is also provided,
 which is identical to @command{gcc} except that it automatically links
 the Fortran runtime libraries into the compiled program.
Index: gcc/fortran/options.c
===================================================================
--- gcc/fortran/options.c	(Revision 120520)
+++ gcc/fortran/options.c	(Arbeitskopie)
@@ -137,6 +138,9 @@
     ".f95", FORM_FREE}
     ,
     {
+    ".f03", FORM_FREE}
+    ,
+    {
     ".f", FORM_FIXED}
     ,
     {
Index: gcc/fortran/lang-specs.h
===================================================================
--- gcc/fortran/lang-specs.h	(Revision 120520)
+++ gcc/fortran/lang-specs.h	(Arbeitskopie)
@@ -18,6 +18,7 @@
       -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
 {".F90", "@f95-cpp-input", 0, 0, 0},
 {".F95", "@f95-cpp-input", 0, 0, 0},
+{".F03", "@f95-cpp-input", 0, 0, 0},
 {"@f95-cpp-input",
   "cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) \
       %{E|M|MM:%(cpp_debug_options)}\
@@ -26,6 +27,7 @@
       -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
 {".f90", "@f95", 0, 0, 0},
 {".f95", "@f95", 0, 0, 0},
+{".f03", "@f95", 0, 0, 0},
 {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
          %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
 {".f",   "@f77", 0, 0, 0},

Re: [patch, fortran] Support .F03 and .f03 file extensions

[Tobias Burnus]

*Ping*

Tobias Burnus wrote:
> :ADDPATCH fortran:
>
> Support the .f03 and .F03 file extensions.
>
> Ok for the trunk?
>
> Bootstrapped, tested and regression tested on x86_64-unknown-linux-gnu
>
>
> Tobias
>
>
> 2007-01-06  Tobias Burnus  <burnus@net-b.de>
>
>     * lang-specs.h: Add support for .f03 and .F03 extensions.
>     * gfortran.texi: Document .f03 extension.
>     * options.c (form_from_filename): Recognize .f03.
>   
> ------------------------------------------------------------------------
>
> Index: gcc/fortran/gfortran.texi
> ===================================================================
> --- gcc/fortran/gfortran.texi	(Revision 120520)
> +++ gcc/fortran/gfortran.texi	(Arbeitskopie)
> @@ -367,8 +367,8 @@
>  Fortran) for each file in the source code, and then calls the assembler
>  and linker as appropriate to produce the compiled output. In a copy of
>  GCC which has been compiled with Fortran language support enabled,
> -@command{gcc} will recognize files with @file{.f}, @file{.f90}, and
> -@file{.f95} extensions as Fortran source code, and compile it
> +@command{gcc} will recognize files with @file{.f}, @file{.f90}, @file{.f95},
> +and @file{.f03} extensions as Fortran source code, and compile it
>  accordingly.  A @command{gfortran} driver program is also provided,
>  which is identical to @command{gcc} except that it automatically links
>  the Fortran runtime libraries into the compiled program.
> Index: gcc/fortran/options.c
> ===================================================================
> --- gcc/fortran/options.c	(Revision 120520)
> +++ gcc/fortran/options.c	(Arbeitskopie)
> @@ -137,6 +138,9 @@
>      ".f95", FORM_FREE}
>      ,
>      {
> +    ".f03", FORM_FREE}
> +    ,
> +    {
>      ".f", FORM_FIXED}
>      ,
>      {
> Index: gcc/fortran/lang-specs.h
> ===================================================================
> --- gcc/fortran/lang-specs.h	(Revision 120520)
> +++ gcc/fortran/lang-specs.h	(Arbeitskopie)
> @@ -18,6 +18,7 @@
>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>  {".F90", "@f95-cpp-input", 0, 0, 0},
>  {".F95", "@f95-cpp-input", 0, 0, 0},
> +{".F03", "@f95-cpp-input", 0, 0, 0},
>  {"@f95-cpp-input",
>    "cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) \
>        %{E|M|MM:%(cpp_debug_options)}\
> @@ -26,6 +27,7 @@
>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>  {".f90", "@f95", 0, 0, 0},
>  {".f95", "@f95", 0, 0, 0},
> +{".f03", "@f95", 0, 0, 0},
>  {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
>           %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
>  {".f",   "@f77", 0, 0, 0},
>   

Re: [patch, fortran] Support .F03 and .f03 file extensions

[FX Coudert]

>> 2007-01-06  Tobias Burnus  <burnus@net-b.de>
>>
>>     * lang-specs.h: Add support for .f03 and .F03 extensions.
>>     * gfortran.texi: Document .f03 extension.
>>     * options.c (form_from_filename): Recognize .f03.

Didn't I approve that already? I'm sorry, I really thought I had  
given you the green light already :(

OK to commit to mainline. Probably worth a backport to 4.2.

>> -@command{gcc} will recognize files with @file{.f}, @file{.f90}, and
>> -@file{.f95} extensions as Fortran source code, and compile it
>> +@command{gcc} will recognize files with @file{.f}, @file{.f90},  
>> @file{.f95},
>> +and @file{.f03} extensions as Fortran source code, and compile it

I think it should be noted that the capital file suffices not being  
documented at this very same point of the documentation looks weird  
to me. Maybe something to look into in the future?

FX

Re: [patch, fortran] Support .F03 and .f03 file extensions

[Tobias Burnus]

[-- Attachment #1: Type: text/plain, Size: 3108 bytes --]

As Chris wants to use the .f03 extension in the test suite (see his
patch for the fortran-experiments branch), I decided to do it already on
the trunk and for the complete test suite.

Are both patches ok for the trunk?

Tobias


Tobias Burnus wrote:
>> :ADDPATCH fortran:
>>
>> Support the .f03 and .F03 file extensions.
>>
>> Ok for the trunk?
>>
>> Bootstrapped, tested and regression tested on x86_64-unknown-linux-gnu
>>
>>
>> Tobias
>>
>>
>> 2007-01-06  Tobias Burnus  <burnus@net-b.de>
>>
>>     * lang-specs.h: Add support for .f03 and .F03 extensions.
>>     * gfortran.texi: Document .f03 extension.
>>     * options.c (form_from_filename): Recognize .f03.
>>   
>> ------------------------------------------------------------------------
>>
>> Index: gcc/fortran/gfortran.texi
>> ===================================================================
>> --- gcc/fortran/gfortran.texi	(Revision 120520)
>> +++ gcc/fortran/gfortran.texi	(Arbeitskopie)
>> @@ -367,8 +367,8 @@
>>  Fortran) for each file in the source code, and then calls the assembler
>>  and linker as appropriate to produce the compiled output. In a copy of
>>  GCC which has been compiled with Fortran language support enabled,
>> -@command{gcc} will recognize files with @file{.f}, @file{.f90}, and
>> -@file{.f95} extensions as Fortran source code, and compile it
>> +@command{gcc} will recognize files with @file{.f}, @file{.f90}, @file{.f95},
>> +and @file{.f03} extensions as Fortran source code, and compile it
>>  accordingly.  A @command{gfortran} driver program is also provided,
>>  which is identical to @command{gcc} except that it automatically links
>>  the Fortran runtime libraries into the compiled program.
>> Index: gcc/fortran/options.c
>> ===================================================================
>> --- gcc/fortran/options.c	(Revision 120520)
>> +++ gcc/fortran/options.c	(Arbeitskopie)
>> @@ -137,6 +138,9 @@
>>      ".f95", FORM_FREE}
>>      ,
>>      {
>> +    ".f03", FORM_FREE}
>> +    ,
>> +    {
>>      ".f", FORM_FIXED}
>>      ,
>>      {
>> Index: gcc/fortran/lang-specs.h
>> ===================================================================
>> --- gcc/fortran/lang-specs.h	(Revision 120520)
>> +++ gcc/fortran/lang-specs.h	(Arbeitskopie)
>> @@ -18,6 +18,7 @@
>>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>>  {".F90", "@f95-cpp-input", 0, 0, 0},
>>  {".F95", "@f95-cpp-input", 0, 0, 0},
>> +{".F03", "@f95-cpp-input", 0, 0, 0},
>>  {"@f95-cpp-input",
>>    "cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) \
>>        %{E|M|MM:%(cpp_debug_options)}\
>> @@ -26,6 +27,7 @@
>>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>>  {".f90", "@f95", 0, 0, 0},
>>  {".f95", "@f95", 0, 0, 0},
>> +{".f03", "@f95", 0, 0, 0},
>>  {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
>>           %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
>>  {".f",   "@f77", 0, 0, 0},
>>   
>>     

[-- Attachment #2: f03-testsuite.diff --]
[-- Type: text/x-patch, Size: 2892 bytes --]

2007-01-17  Tobias Burnus  <burnus@net-b.de>

	* gfortran.dg/gomp/gomp.exp: Support .f03 extension.
	* gfortran.dg/vect/vect.exp: Ditto.
	* gfortran.dg/dg.exp: Ditto.
	* gfortran.fortran-torture/execute/execute.exp: Ditto.
	* gfortran.fortran-torture/compile/compile.exp: Ditto.

Index: gcc/testsuite/gfortran.dg/gomp/gomp.exp
===================================================================
--- gcc/testsuite/gfortran.dg/gomp/gomp.exp	(revision 120854)
+++ gcc/testsuite/gfortran.dg/gomp/gomp.exp	(working copy)
@@ -12,7 +12,7 @@
 
 # Main loop.
 gfortran-dg-runtest [lsort \
-       [find $srcdir/$subdir *.\[fF\]{,90,95} ] ] " -fopenmp"
+       [find $srcdir/$subdir *.\[fF\]{,90,95,03} ] ] " -fopenmp"
 
 # All done.
 dg-finish
Index: gcc/testsuite/gfortran.dg/vect/vect.exp
===================================================================
--- gcc/testsuite/gfortran.dg/vect/vect.exp	(revision 120854)
+++ gcc/testsuite/gfortran.dg/vect/vect.exp	(working copy)
@@ -90,7 +90,7 @@
 dg-init
 
 # Main loop.
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ]] $DEFAULT_VECTCFLAGS
+gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ]] $DEFAULT_VECTCFLAGS
 
 # Clean up.
 set dg-do-what-default ${save-dg-do-what-default}
Index: gcc/testsuite/gfortran.dg/dg.exp
===================================================================
--- gcc/testsuite/gfortran.dg/dg.exp	(revision 120854)
+++ gcc/testsuite/gfortran.dg/dg.exp	(working copy)
@@ -30,7 +30,7 @@
 
 # Main loop.
 gfortran-dg-runtest [lsort \
-       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ] ] $DEFAULT_FFLAGS
+       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ] ] $DEFAULT_FFLAGS
 
 gfortran-dg-runtest [lsort \
        [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] $DEFAULT_FFLAGS
Index: gcc/testsuite/gfortran.fortran-torture/execute/execute.exp
===================================================================
--- gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	(revision 120854)
+++ gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	(working copy)
@@ -57,3 +57,9 @@
     fortran-torture-execute $testcase
 }
 
+foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
+    if ![runtest_file_p $runtests $testcase] then {
+	continue
+    }
+    fortran-torture-execute $testcase
+}
Index: gcc/testsuite/gfortran.fortran-torture/compile/compile.exp
===================================================================
--- gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	(revision 120854)
+++ gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	(working copy)
@@ -53,3 +53,9 @@
     fortran-torture $testcase
 }
 
+foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f95]] {
+    if ![runtest_file_p $runtests $testcase] then {
+	continue
+    }
+    fortran-torture $testcase
+}

Re: [patch, fortran] Support .F03 and .f03 file extensions

[FX Coudert]

> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>
> 	* gfortran.dg/gomp/gomp.exp: Support .f03 extension.
> 	* gfortran.dg/vect/vect.exp: Ditto.
> 	* gfortran.dg/dg.exp: Ditto.
> 	* gfortran.fortran-torture/execute/execute.exp: Ditto.
> 	* gfortran.fortran-torture/compile/compile.exp: Ditto.

OK for mainline (and for 4.2 if you backport the .f03 support patch),  
with one detail: I'd also like you to add .f03 to libgomp/testsuite/ 
libgomp.fortran/fortran.exp, for consistency. Please add this bit and  
regtest, then send the final patch to Richard Henderson  
(rth@redhat.com) for him to approve the libgomp part.

Thanks,
FX

Re: [patch, fortran] Support .F03 and .f03 file extensions

[Tobias Burnus]

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

FX Coudert wrote:
> OK for mainline (and for 4.2 if you backport the .f03 support patch),
> with one detail: I'd also like you to add .f03 to
> libgomp/testsuite/libgomp.fortran/fortran.exp, for consistency.
Attached is the updated patch.

Tobias

[-- Attachment #2: f03a.diff --]
[-- Type: text/x-patch, Size: 6007 bytes --]

fortran/
2007-01-17  Tobias Burnus  <burnus@net-b.de>

	* lang-specs.h: Add support for .f03 and .F03 extensions.
	* gfortran.texi: Document .f03 extension.
	* options.c (form_from_filename): Recognize .f03.

testsuite/
2007-01-17  Tobias Burnus  <burnus@net-b.de>

        * gfortran.dg/gomp/gomp.exp: Support .f03 extension.
        * gfortran.dg/vect/vect.exp: Ditto.
        * gfortran.dg/dg.exp: Ditto.
        * gfortran.fortran-torture/execute/execute.exp: Ditto.
        * gfortran.fortran-torture/compile/compile.exp: Ditto.

libgomp/
2007-01-17  Tobias Burnus  <burnus@net-b.de>

	* testsuite/libgomp.fortran/fortran.exp: Support .f03 extension.

Index: libgomp/testsuite/libgomp.fortran/fortran.exp
===================================================================
--- libgomp/testsuite/libgomp.fortran/fortran.exp	(revision 120865)
+++ libgomp/testsuite/libgomp.fortran/fortran.exp	(working copy)
@@ -10,7 +10,7 @@
 if [file exists "${blddir}/${lang_test_file}"] {
 
     # Gather a list of all tests.
-    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95}]]
+    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03}]]
 
     # Main loop.
     gfortran-dg-runtest $tests ""
Index: gcc/testsuite/gfortran.fortran-torture/execute/execute.exp
===================================================================
--- gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	(revision 120865)
+++ gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	(working copy)
@@ -57,3 +57,9 @@
     fortran-torture-execute $testcase
 }
 
+foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
+    if ![runtest_file_p $runtests $testcase] then {
+	continue
+    }
+    fortran-torture-execute $testcase
+}
Index: gcc/testsuite/gfortran.fortran-torture/compile/compile.exp
===================================================================
--- gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	(revision 120865)
+++ gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	(working copy)
@@ -53,3 +53,9 @@
     fortran-torture $testcase
 }
 
+foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
+    if ![runtest_file_p $runtests $testcase] then {
+	continue
+    }
+    fortran-torture $testcase
+}
Index: gcc/testsuite/gfortran.dg/gomp/gomp.exp
===================================================================
--- gcc/testsuite/gfortran.dg/gomp/gomp.exp	(revision 120865)
+++ gcc/testsuite/gfortran.dg/gomp/gomp.exp	(working copy)
@@ -12,7 +12,7 @@
 
 # Main loop.
 gfortran-dg-runtest [lsort \
-       [find $srcdir/$subdir *.\[fF\]{,90,95} ] ] " -fopenmp"
+       [find $srcdir/$subdir *.\[fF\]{,90,95,03} ] ] " -fopenmp"
 
 # All done.
 dg-finish
Index: gcc/testsuite/gfortran.dg/dg.exp
===================================================================
--- gcc/testsuite/gfortran.dg/dg.exp	(revision 120865)
+++ gcc/testsuite/gfortran.dg/dg.exp	(working copy)
@@ -30,7 +30,7 @@
 
 # Main loop.
 gfortran-dg-runtest [lsort \
-       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ] ] $DEFAULT_FFLAGS
+       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ] ] $DEFAULT_FFLAGS
 
 gfortran-dg-runtest [lsort \
        [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] $DEFAULT_FFLAGS
Index: gcc/testsuite/gfortran.dg/vect/vect.exp
===================================================================
--- gcc/testsuite/gfortran.dg/vect/vect.exp	(revision 120865)
+++ gcc/testsuite/gfortran.dg/vect/vect.exp	(working copy)
@@ -90,7 +90,7 @@
 dg-init
 
 # Main loop.
-gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ]] $DEFAULT_VECTCFLAGS
+gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ]] $DEFAULT_VECTCFLAGS
 
 # Clean up.
 set dg-do-what-default ${save-dg-do-what-default}
Index: gcc/fortran/gfortran.texi
===================================================================
--- gcc/fortran/gfortran.texi	(revision 120865)
+++ gcc/fortran/gfortran.texi	(working copy)
@@ -367,8 +367,8 @@
 Fortran) for each file in the source code, and then calls the assembler
 and linker as appropriate to produce the compiled output. In a copy of
 GCC which has been compiled with Fortran language support enabled,
-@command{gcc} will recognize files with @file{.f}, @file{.f90}, and
-@file{.f95} extensions as Fortran source code, and compile it
+@command{gcc} will recognize files with @file{.f}, @file{.f90}, @file{.f95},
+and @file{.f03} extensions as Fortran source code, and compile it
 accordingly.  A @command{gfortran} driver program is also provided,
 which is identical to @command{gcc} except that it automatically links
 the Fortran runtime libraries into the compiled program.
Index: gcc/fortran/options.c
===================================================================
--- gcc/fortran/options.c	(revision 120865)
+++ gcc/fortran/options.c	(working copy)
@@ -138,6 +139,9 @@
     ".f95", FORM_FREE}
     ,
     {
+    ".f03", FORM_FREE}
+    ,
+    {
     ".f", FORM_FIXED}
     ,
     {
Index: gcc/fortran/lang-specs.h
===================================================================
--- gcc/fortran/lang-specs.h	(revision 120865)
+++ gcc/fortran/lang-specs.h	(working copy)
@@ -18,6 +18,7 @@
       -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
 {".F90", "@f95-cpp-input", 0, 0, 0},
 {".F95", "@f95-cpp-input", 0, 0, 0},
+{".F03", "@f95-cpp-input", 0, 0, 0},
 {"@f95-cpp-input",
   "cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) \
       %{E|M|MM:%(cpp_debug_options)}\
@@ -26,6 +27,7 @@
       -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
 {".f90", "@f95", 0, 0, 0},
 {".f95", "@f95", 0, 0, 0},
+{".f03", "@f95", 0, 0, 0},
 {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
          %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
 {".f",   "@f77", 0, 0, 0},

Re: [patch, fortran] Support .F03 and .f03 file extensions

[Tobias Burnus]

Hi again,

Tobias Burnus wrote:
> FX Coudert wrote:
>   
>> OK for mainline (and for 4.2 if you backport the .f03 support patch),
>> with one detail: I'd also like you to add .f03 to
>> libgomp/testsuite/libgomp.fortran/fortran.exp, for consistency.
>>     
Forget to write: Bootstrapped on x86_64-unknown-linux-gnu (openSUSE
10.2) with --enable-languages=c,fortran.
Bootstrapped and run make -k check with no gfortran/gomp errors.

Tobias

For the record:

- gfortran:
# of expected passes            15990
# of expected failures          7
# of unsupported tests          17

- libgomp:
# of expected passes            1227

- libmudflap
# of expected passes            1686
# of unexpected failures        6
# of unsupported tests          2
FAIL: libmudflap.c/fail8-frag.c (-static) output pattern test
FAIL: libmudflap.c/fail9-frag.c (-static) output pattern test
FAIL: libmudflap.cth/pass59-frag.c (test for excess errors)
FAIL: libmudflap.cth/pass59-frag.c (-static -DSTATIC) (test for excess
errors)
FAIL: libmudflap.cth/pass59-frag.c (-O2) (test for excess errors)
FAIL: libmudflap.cth/pass59-frag.c (-O3) (test for excess errors)

- gcc
# of expected passes            42631
# of unexpected failures        18
# of unexpected successes       2
# of expected failures          119
# of unresolved testcases       2
# of untested testcases         28
# of unsupported tests          408
FAIL: gcc.c-torture/execute/mayalias-2.c compilation,  -O3 -g  (internal
compiler error)
FAIL: gcc.c-torture/execute/mayalias-3.c compilation,  -O3 -g  (internal
compiler error)
FAIL: gcc.dg/ipa/ipa-1.c (internal compiler error)
FAIL: gcc.dg/ipa/ipa-1.c (test for excess errors)
FAIL: gcc.dg/ipa/ipa-1.c scan-ipa-dump-times versioned function 2
FAIL: gcc.dg/ipa/ipa-1.c scan-ipa-dump-times propagating const 2
FAIL: gcc.dg/ipa/ipa-2.c (internal compiler error)
FAIL: gcc.dg/ipa/ipa-2.c (test for excess errors)
FAIL: gcc.dg/ipa/ipa-3.c (internal compiler error)
FAIL: gcc.dg/ipa/ipa-3.c (test for excess errors)
FAIL: gcc.dg/ipa/ipa-3.c scan-ipa-dump-times propagating const 3
FAIL: gcc.dg/ipa/ipa-4.c (internal compiler error)
FAIL: gcc.dg/ipa/ipa-4.c (test for excess errors)
FAIL: gcc.dg/ipa/ipa-5.c (internal compiler error)
FAIL: gcc.dg/ipa/ipa-5.c (test for excess errors)
FAIL: gcc.dg/ipa/ipa-6.c (internal compiler error)
FAIL: gcc.dg/ipa/ipa-6.c (test for excess errors)
FAIL: gcc.dg/tree-ssa/loadpre1.c scan-tree-dump-times Eliminated: 1 1

Re: [patch, fortran] Support .F03 and .f03 file extensions

[Tobias Burnus]

*Ping*


Tobias Burnus wrote:
> FX Coudert wrote:
>> OK for mainline (and for 4.2 if you backport the .f03 support patch),
>> with one detail: I'd also like you to add .f03 to
>> libgomp/testsuite/libgomp.fortran/fortran.exp, for consistency. Please
>> add this bit and regtest, then send the final patch to Richard
>> Henderson (rth@redhat.com) for him to approve the libgomp part.
>>     
> Attached is the updated patch.
>
> Tobias
>   
Tobias Burnus wrote:
> Forget to write: Bootstrapped on x86_64-unknown-linux-gnu (openSUSE
> 10.2) with --enable-languages=c,fortran.
> Bootstrapped and run make -k check with no gfortran/gomp errors.

> fortran/
> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>
> 	* lang-specs.h: Add support for .f03 and .F03 extensions.
> 	* gfortran.texi: Document .f03 extension.
> 	* options.c (form_from_filename): Recognize .f03.
>
> testsuite/
> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>
>         * gfortran.dg/gomp/gomp.exp: Support .f03 extension.
>         * gfortran.dg/vect/vect.exp: Ditto.
>         * gfortran.dg/dg.exp: Ditto.
>         * gfortran.fortran-torture/execute/execute.exp: Ditto.
>         * gfortran.fortran-torture/compile/compile.exp: Ditto.
>
> libgomp/
> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>
> 	* testsuite/libgomp.fortran/fortran.exp: Support .f03 extension.
>
> Index: libgomp/testsuite/libgomp.fortran/fortran.exp
> ===================================================================
> --- libgomp/testsuite/libgomp.fortran/fortran.exp	(revision 120865)
> +++ libgomp/testsuite/libgomp.fortran/fortran.exp	(working copy)
> @@ -10,7 +10,7 @@
>  if [file exists "${blddir}/${lang_test_file}"] {
>  
>      # Gather a list of all tests.
> -    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95}]]
> +    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03}]]
>  
>      # Main loop.
>      gfortran-dg-runtest $tests ""
> Index: gcc/testsuite/gfortran.fortran-torture/execute/execute.exp
> ===================================================================
> --- gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	(revision 120865)
> +++ gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	(working copy)
> @@ -57,3 +57,9 @@
>      fortran-torture-execute $testcase
>  }
>  
> +foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
> +    if ![runtest_file_p $runtests $testcase] then {
> +	continue
> +    }
> +    fortran-torture-execute $testcase
> +}
> Index: gcc/testsuite/gfortran.fortran-torture/compile/compile.exp
> ===================================================================
> --- gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	(revision 120865)
> +++ gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	(working copy)
> @@ -53,3 +53,9 @@
>      fortran-torture $testcase
>  }
>  
> +foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
> +    if ![runtest_file_p $runtests $testcase] then {
> +	continue
> +    }
> +    fortran-torture $testcase
> +}
> Index: gcc/testsuite/gfortran.dg/gomp/gomp.exp
> ===================================================================
> --- gcc/testsuite/gfortran.dg/gomp/gomp.exp	(revision 120865)
> +++ gcc/testsuite/gfortran.dg/gomp/gomp.exp	(working copy)
> @@ -12,7 +12,7 @@
>  
>  # Main loop.
>  gfortran-dg-runtest [lsort \
> -       [find $srcdir/$subdir *.\[fF\]{,90,95} ] ] " -fopenmp"
> +       [find $srcdir/$subdir *.\[fF\]{,90,95,03} ] ] " -fopenmp"
>  
>  # All done.
>  dg-finish
> Index: gcc/testsuite/gfortran.dg/dg.exp
> ===================================================================
> --- gcc/testsuite/gfortran.dg/dg.exp	(revision 120865)
> +++ gcc/testsuite/gfortran.dg/dg.exp	(working copy)
> @@ -30,7 +30,7 @@
>  
>  # Main loop.
>  gfortran-dg-runtest [lsort \
> -       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ] ] $DEFAULT_FFLAGS
> +       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ] ] $DEFAULT_FFLAGS
>  
>  gfortran-dg-runtest [lsort \
>         [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] $DEFAULT_FFLAGS
> Index: gcc/testsuite/gfortran.dg/vect/vect.exp
> ===================================================================
> --- gcc/testsuite/gfortran.dg/vect/vect.exp	(revision 120865)
> +++ gcc/testsuite/gfortran.dg/vect/vect.exp	(working copy)
> @@ -90,7 +90,7 @@
>  dg-init
>  
>  # Main loop.
> -gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ]] $DEFAULT_VECTCFLAGS
> +gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ]] $DEFAULT_VECTCFLAGS
>  
>  # Clean up.
>  set dg-do-what-default ${save-dg-do-what-default}
> Index: gcc/fortran/gfortran.texi
> ===================================================================
> --- gcc/fortran/gfortran.texi	(revision 120865)
> +++ gcc/fortran/gfortran.texi	(working copy)
> @@ -367,8 +367,8 @@
>  Fortran) for each file in the source code, and then calls the assembler
>  and linker as appropriate to produce the compiled output. In a copy of
>  GCC which has been compiled with Fortran language support enabled,
> -@command{gcc} will recognize files with @file{.f}, @file{.f90}, and
> -@file{.f95} extensions as Fortran source code, and compile it
> +@command{gcc} will recognize files with @file{.f}, @file{.f90}, @file{.f95},
> +and @file{.f03} extensions as Fortran source code, and compile it
>  accordingly.  A @command{gfortran} driver program is also provided,
>  which is identical to @command{gcc} except that it automatically links
>  the Fortran runtime libraries into the compiled program.
> Index: gcc/fortran/options.c
> ===================================================================
> --- gcc/fortran/options.c	(revision 120865)
> +++ gcc/fortran/options.c	(working copy)
> @@ -138,6 +139,9 @@
>      ".f95", FORM_FREE}
>      ,
>      {
> +    ".f03", FORM_FREE}
> +    ,
> +    {
>      ".f", FORM_FIXED}
>      ,
>      {
> Index: gcc/fortran/lang-specs.h
> ===================================================================
> --- gcc/fortran/lang-specs.h	(revision 120865)
> +++ gcc/fortran/lang-specs.h	(working copy)
> @@ -18,6 +18,7 @@
>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>  {".F90", "@f95-cpp-input", 0, 0, 0},
>  {".F95", "@f95-cpp-input", 0, 0, 0},
> +{".F03", "@f95-cpp-input", 0, 0, 0},
>  {"@f95-cpp-input",
>    "cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) \
>        %{E|M|MM:%(cpp_debug_options)}\
> @@ -26,6 +27,7 @@
>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>  {".f90", "@f95", 0, 0, 0},
>  {".f95", "@f95", 0, 0, 0},
> +{".f03", "@f95", 0, 0, 0},
>  {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
>           %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
>  {".f",   "@f77", 0, 0, 0},
>   

Re: [patch, fortran] Support .F03 and .f03 file extensions

[Andrew Pinski]

> 
> *Ping*

One idea is also to make sure you updated the documentation to include .f03
if you have not already.

-- Pinski

Re: [patch, fortran] Support .F03 and .f03 file extensions

[Brooks Moses]

Tobias Burnus wrote:
> *Ping*

Personally, I'd say that if Richard doesn't comment within a few days, 
you should go ahead and commit this, considering the libgomp part to be 
obvious.  (Note that FX has already approved the rest of it, so there's 
no need to ping that part.)

- Brooks


> Tobias Burnus wrote:
>> FX Coudert wrote:
>>> OK for mainline (and for 4.2 if you backport the .f03 support patch),
>>> with one detail: I'd also like you to add .f03 to
>>> libgomp/testsuite/libgomp.fortran/fortran.exp, for consistency. Please
>>> add this bit and regtest, then send the final patch to Richard
>>> Henderson (rth@redhat.com) for him to approve the libgomp part.
>>>     
>> Attached is the updated patch.
>>
>> Tobias
>>   
> Tobias Burnus wrote:
>> Forget to write: Bootstrapped on x86_64-unknown-linux-gnu (openSUSE
>> 10.2) with --enable-languages=c,fortran.
>> Bootstrapped and run make -k check with no gfortran/gomp errors.
> 
>> fortran/
>> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>>
>> 	* lang-specs.h: Add support for .f03 and .F03 extensions.
>> 	* gfortran.texi: Document .f03 extension.
>> 	* options.c (form_from_filename): Recognize .f03.
>>
>> testsuite/
>> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>>
>>         * gfortran.dg/gomp/gomp.exp: Support .f03 extension.
>>         * gfortran.dg/vect/vect.exp: Ditto.
>>         * gfortran.dg/dg.exp: Ditto.
>>         * gfortran.fortran-torture/execute/execute.exp: Ditto.
>>         * gfortran.fortran-torture/compile/compile.exp: Ditto.
>>
>> libgomp/
>> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>>
>> 	* testsuite/libgomp.fortran/fortran.exp: Support .f03 extension.
>>
>> Index: libgomp/testsuite/libgomp.fortran/fortran.exp
>> ===================================================================
>> --- libgomp/testsuite/libgomp.fortran/fortran.exp	(revision 120865)
>> +++ libgomp/testsuite/libgomp.fortran/fortran.exp	(working copy)
>> @@ -10,7 +10,7 @@
>>  if [file exists "${blddir}/${lang_test_file}"] {
>>  
>>      # Gather a list of all tests.
>> -    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95}]]
>> +    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03}]]
>>  
>>      # Main loop.
>>      gfortran-dg-runtest $tests ""
>> Index: gcc/testsuite/gfortran.fortran-torture/execute/execute.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	(revision 120865)
>> +++ gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	(working copy)
>> @@ -57,3 +57,9 @@
>>      fortran-torture-execute $testcase
>>  }
>>  
>> +foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
>> +    if ![runtest_file_p $runtests $testcase] then {
>> +	continue
>> +    }
>> +    fortran-torture-execute $testcase
>> +}
>> Index: gcc/testsuite/gfortran.fortran-torture/compile/compile.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	(revision 120865)
>> +++ gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	(working copy)
>> @@ -53,3 +53,9 @@
>>      fortran-torture $testcase
>>  }
>>  
>> +foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
>> +    if ![runtest_file_p $runtests $testcase] then {
>> +	continue
>> +    }
>> +    fortran-torture $testcase
>> +}
>> Index: gcc/testsuite/gfortran.dg/gomp/gomp.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.dg/gomp/gomp.exp	(revision 120865)
>> +++ gcc/testsuite/gfortran.dg/gomp/gomp.exp	(working copy)
>> @@ -12,7 +12,7 @@
>>  
>>  # Main loop.
>>  gfortran-dg-runtest [lsort \
>> -       [find $srcdir/$subdir *.\[fF\]{,90,95} ] ] " -fopenmp"
>> +       [find $srcdir/$subdir *.\[fF\]{,90,95,03} ] ] " -fopenmp"
>>  
>>  # All done.
>>  dg-finish
>> Index: gcc/testsuite/gfortran.dg/dg.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.dg/dg.exp	(revision 120865)
>> +++ gcc/testsuite/gfortran.dg/dg.exp	(working copy)
>> @@ -30,7 +30,7 @@
>>  
>>  # Main loop.
>>  gfortran-dg-runtest [lsort \
>> -       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ] ] $DEFAULT_FFLAGS
>> +       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ] ] $DEFAULT_FFLAGS
>>  
>>  gfortran-dg-runtest [lsort \
>>         [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] $DEFAULT_FFLAGS
>> Index: gcc/testsuite/gfortran.dg/vect/vect.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.dg/vect/vect.exp	(revision 120865)
>> +++ gcc/testsuite/gfortran.dg/vect/vect.exp	(working copy)
>> @@ -90,7 +90,7 @@
>>  dg-init
>>  
>>  # Main loop.
>> -gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ]] $DEFAULT_VECTCFLAGS
>> +gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ]] $DEFAULT_VECTCFLAGS
>>  
>>  # Clean up.
>>  set dg-do-what-default ${save-dg-do-what-default}
>> Index: gcc/fortran/gfortran.texi
>> ===================================================================
>> --- gcc/fortran/gfortran.texi	(revision 120865)
>> +++ gcc/fortran/gfortran.texi	(working copy)
>> @@ -367,8 +367,8 @@
>>  Fortran) for each file in the source code, and then calls the assembler
>>  and linker as appropriate to produce the compiled output. In a copy of
>>  GCC which has been compiled with Fortran language support enabled,
>> -@command{gcc} will recognize files with @file{.f}, @file{.f90}, and
>> -@file{.f95} extensions as Fortran source code, and compile it
>> +@command{gcc} will recognize files with @file{.f}, @file{.f90}, @file{.f95},
>> +and @file{.f03} extensions as Fortran source code, and compile it
>>  accordingly.  A @command{gfortran} driver program is also provided,
>>  which is identical to @command{gcc} except that it automatically links
>>  the Fortran runtime libraries into the compiled program.
>> Index: gcc/fortran/options.c
>> ===================================================================
>> --- gcc/fortran/options.c	(revision 120865)
>> +++ gcc/fortran/options.c	(working copy)
>> @@ -138,6 +139,9 @@
>>      ".f95", FORM_FREE}
>>      ,
>>      {
>> +    ".f03", FORM_FREE}
>> +    ,
>> +    {
>>      ".f", FORM_FIXED}
>>      ,
>>      {
>> Index: gcc/fortran/lang-specs.h
>> ===================================================================
>> --- gcc/fortran/lang-specs.h	(revision 120865)
>> +++ gcc/fortran/lang-specs.h	(working copy)
>> @@ -18,6 +18,7 @@
>>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>>  {".F90", "@f95-cpp-input", 0, 0, 0},
>>  {".F95", "@f95-cpp-input", 0, 0, 0},
>> +{".F03", "@f95-cpp-input", 0, 0, 0},
>>  {"@f95-cpp-input",
>>    "cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) \
>>        %{E|M|MM:%(cpp_debug_options)}\
>> @@ -26,6 +27,7 @@
>>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>>  {".f90", "@f95", 0, 0, 0},
>>  {".f95", "@f95", 0, 0, 0},
>> +{".f03", "@f95", 0, 0, 0},
>>  {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
>>           %{!nostdinc:-fintrinsic-modules-path finclude%s} %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
>>  {".f",   "@f77", 0, 0, 0},
>>   
> 
> 

Re: [patch, fortran] Support .F03 and .f03 file extensions

[FX Coudert]

Hi Tobias,

I don't know if you commited this patch yet, but perhaps Jakub could  
do his first approval as libgomp maintainer on this one?

FX



My review mail was:

>>> OK for mainline (and for 4.2 if you backport the .f03 support  
>>> patch),
>>> with one detail: I'd also like you to add .f03 to
>>> libgomp/testsuite/libgomp.fortran/fortran.exp, for consistency.  
>>> Please
>>> add this bit and regtest, then send the final patch to Richard
>>> Henderson (rth@redhat.com) for him to approve the libgomp part.

The patch was:

>> Bootstrapped on x86_64-unknown-linux-gnu (openSUSE
>> 10.2) with --enable-languages=c,fortran.
>> Bootstrapped and run make -k check with no gfortran/gomp errors.
>
>> fortran/
>> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>>
>> 	* lang-specs.h: Add support for .f03 and .F03 extensions.
>> 	* gfortran.texi: Document .f03 extension.
>> 	* options.c (form_from_filename): Recognize .f03.
>>
>> testsuite/
>> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>>
>>         * gfortran.dg/gomp/gomp.exp: Support .f03 extension.
>>         * gfortran.dg/vect/vect.exp: Ditto.
>>         * gfortran.dg/dg.exp: Ditto.
>>         * gfortran.fortran-torture/execute/execute.exp: Ditto.
>>         * gfortran.fortran-torture/compile/compile.exp: Ditto.
>>
>> libgomp/
>> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>>
>> 	* testsuite/libgomp.fortran/fortran.exp: Support .f03 extension.
>>
>> Index: libgomp/testsuite/libgomp.fortran/fortran.exp
>> ===================================================================
>> --- libgomp/testsuite/libgomp.fortran/fortran.exp	(revision 120865)
>> +++ libgomp/testsuite/libgomp.fortran/fortran.exp	(working copy)
>> @@ -10,7 +10,7 @@
>>  if [file exists "${blddir}/${lang_test_file}"] {
>>
>>      # Gather a list of all tests.
>> -    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95}]]
>> +    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03}]]
>>
>>      # Main loop.
>>      gfortran-dg-runtest $tests ""
>> Index: gcc/testsuite/gfortran.fortran-torture/execute/execute.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	 
>> (revision 120865)
>> +++ gcc/testsuite/gfortran.fortran-torture/execute/execute.exp	 
>> (working copy)
>> @@ -57,3 +57,9 @@
>>      fortran-torture-execute $testcase
>>  }
>>
>> +foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
>> +    if ![runtest_file_p $runtests $testcase] then {
>> +	continue
>> +    }
>> +    fortran-torture-execute $testcase
>> +}
>> Index: gcc/testsuite/gfortran.fortran-torture/compile/compile.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	 
>> (revision 120865)
>> +++ gcc/testsuite/gfortran.fortran-torture/compile/compile.exp	 
>> (working copy)
>> @@ -53,3 +53,9 @@
>>      fortran-torture $testcase
>>  }
>>
>> +foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
>> +    if ![runtest_file_p $runtests $testcase] then {
>> +	continue
>> +    }
>> +    fortran-torture $testcase
>> +}
>> Index: gcc/testsuite/gfortran.dg/gomp/gomp.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.dg/gomp/gomp.exp	(revision 120865)
>> +++ gcc/testsuite/gfortran.dg/gomp/gomp.exp	(working copy)
>> @@ -12,7 +12,7 @@
>>
>>  # Main loop.
>>  gfortran-dg-runtest [lsort \
>> -       [find $srcdir/$subdir *.\[fF\]{,90,95} ] ] " -fopenmp"
>> +       [find $srcdir/$subdir *.\[fF\]{,90,95,03} ] ] " -fopenmp"
>>
>>  # All done.
>>  dg-finish
>> Index: gcc/testsuite/gfortran.dg/dg.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.dg/dg.exp	(revision 120865)
>> +++ gcc/testsuite/gfortran.dg/dg.exp	(working copy)
>> @@ -30,7 +30,7 @@
>>
>>  # Main loop.
>>  gfortran-dg-runtest [lsort \
>> -       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ] ]  
>> $DEFAULT_FFLAGS
>> +       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ] ]  
>> $DEFAULT_FFLAGS
>>
>>  gfortran-dg-runtest [lsort \
>>         [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ]  
>> $DEFAULT_FFLAGS
>> Index: gcc/testsuite/gfortran.dg/vect/vect.exp
>> ===================================================================
>> --- gcc/testsuite/gfortran.dg/vect/vect.exp	(revision 120865)
>> +++ gcc/testsuite/gfortran.dg/vect/vect.exp	(working copy)
>> @@ -90,7 +90,7 @@
>>  dg-init
>>
>>  # Main loop.
>> -gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\ 
>> [fF\]{,90,95} ]] $DEFAULT_VECTCFLAGS
>> +gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\ 
>> [fF\]{,90,95,03} ]] $DEFAULT_VECTCFLAGS
>>
>>  # Clean up.
>>  set dg-do-what-default ${save-dg-do-what-default}
>> Index: gcc/fortran/gfortran.texi
>> ===================================================================
>> --- gcc/fortran/gfortran.texi	(revision 120865)
>> +++ gcc/fortran/gfortran.texi	(working copy)
>> @@ -367,8 +367,8 @@
>>  Fortran) for each file in the source code, and then calls the  
>> assembler
>>  and linker as appropriate to produce the compiled output. In a  
>> copy of
>>  GCC which has been compiled with Fortran language support enabled,
>> -@command{gcc} will recognize files with @file{.f}, @file{.f90}, and
>> -@file{.f95} extensions as Fortran source code, and compile it
>> +@command{gcc} will recognize files with @file{.f}, @file{.f90},  
>> @file{.f95},
>> +and @file{.f03} extensions as Fortran source code, and compile it
>>  accordingly.  A @command{gfortran} driver program is also provided,
>>  which is identical to @command{gcc} except that it automatically  
>> links
>>  the Fortran runtime libraries into the compiled program.
>> Index: gcc/fortran/options.c
>> ===================================================================
>> --- gcc/fortran/options.c	(revision 120865)
>> +++ gcc/fortran/options.c	(working copy)
>> @@ -138,6 +139,9 @@
>>      ".f95", FORM_FREE}
>>      ,
>>      {
>> +    ".f03", FORM_FREE}
>> +    ,
>> +    {
>>      ".f", FORM_FIXED}
>>      ,
>>      {
>> Index: gcc/fortran/lang-specs.h
>> ===================================================================
>> --- gcc/fortran/lang-specs.h	(revision 120865)
>> +++ gcc/fortran/lang-specs.h	(working copy)
>> @@ -18,6 +18,7 @@
>>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude 
>> %s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>>  {".F90", "@f95-cpp-input", 0, 0, 0},
>>  {".F95", "@f95-cpp-input", 0, 0, 0},
>> +{".F03", "@f95-cpp-input", 0, 0, 0},
>>  {"@f95-cpp-input",
>>    "cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN % 
>> (cpp_options) \
>>        %{E|M|MM:%(cpp_debug_options)}\
>> @@ -26,6 +27,7 @@
>>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path finclude 
>> %s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>>  {".f90", "@f95", 0, 0, 0},
>>  {".f95", "@f95", 0, 0, 0},
>> +{".f03", "@f95", 0, 0, 0},
>>  {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
>>           %{!nostdinc:-fintrinsic-modules-path finclude%s} %{! 
>> fsyntax-only:%(invoke_as)}}", 0, 0, 0},
>>  {".f",   "@f77", 0, 0, 0},
>>
>

Re: [patch, fortran] Support .F03 and .f03 file extensions

[Tobias Burnus]

Hi FX, hi Jakub, hi all,

FX Coudert wrote:
> I don't know if you commited this patch yet, but perhaps Jakub could
> do his first approval as libgomp maintainer on this one?
No, I didn't. Actually, I wanted to ping Richard Henderson today, but
now I wait for Jakub instead ;-)

Tobias

> My review mail was:
>
>>>> OK for mainline (and for 4.2 if you backport the .f03 support patch),
>>>> with one detail: I'd also like you to add .f03 to
>>>> libgomp/testsuite/libgomp.fortran/fortran.exp, for consistency. Please
>>>> add this bit and regtest, then send the final patch to Richard
>>>> Henderson (rth@redhat.com) for him to approve the libgomp part.
>
> The patch was:
>
>>> Bootstrapped on x86_64-unknown-linux-gnu (openSUSE
>>> 10.2) with --enable-languages=c,fortran.
>>> Bootstrapped and run make -k check with no gfortran/gomp errors.
>>
>>> fortran/
>>> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>>>
>>>     * lang-specs.h: Add support for .f03 and .F03 extensions.
>>>     * gfortran.texi: Document .f03 extension.
>>>     * options.c (form_from_filename): Recognize .f03.
>>>
>>> testsuite/
>>> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>>>
>>>         * gfortran.dg/gomp/gomp.exp: Support .f03 extension.
>>>         * gfortran.dg/vect/vect.exp: Ditto.
>>>         * gfortran.dg/dg.exp: Ditto.
>>>         * gfortran.fortran-torture/execute/execute.exp: Ditto.
>>>         * gfortran.fortran-torture/compile/compile.exp: Ditto.
>>>
>>> libgomp/
>>> 2007-01-17  Tobias Burnus  <burnus@net-b.de>
>>>
>>>     * testsuite/libgomp.fortran/fortran.exp: Support .f03 extension.
>>>
>>> Index: libgomp/testsuite/libgomp.fortran/fortran.exp
>>> ===================================================================
>>> --- libgomp/testsuite/libgomp.fortran/fortran.exp    (revision 120865)
>>> +++ libgomp/testsuite/libgomp.fortran/fortran.exp    (working copy)
>>> @@ -10,7 +10,7 @@
>>>  if [file exists "${blddir}/${lang_test_file}"] {
>>>
>>>      # Gather a list of all tests.
>>> -    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95}]]
>>> +    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03}]]
>>>
>>>      # Main loop.
>>>      gfortran-dg-runtest $tests ""
>>> Index: gcc/testsuite/gfortran.fortran-torture/execute/execute.exp
>>> ===================================================================
>>> --- gcc/testsuite/gfortran.fortran-torture/execute/execute.exp   
>>> (revision 120865)
>>> +++ gcc/testsuite/gfortran.fortran-torture/execute/execute.exp   
>>> (working copy)
>>> @@ -57,3 +57,9 @@
>>>      fortran-torture-execute $testcase
>>>  }
>>>
>>> +foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
>>> +    if ![runtest_file_p $runtests $testcase] then {
>>> +    continue
>>> +    }
>>> +    fortran-torture-execute $testcase
>>> +}
>>> Index: gcc/testsuite/gfortran.fortran-torture/compile/compile.exp
>>> ===================================================================
>>> --- gcc/testsuite/gfortran.fortran-torture/compile/compile.exp   
>>> (revision 120865)
>>> +++ gcc/testsuite/gfortran.fortran-torture/compile/compile.exp   
>>> (working copy)
>>> @@ -53,3 +53,9 @@
>>>      fortran-torture $testcase
>>>  }
>>>
>>> +foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f03]] {
>>> +    if ![runtest_file_p $runtests $testcase] then {
>>> +    continue
>>> +    }
>>> +    fortran-torture $testcase
>>> +}
>>> Index: gcc/testsuite/gfortran.dg/gomp/gomp.exp
>>> ===================================================================
>>> --- gcc/testsuite/gfortran.dg/gomp/gomp.exp    (revision 120865)
>>> +++ gcc/testsuite/gfortran.dg/gomp/gomp.exp    (working copy)
>>> @@ -12,7 +12,7 @@
>>>
>>>  # Main loop.
>>>  gfortran-dg-runtest [lsort \
>>> -       [find $srcdir/$subdir *.\[fF\]{,90,95} ] ] " -fopenmp"
>>> +       [find $srcdir/$subdir *.\[fF\]{,90,95,03} ] ] " -fopenmp"
>>>
>>>  # All done.
>>>  dg-finish
>>> Index: gcc/testsuite/gfortran.dg/dg.exp
>>> ===================================================================
>>> --- gcc/testsuite/gfortran.dg/dg.exp    (revision 120865)
>>> +++ gcc/testsuite/gfortran.dg/dg.exp    (working copy)
>>> @@ -30,7 +30,7 @@
>>>
>>>  # Main loop.
>>>  gfortran-dg-runtest [lsort \
>>> -       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95} ] ]
>>> $DEFAULT_FFLAGS
>>> +       [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03} ] ]
>>> $DEFAULT_FFLAGS
>>>
>>>  gfortran-dg-runtest [lsort \
>>>         [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ]
>>> $DEFAULT_FFLAGS
>>> Index: gcc/testsuite/gfortran.dg/vect/vect.exp
>>> ===================================================================
>>> --- gcc/testsuite/gfortran.dg/vect/vect.exp    (revision 120865)
>>> +++ gcc/testsuite/gfortran.dg/vect/vect.exp    (working copy)
>>> @@ -90,7 +90,7 @@
>>>  dg-init
>>>
>>>  # Main loop.
>>> -gfortran-dg-runtest [lsort [glob -nocomplain
>>> $srcdir/$subdir/*.\[fF\]{,90,95} ]] $DEFAULT_VECTCFLAGS
>>> +gfortran-dg-runtest [lsort [glob -nocomplain
>>> $srcdir/$subdir/*.\[fF\]{,90,95,03} ]] $DEFAULT_VECTCFLAGS
>>>
>>>  # Clean up.
>>>  set dg-do-what-default ${save-dg-do-what-default}
>>> Index: gcc/fortran/gfortran.texi
>>> ===================================================================
>>> --- gcc/fortran/gfortran.texi    (revision 120865)
>>> +++ gcc/fortran/gfortran.texi    (working copy)
>>> @@ -367,8 +367,8 @@
>>>  Fortran) for each file in the source code, and then calls the
>>> assembler
>>>  and linker as appropriate to produce the compiled output. In a copy of
>>>  GCC which has been compiled with Fortran language support enabled,
>>> -@command{gcc} will recognize files with @file{.f}, @file{.f90}, and
>>> -@file{.f95} extensions as Fortran source code, and compile it
>>> +@command{gcc} will recognize files with @file{.f}, @file{.f90},
>>> @file{.f95},
>>> +and @file{.f03} extensions as Fortran source code, and compile it
>>>  accordingly.  A @command{gfortran} driver program is also provided,
>>>  which is identical to @command{gcc} except that it automatically links
>>>  the Fortran runtime libraries into the compiled program.
>>> Index: gcc/fortran/options.c
>>> ===================================================================
>>> --- gcc/fortran/options.c    (revision 120865)
>>> +++ gcc/fortran/options.c    (working copy)
>>> @@ -138,6 +139,9 @@
>>>      ".f95", FORM_FREE}
>>>      ,
>>>      {
>>> +    ".f03", FORM_FREE}
>>> +    ,
>>> +    {
>>>      ".f", FORM_FIXED}
>>>      ,
>>>      {
>>> Index: gcc/fortran/lang-specs.h
>>> ===================================================================
>>> --- gcc/fortran/lang-specs.h    (revision 120865)
>>> +++ gcc/fortran/lang-specs.h    (working copy)
>>> @@ -18,6 +18,7 @@
>>>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path
>>> finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>>>  {".F90", "@f95-cpp-input", 0, 0, 0},
>>>  {".F95", "@f95-cpp-input", 0, 0, 0},
>>> +{".F03", "@f95-cpp-input", 0, 0, 0},
>>>  {"@f95-cpp-input",
>>>    "cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN
>>> %(cpp_options) \
>>>        %{E|M|MM:%(cpp_debug_options)}\
>>> @@ -26,6 +27,7 @@
>>>        -fpreprocessed %{!nostdinc:-fintrinsic-modules-path
>>> finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
>>>  {".f90", "@f95", 0, 0, 0},
>>>  {".f95", "@f95", 0, 0, 0},
>>> +{".f03", "@f95", 0, 0, 0},
>>>  {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
>>>           %{!nostdinc:-fintrinsic-modules-path finclude%s}
>>> %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
>>>  {".f",   "@f77", 0, 0, 0},
>>>
>>
>
>

Re: [patch, fortran] Support .F03 and .f03 file extensions

[Jakub Jelinek]

On Wed, Jan 17, 2007 at 08:34:27PM +0100, Tobias Burnus wrote:
> FX Coudert wrote:
> > OK for mainline (and for 4.2 if you backport the .f03 support patch),
> > with one detail: I'd also like you to add .f03 to
> > libgomp/testsuite/libgomp.fortran/fortran.exp, for consistency.
> Attached is the updated patch.

libgomp/
2007-01-17  Tobias Burnus  <burnus@net-b.de>

	* testsuite/libgomp.fortran/fortran.exp: Support .f03 extension.

This is ok for trunk/4.2.

Index: libgomp/testsuite/libgomp.fortran/fortran.exp
===================================================================
--- libgomp/testsuite/libgomp.fortran/fortran.exp	(revision 120865)
+++ libgomp/testsuite/libgomp.fortran/fortran.exp	(working copy)
@@ -10,7 +10,7 @@
 if [file exists "${blddir}/${lang_test_file}"] {
 
     # Gather a list of all tests.
-    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95}]]
+    set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03}]]
 
     # Main loop.
     gfortran-dg-runtest $tests ""

	Jakub