diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0431572c5a66d6d70cf27a044294043b23c5aac5..91140a76d82726f66514aa85cd10d0fe1fce5409 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-04 Steven G. Kargl <kargl@gcc.gnu.org>
+
+ * fortran/invoke.texi: Update documentation.
+ * fortran/options.c (gfc_post_options): Deal with tabs with -std=f2003
+ and -pedantic.
+
+
2007-02-03 Kazu Hirata <kazu@codesourcery.com>
* trans-array.c: Fix a comment typo.
diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index 2126d7563ba1cf414c4e624ad1ccd5b4451a9355..c4d09024586d20740eab9ba90da551636425923a 100644
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -501,7 +501,8 @@ A LOGICAL SELECT construct has three CASE statements.
By default, tabs are accepted as whitespace, but tabs are not members
of the Fortran Character Set. @option{-Wno-tabs} will cause a warning
to be issued if a tab is encountered. Note, @option{-Wno-tabs} is active
-for @option{-pedantic}, @option{-std=f95}, and @option{-Wall}.
+for @option{-pedantic}, @option{-std=f95}, @option{-std=f2003}, and
+@option{-Wall}.
@item -Wunderflow
@cindex @code{-Wunderflow} option
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 4a00cea28a7e00fb295d576895fc159a46848e9a..0f277665ac6e44454a2428abc378be4dcf13ac1e 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -289,7 +289,10 @@ gfc_post_options (const char **pfilename)
gfc_option.flag_max_stack_var_size = 0;
if (pedantic)
- gfc_option.warn_ampersand = 1;
+ {
+ gfc_option.warn_ampersand = 1;
+ gfc_option.warn_tabs = 0;
+ }
if (gfc_option.flag_all_intrinsics)
gfc_option.warn_nonstd_intrinsics = 0;
@@ -618,6 +621,7 @@ gfc_handle_option (size_t scode, const char *arg, int value)
gfc_option.max_continue_free = 255;
gfc_option.max_identifier_length = 63;
gfc_option.warn_ampersand = 1;
+ gfc_option.warn_tabs = 0;
break;
case OPT_std_gnu:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d53a458a6e41c69c93604159582cf31da6a25fe3..40db44b38922ba7762884e27d673149e97c6869d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-04 Steven G. Kargl <kargl@gcc.gnu.org>
+
+ * gfortran.dg/spread_shape_1.f90: Remove tabs.
+ * gfortran.dg/derived_init_2.f90: Ditto.
+ * gfortran.dg/elemental_subroutine_3.f90: Ditto.
+ * gfortran.dg/array_initializer_1.f90: Ditto.
+ * gfortran.dg/do_2.f90: Ditto.
+ * gfortran.dg/proc_assign_1.f90: Ditto.
+
2007-02-04 Richard Guenther <rguenther@suse.de>
PR middle-end/30636
diff --git a/gcc/testsuite/gfortran.dg/array_initializer_1.f90 b/gcc/testsuite/gfortran.dg/array_initializer_1.f90
index a0d576149daf0c12875b8d10af057f442ea6cf9d..b1db9bf59b1ff680df94d00acdf30efce2f4d227 100644
--- a/gcc/testsuite/gfortran.dg/array_initializer_1.f90
+++ b/gcc/testsuite/gfortran.dg/array_initializer_1.f90
@@ -13,7 +13,7 @@
real, parameter :: r(6) = (/(x(i:i +1, i), i = 1,3)/)
real, parameter :: s(12) = (/((x(i, i:j-1:-1), i = 3,4), j = 2,3)/)
real, parameter :: t(8) = (/(z, &
- real (i)**3, y(i), i = 2, 3)/) ! { dg-warning "nonstandard" }
+ real (i)**3, y(i), i = 2, 3)/) ! { dg-warning "nonstandard" }
integer, parameter :: ii = 4
@@ -26,7 +26,7 @@
if (any (z .ne. (/11., 12./))) call abort ()
if (any (r .ne. (/1., 2., 6., 7., 11., 12./))) call abort ()
if (any (s .ne. (/11., 7., 3., 16., 12., 8., 4., &
- 11., 7., 16., 12., 8. /))) call abort ()
+ 11., 7., 16., 12., 8. /))) call abort ()
if (any (t .ne. (/11., 12., 8., 6., 11., 12., 27., 15. /))) call abort ()
diff --git a/gcc/testsuite/gfortran.dg/derived_init_2.f90 b/gcc/testsuite/gfortran.dg/derived_init_2.f90
index 99951c32a52c63917cbe5725cf31588096ad8d8e..18d7544ecd8803262296135f327c55e80f4df795 100644
--- a/gcc/testsuite/gfortran.dg/derived_init_2.f90
+++ b/gcc/testsuite/gfortran.dg/derived_init_2.f90
@@ -16,7 +16,7 @@ module subs
contains
subroutine foo(fb)
use dt
- type(drv), intent(out) :: fb
+ type(drv), intent(out) :: fb
call sub (fb)
end subroutine foo
@@ -45,4 +45,4 @@ program main
call foo(aa)
end program main
-! { dg-final { cleanup-modules "dt subs" } }
\ No newline at end of file
+! { dg-final { cleanup-modules "dt subs" } }
diff --git a/gcc/testsuite/gfortran.dg/do_2.f90 b/gcc/testsuite/gfortran.dg/do_2.f90
index 95959d03e47a0af8ef204a0ac19fbb4dbc37f728..207b06a54326120a6869505af25d5c463512a817 100644
--- a/gcc/testsuite/gfortran.dg/do_2.f90
+++ b/gcc/testsuite/gfortran.dg/do_2.f90
@@ -36,8 +36,8 @@ dok: DO 115 k=1,3
do
enddo
enddo
- enddo dokkk
- enddo dokk
+ enddo dokkk
+ enddo dokk
115 enddo dok
! Correct non-block do constructs
do 117 l=1,3
diff --git a/gcc/testsuite/gfortran.dg/elemental_subroutine_3.f90 b/gcc/testsuite/gfortran.dg/elemental_subroutine_3.f90
index 138a46c658e884d1a0e8936fa0f980d7a4462c3e..1f93cd4a2c76c6e866e3408caad342b0497531f4 100644
--- a/gcc/testsuite/gfortran.dg/elemental_subroutine_3.f90
+++ b/gcc/testsuite/gfortran.dg/elemental_subroutine_3.f90
@@ -28,7 +28,7 @@ program test
implicit none
type(mytype) :: y(6), x(6) = (/mytype(1),mytype(20),mytype(300),&
mytype(4000),mytype(50000),&
- mytype(1000000)/)
+ mytype(1000000)/)
type(mytype) :: z(2, 3)
! The original case - dependency between lhs and rhs.
x = x((/2,3,1,4,5,6/))
diff --git a/gcc/testsuite/gfortran.dg/proc_assign_1.f90 b/gcc/testsuite/gfortran.dg/proc_assign_1.f90
index a0f725080c231158b8f594a9543c5df69afc7623..418e5f49e86cbe6688309a858fd31f72bb7ed475 100644
--- a/gcc/testsuite/gfortran.dg/proc_assign_1.f90
+++ b/gcc/testsuite/gfortran.dg/proc_assign_1.f90
@@ -49,12 +49,12 @@ end module simpler
use simpler
real w, stmt_fcn
interface
- function ext1 ()
- integer ext1
- end function ext1
- function ext2 (arg)
- integer ext2, arg
- end function ext2
+ function ext1 ()
+ integer ext1
+ end function ext1
+ function ext2 (arg)
+ integer ext2, arg
+ end function ext2
end interface
stmt_fcn (w) = sin (w)
call x (y ())
@@ -75,4 +75,4 @@ contains
y = 2 ! OK - function result
end function y
end
-! { dg-final { cleanup-modules "simple simpler" } }
\ No newline at end of file
+! { dg-final { cleanup-modules "simple simpler" } }
diff --git a/gcc/testsuite/gfortran.dg/spread_shape_1.f90 b/gcc/testsuite/gfortran.dg/spread_shape_1.f90
index bbef232cc135209821d0e4c120b9de4b67644ef3..650584ecf4332b5ce3c233e619ddc8d88f552c7b 100644
--- a/gcc/testsuite/gfortran.dg/spread_shape_1.f90
+++ b/gcc/testsuite/gfortran.dg/spread_shape_1.f90
@@ -4,8 +4,10 @@
!
! Contributed by Paul Thomas <pault@gcc.gnu.org>
real,dimension(:, :),pointer :: ptr
- real,dimension(2, 2),parameter :: u = & ! { dg-warning "nonstandard" }
- reshape((/0.25, 0.5, 0.75, 1.00/),(/2,2/))
+ real,dimension(2, 2) :: u
+
+ u = reshape((/0.25, 0.5, 0.75, 1.00/),(/2,2/))
+
allocate (ptr(2,2))
! Original PR