gcc/fortran/

2013-01-16  Jakub Jelinek  <jakub@redhat.com>
            Tobias Burnus  <burnus@net-b.de>

        PR driver/55884
        * lang.opt (fintrinsic-modules-path): Don't accept Joined.
        (fintrinsic-modules-path=): New.
        * options.c (gfc_handle_option, gfc_get_option_string,
        gfc_get_option_string): Handle the latter.

libgomp/
2013-01-16  Jakub Jelinek  <jakub@redhat.com>
            Tobias Burnus  <burnus@net-b.de>

        PR driver/55884
        * testsuite/libgomp.fortran/fortran.exp: Use
        -fintrinsic-modules-path= instead of
        -fintrinsic-modules-path.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195242 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c7f2001..fc39b41 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,4 +1,13 @@
 2013-01-16  Jakub Jelinek  <jakub@redhat.com>
+           Tobias Burnus  <burnus@net-b.de>
+
+       PR driver/55884
+       * lang.opt (fintrinsic-modules-path): Don't accept Joined.
+       (fintrinsic-modules-path=): New.
+       * options.c (gfc_handle_option, gfc_get_option_string,
+       gfc_get_option_string): Handle the latter.
+
+2013-01-16  Jakub Jelinek  <jakub@redhat.com>
 
        PR fortran/52865
        * trans-stmt.c (gfc_trans_do): Put countm1-- before conditional

diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index 4e95220..fbe8a1b 100644 (file)
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -422,7 +422,11 @@ Fortran RejectNegative
 Interpret any INTEGER(4) as an INTEGER(8)
 
 fintrinsic-modules-path
-Fortran RejectNegative Joined Separate
+Fortran RejectNegative Separate
+Specify where to find the compiled intrinsic modules
+
+fintrinsic-modules-path=
+Fortran RejectNegative Joined
 Specify where to find the compiled intrinsic modules
 
 ffixed-line-length-none

diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index b1317ba..a014634 100644 (file)
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -843,6 +843,7 @@ gfc_handle_option (size_t scode, const char *arg, int value,
       break;
 
     case OPT_fintrinsic_modules_path:
+    case OPT_fintrinsic_modules_path_:
       gfc_add_intrinsic_modules_path (arg);
       break;
 
@@ -1146,6 +1147,7 @@ gfc_get_option_string (void)
         case OPT_quiet:
         case OPT_version:
         case OPT_fintrinsic_modules_path:
+        case OPT_fintrinsic_modules_path_:
           /* Ignore these.  */
           break;
        default:
@@ -1171,6 +1173,7 @@ gfc_get_option_string (void)
         case OPT_quiet:
         case OPT_version:
         case OPT_fintrinsic_modules_path:
+        case OPT_fintrinsic_modules_path_:
           /* Ignore these.  */
          continue;
 

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 4c61fdb..3bc553a 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-16  Jakub Jelinek  <jakub@redhat.com>
+           Tobias Burnus  <burnus@net-b.de>
+
+       PR driver/55884
+       * testsuite/libgomp.fortran/fortran.exp: Use
+       -fintrinsic-modules-path= instead of
+       -fintrinsic-modules-path.
+
 2013-01-14  Richard Sandiford  <rdsandiford@googlemail.com>
 
        Update copyright years.

diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp
index 68440d1..40ac840 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.fortran/fortran.exp
@@ -14,7 +14,7 @@ set quadmath_library_path "../libquadmath/.libs"
 dg-init
 
 if { $blddir != "" } {
-    lappend ALWAYS_CFLAGS "additional_flags=-fintrinsic-modules-path ${blddir}"
+    lappend ALWAYS_CFLAGS "additional_flags=-fintrinsic-modules-path=${blddir}"
     # Look for a static libgfortran first.
     if [file exists "${blddir}/${lang_library_path}/libgfortran.a"] {
         set lang_test_file "${lang_library_path}/libgfortran.a"