diff options
author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2012-11-24 02:53:54 +0000 |
---|---|---|
committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2012-11-24 02:53:54 +0000 |
commit | 045de74762d9fff013edd52de4e4e6855d3f4483 (patch) | |
tree | c81209c57ac235caaf9c3269cbab888e6f38d831 /debian/patches/svn-updates-linaro.diff | |
parent | 03492bbd3f6d49103e5771d89c11f94cdc9f1546 (diff) | |
download | gcc-47-045de74762d9fff013edd52de4e4e6855d3f4483.tar.gz |
* Update to SVN 20121124 (r193776) from the gcc-4_7-branch.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6316 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/patches/svn-updates-linaro.diff')
-rw-r--r-- | debian/patches/svn-updates-linaro.diff | 101 |
1 files changed, 95 insertions, 6 deletions
diff --git a/debian/patches/svn-updates-linaro.diff b/debian/patches/svn-updates-linaro.diff index 9ff6753..7428717 100644 --- a/debian/patches/svn-updates-linaro.diff +++ b/debian/patches/svn-updates-linaro.diff @@ -1,10 +1,10 @@ -# DP: updates from the 4.7 branch upto 20121122 (r193728). +# DP: updates from the 4.7 branch upto 20121124 (r193776). last_updated() { cat > ${dir}LAST_UPDATED <<EOF -Thu Nov 22 16:46:02 CET 2012 -Thu Nov 22 15:46:02 UTC 2012 (revision 193728) +Sat Nov 24 03:26:27 CET 2012 +Sat Nov 24 02:26:27 UTC 2012 (revision 193776) EOF } @@ -2868,7 +2868,7 @@ Index: gcc/DATESTAMP +++ b/src/gcc/DATESTAMP (revision @@ -1 +1 @@ -20121106 -+20121122 ++20121124 Index: gcc/fold-const.c =================================================================== --- a/src/gcc/fold-const.c (revision @@ -3110,6 +3110,39 @@ Index: gcc/testsuite/gfortran.dg/transfer_class_1.f90 + integer :: i + i = transfer(arg, 1) +end subroutine +Index: gcc/testsuite/gfortran.dg/namelist_76.f90 +=================================================================== +--- a/src/gcc/testsuite/gfortran.dg/namelist_76.f90 (revision ++++ b/src/gcc/testsuite/gfortran.dg/namelist_76.f90 (revision +@@ -0,0 +1,28 @@ ++! { dg-do compile } ++! ++! PR 55352: [4.7/4.8 Regression] Erroneous gfortran warning of unused module variable when variable is only used in namelist ++! ++! Contributed by <AstroFloyd@gmail.com> ++ ++module data ++ implicit none ++ integer :: a ++end module data ++ ++program test ++ use data, only: a ++ implicit none ++ a = 1 ++ call write_data() ++end program test ++ ++subroutine write_data() ++ use data, only: a ++ implicit none ++ namelist /write_data_list/ a ++ open(unit=10,form='formatted',status='replace',action='write',file='test.dat') ++ write(10, nml=write_data_list) ++ close(10) ++end subroutine write_data ++ ++! { dg-final { cleanup-modules "data" } } Index: gcc/testsuite/gcc.c-torture/compile/20121107-1.c =================================================================== --- a/src/gcc/testsuite/gcc.c-torture/compile/20121107-1.c (revision @@ -3133,7 +3166,12 @@ Index: gcc/testsuite/ChangeLog =================================================================== --- a/src/gcc/testsuite/ChangeLog (revision +++ b/src/gcc/testsuite/ChangeLog (revision -@@ -1,3 +1,25 @@ +@@ -1,3 +1,30 @@ ++2012-11-23 Janus Weil <janus@gcc.gnu.org> ++ ++ PR fortran/55352 ++ * gfortran.dg/namelist_76.f90: New. ++ +2012-11-19 H.J. Lu <hongjiu.lu@intel.com> + + Backported from mainline @@ -3521,7 +3559,13 @@ Index: gcc/fortran/ChangeLog =================================================================== --- a/src/gcc/fortran/ChangeLog (revision +++ b/src/gcc/fortran/ChangeLog (revision -@@ -1,3 +1,9 @@ +@@ -1,3 +1,15 @@ ++2012-11-23 Janus Weil <janus@gcc.gnu.org> ++ ++ PR fortran/55352 ++ * trans-decl.c (generate_local_decl): Don't warn for explicitly imported ++ but unused module variables which are in a namelist or common block. ++ +2012-11-06 Janus Weil <janus@gcc.gnu.org> + + PR fortran/54917 @@ -3531,6 +3575,51 @@ Index: gcc/fortran/ChangeLog 2012-10-14 Janus Weil <janus@gcc.gnu.org> PR fortran/54784 +Index: gcc/fortran/trans-decl.c +=================================================================== +--- a/src/gcc/fortran/trans-decl.c (revision ++++ b/src/gcc/fortran/trans-decl.c (revision +@@ -4586,23 +4586,26 @@ + } + + /* Warn for unused variables, but not if they're inside a common +- block, a namelist, or are use-associated. */ ++ block or a namelist. */ + else if (warn_unused_variable +- && !(sym->attr.in_common || sym->attr.use_assoc || sym->mark +- || sym->attr.in_namelist)) ++ && !(sym->attr.in_common || sym->mark || sym->attr.in_namelist)) + { +- gfc_warning ("Unused variable '%s' declared at %L", sym->name, +- &sym->declared_at); +- if (sym->backend_decl != NULL_TREE) +- TREE_NO_WARNING(sym->backend_decl) = 1; ++ if (sym->attr.use_only) ++ { ++ gfc_warning ("Unused module variable '%s' which has been " ++ "explicitly imported at %L", sym->name, ++ &sym->declared_at); ++ if (sym->backend_decl != NULL_TREE) ++ TREE_NO_WARNING(sym->backend_decl) = 1; ++ } ++ else if (!sym->attr.use_assoc) ++ { ++ gfc_warning ("Unused variable '%s' declared at %L", ++ sym->name, &sym->declared_at); ++ if (sym->backend_decl != NULL_TREE) ++ TREE_NO_WARNING(sym->backend_decl) = 1; ++ } + } +- else if (warn_unused_variable && sym->attr.use_only) +- { +- gfc_warning ("Unused module variable '%s' which has been explicitly " +- "imported at %L", sym->name, &sym->declared_at); +- if (sym->backend_decl != NULL_TREE) +- TREE_NO_WARNING(sym->backend_decl) = 1; +- } + + /* For variable length CHARACTER parameters, the PARM_DECL already + references the length variable, so force gfc_get_symbol_decl Index: gcc/fortran/target-memory.c =================================================================== --- a/src/gcc/fortran/target-memory.c (revision |