From 8a8d6e0b0be335d9af2539127ac375a0c231efb7 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Thu, 2 Aug 2007 20:07:54 +0000 Subject: [PATCH] re PR fortran/32770 ([Meta-bug] -fdefault-integer-8 issues) 2007-08-02 Thomas Koenig PR fortran/32770 * gfortran.dg/unf_read_corrupted_1.f90: Make all kinds explicit so test passes with -fdefault-integer-8. * gfortran.dg/unformatted_recl_1.f90: Likewise. * gfortran.dg/unformatted_subrecord_1.f90: Likewise. From-SVN: r127168 --- gcc/testsuite/ChangeLog | 8 ++++++++ .../gfortran.dg/unf_read_corrupted_1.f90 | 6 +++--- gcc/testsuite/gfortran.dg/unformatted_recl_1.f90 | 2 +- .../gfortran.dg/unformatted_subrecord_1.f90 | 16 +++++++++------- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 07d751b5d7a..fe19024a010 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2007-08-02 Thomas Koenig + + PR fortran/32770 + * gfortran.dg/unf_read_corrupted_1.f90: Make all kinds + explicit so test passes with -fdefault-integer-8. + * gfortran.dg/unformatted_recl_1.f90: Likewise. + * gfortran.dg/unformatted_subrecord_1.f90: Likewise. + 2007-08-02 Lee Millward PR c++/30849 diff --git a/gcc/testsuite/gfortran.dg/unf_read_corrupted_1.f90 b/gcc/testsuite/gfortran.dg/unf_read_corrupted_1.f90 index 166d5291530..1361ca3669c 100644 --- a/gcc/testsuite/gfortran.dg/unf_read_corrupted_1.f90 +++ b/gcc/testsuite/gfortran.dg/unf_read_corrupted_1.f90 @@ -3,8 +3,8 @@ ! corrupted. program main implicit none - integer :: i1, i2 - integer :: ios + integer(kind=4) :: i1, i2 + integer(kind=4) :: ios character(len=50) :: msg ! Write out a truncated unformatted sequential file by @@ -12,7 +12,7 @@ program main open (10, form="unformatted", access="stream", file="foo.dat", & status="unknown") - write (10) 16, 1 + write (10) 16_4, 1_4 close (10, status="keep") ! Try to read diff --git a/gcc/testsuite/gfortran.dg/unformatted_recl_1.f90 b/gcc/testsuite/gfortran.dg/unformatted_recl_1.f90 index e9aeebbb999..dbafff131e8 100644 --- a/gcc/testsuite/gfortran.dg/unformatted_recl_1.f90 +++ b/gcc/testsuite/gfortran.dg/unformatted_recl_1.f90 @@ -1,7 +1,7 @@ ! { dg-do run } ! PR31099 Runtime error on legal code using RECL program test - integer :: a, b + integer(kind=4) :: a, b a=1 b=2 open(10, status="scratch", form="unformatted", recl=8) diff --git a/gcc/testsuite/gfortran.dg/unformatted_subrecord_1.f90 b/gcc/testsuite/gfortran.dg/unformatted_subrecord_1.f90 index 5812a8eaaf5..5d59daad186 100644 --- a/gcc/testsuite/gfortran.dg/unformatted_subrecord_1.f90 +++ b/gcc/testsuite/gfortran.dg/unformatted_subrecord_1.f90 @@ -1,13 +1,15 @@ ! { dg-do run } ! { dg-options "-fmax-subrecord-length=16" } ! Test Intel record markers with 16-byte subrecord sizes. +! PR 32770: Use explicit kinds for all integers and constants, +! to avoid problems with -fdefault-integer-8 and -fdefault-real-8 program main implicit none - integer, dimension(20) :: n - integer, dimension(30) :: m - integer :: i - real :: r - integer :: k + integer(kind=4), dimension(20) :: n + integer(kind=4), dimension(30) :: m + integer(kind=4) :: i + real(kind=4) :: r + integer(kind=4) :: k ! Maximum subrecord length is 16 here, or the test will fail. open (10, file="f10.dat", & form="unformatted", access="sequential") @@ -33,13 +35,13 @@ program main if (any(n(1:5) .ne. (/ 1, 4, 9, 16, 25 /))) call abort if (any(n(6:20) .ne. 0)) call abort ! Append to the end of the file - write (10) 3.14 + write (10) 3.14_4 ! Test multiple backspace statements backspace 10 backspace 10 read (10) k if (k .ne. 1) call abort read (10) r - if (abs(r-3.14) .gt. 1e-7) call abort + if (abs(r-3.14_4) .gt. 1e-7) call abort close (10, status="delete") end program main