Author: arekm Date: Tue Jul 3 17:54:55 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated
---- Files affected: packages/gcc: gcc-branch.diff (1.64 -> 1.65) ---- Diffs: ================================================================ Index: packages/gcc/gcc-branch.diff diff -u packages/gcc/gcc-branch.diff:1.64 packages/gcc/gcc-branch.diff:1.65 --- packages/gcc/gcc-branch.diff:1.64 Thu Jun 14 22:43:26 2012 +++ packages/gcc/gcc-branch.diff Tue Jul 3 19:53:04 2012 @@ -1,7 +1,7 @@ Index: libgomp/ChangeLog =================================================================== ---- libgomp/ChangeLog (.../tags/gcc_4_7_1_release) (wersja 188635) -+++ libgomp/ChangeLog (.../branches/gcc-4_7-branch) (wersja 188635) +--- libgomp/ChangeLog (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libgomp/ChangeLog (.../branches/gcc-4_7-branch) (wersja 189237) @@ -1,3 +1,23 @@ +2012-06-14 Jakub Jelinek <[email protected]> + @@ -28,8 +28,8 @@ * GCC 4.7.1 released. Index: libgomp/testsuite/libgomp.fortran/vla4.f90 =================================================================== ---- libgomp/testsuite/libgomp.fortran/vla4.f90 (.../tags/gcc_4_7_1_release) (wersja 188635) -+++ libgomp/testsuite/libgomp.fortran/vla4.f90 (.../branches/gcc-4_7-branch) (wersja 188635) +--- libgomp/testsuite/libgomp.fortran/vla4.f90 (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libgomp/testsuite/libgomp.fortran/vla4.f90 (.../branches/gcc-4_7-branch) (wersja 189237) @@ -10,6 +10,10 @@ subroutine foo (c, d, e, f, g, h, i, j, k, n) @@ -52,8 +52,8 @@ if (x .eq. 1) y = '1' Index: libgomp/testsuite/libgomp.fortran/vla5.f90 =================================================================== ---- libgomp/testsuite/libgomp.fortran/vla5.f90 (.../tags/gcc_4_7_1_release) (wersja 188635) -+++ libgomp/testsuite/libgomp.fortran/vla5.f90 (.../branches/gcc-4_7-branch) (wersja 188635) +--- libgomp/testsuite/libgomp.fortran/vla5.f90 (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libgomp/testsuite/libgomp.fortran/vla5.f90 (.../branches/gcc-4_7-branch) (wersja 189237) @@ -10,6 +10,10 @@ subroutine foo (c, d, e, f, g, h, i, j, k, n) @@ -76,8 +76,8 @@ if (x .eq. 1) y = '1' Index: libgomp/testsuite/libgomp.c/pr26943-2.c =================================================================== ---- libgomp/testsuite/libgomp.c/pr26943-2.c (.../tags/gcc_4_7_1_release) (wersja 188635) -+++ libgomp/testsuite/libgomp.c/pr26943-2.c (.../branches/gcc-4_7-branch) (wersja 188635) +--- libgomp/testsuite/libgomp.c/pr26943-2.c (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libgomp/testsuite/libgomp.c/pr26943-2.c (.../branches/gcc-4_7-branch) (wersja 189237) @@ -3,6 +3,7 @@ extern int omp_set_dynamic (int); @@ -106,8 +106,8 @@ if (e[0] != 'a' + 6 || f[0] != 'b' + i || g[0] != 'g' + i) Index: libgomp/testsuite/libgomp.c/pr26943-3.c =================================================================== ---- libgomp/testsuite/libgomp.c/pr26943-3.c (.../tags/gcc_4_7_1_release) (wersja 188635) -+++ libgomp/testsuite/libgomp.c/pr26943-3.c (.../branches/gcc-4_7-branch) (wersja 188635) +--- libgomp/testsuite/libgomp.c/pr26943-3.c (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libgomp/testsuite/libgomp.c/pr26943-3.c (.../branches/gcc-4_7-branch) (wersja 189237) @@ -4,6 +4,7 @@ extern int omp_set_dynamic (int); extern int omp_get_thread_num (void); @@ -136,8 +136,8 @@ if (e[0] != 'a' + 6 || f[0] != 'b' + i || g[0] != 'g' + i) Index: libgomp/testsuite/libgomp.c/pr26943-4.c =================================================================== ---- libgomp/testsuite/libgomp.c/pr26943-4.c (.../tags/gcc_4_7_1_release) (wersja 188635) -+++ libgomp/testsuite/libgomp.c/pr26943-4.c (.../branches/gcc-4_7-branch) (wersja 188635) +--- libgomp/testsuite/libgomp.c/pr26943-4.c (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libgomp/testsuite/libgomp.c/pr26943-4.c (.../branches/gcc-4_7-branch) (wersja 189237) @@ -4,6 +4,7 @@ extern int omp_set_dynamic (int); extern int omp_get_thread_num (void); @@ -166,8 +166,8 @@ if (e[0] != 'a' + 6 || f[0] != 'b' + i || g[0] != 'g' + i) Index: libgomp/config/linux/lock.c =================================================================== ---- libgomp/config/linux/lock.c (.../tags/gcc_4_7_1_release) (wersja 188635) -+++ libgomp/config/linux/lock.c (.../branches/gcc-4_7-branch) (wersja 188635) +--- libgomp/config/linux/lock.c (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libgomp/config/linux/lock.c (.../branches/gcc-4_7-branch) (wersja 189237) @@ -1,4 +1,4 @@ -/* Copyright (C) 2005, 2008, 2009, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. @@ -183,10 +183,467 @@ } void +Index: libstdc++-v3/include/bits/stl_list.h +=================================================================== +--- libstdc++-v3/include/bits/stl_list.h (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libstdc++-v3/include/bits/stl_list.h (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1,7 +1,7 @@ + // List implementation -*- C++ -*- + + // Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +-// 2011 Free Software Foundation, Inc. ++// 2011, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -313,27 +313,17 @@ + { + __detail::_List_node_base _M_node; + +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- size_t _M_size; +-#endif +- + _List_impl() + : _Node_alloc_type(), _M_node() +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- , _M_size(0) +-#endif + { } + + _List_impl(const _Node_alloc_type& __a) + : _Node_alloc_type(__a), _M_node() +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- , _M_size(0) +-#endif + { } + + #ifdef __GXX_EXPERIMENTAL_CXX0X__ + _List_impl(_Node_alloc_type&& __a) +- : _Node_alloc_type(std::move(__a)), _M_node(), _M_size(0) ++ : _Node_alloc_type(std::move(__a)), _M_node() + { } + #endif + }; +@@ -342,23 +332,12 @@ + + _List_node<_Tp>* + _M_get_node() +- { +- _List_node<_Tp>* __tmp = _M_impl._Node_alloc_type::allocate(1); +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- ++_M_impl._M_size; +-#endif +- return __tmp; +- } ++ { return _M_impl._Node_alloc_type::allocate(1); } + + void + _M_put_node(_List_node<_Tp>* __p) +- { +- _M_impl._Node_alloc_type::deallocate(__p, 1); +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- --_M_impl._M_size; +-#endif +- } +- ++ { _M_impl._Node_alloc_type::deallocate(__p, 1); } ++ + public: + typedef _Alloc allocator_type; + +@@ -392,7 +371,6 @@ + { + _M_init(); + __detail::_List_node_base::swap(_M_impl._M_node, __x._M_impl._M_node); +- std::swap(_M_impl._M_size, __x._M_impl._M_size); + } + #endif + +@@ -874,13 +852,7 @@ + /** Returns the number of elements in the %list. */ + size_type + size() const _GLIBCXX_NOEXCEPT +- { +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- return this->_M_impl._M_size; +-#else +- return std::distance(begin(), end()); +-#endif +- } ++ { return std::distance(begin(), end()); } + + /** Returns the size() of the largest possible %list. */ + size_type +@@ -1215,9 +1187,6 @@ + { + __detail::_List_node_base::swap(this->_M_impl._M_node, + __x._M_impl._M_node); +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- std::swap(this->_M_impl._M_size, __x._M_impl._M_size); +-#endif + + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 431. Swapping containers with unequal allocators. +@@ -1262,11 +1231,6 @@ + _M_check_equal_allocators(__x); + + this->_M_transfer(__position, __x.begin(), __x.end()); +- +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- this->_M_impl._M_size += __x.size(); +- __x._M_impl._M_size = 0; +-#endif + } + } + +@@ -1298,15 +1262,8 @@ + return; + + if (this != &__x) +- { +- _M_check_equal_allocators(__x); ++ _M_check_equal_allocators(__x); + +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- ++this->_M_impl._M_size; +- --__x._M_impl._M_size; +-#endif +- } +- + this->_M_transfer(__position, __i, __j); + } + +@@ -1340,16 +1297,8 @@ + if (__first != __last) + { + if (this != &__x) +- { +- _M_check_equal_allocators(__x); ++ _M_check_equal_allocators(__x); + +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- const size_type __size = std::distance(__first, __last); +- this->_M_impl._M_size += __size; +- __x._M_impl._M_size -= __size; +-#endif +- } +- + this->_M_transfer(__position, __first, __last); + } + } +@@ -1624,10 +1573,6 @@ + inline bool + operator==(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y) + { +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- return (__x.size() == __y.size() +- && std::equal(__x.begin(), __x.end(), __y.begin())); +-#else + typedef typename list<_Tp, _Alloc>::const_iterator const_iterator; + const_iterator __end1 = __x.end(); + const_iterator __end2 = __y.end(); +@@ -1640,7 +1585,6 @@ + ++__i2; + } + return __i1 == __end1 && __i2 == __end2; +-#endif + } + + /** +Index: libstdc++-v3/include/bits/list.tcc +=================================================================== +--- libstdc++-v3/include/bits/list.tcc (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libstdc++-v3/include/bits/list.tcc (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1,7 +1,7 @@ + // List implementation (out of line) -*- C++ -*- + + // Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +-// 2011 Free Software Foundation, Inc. ++// 2011, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -139,14 +139,14 @@ + list<_Tp, _Alloc>:: + resize(size_type __new_size) + { +- if (__new_size > size()) +- _M_default_append(__new_size - size()); +- else if (__new_size < size()) +- { +- iterator __i = begin(); +- std::advance(__i, __new_size); +- erase(__i, end()); +- } ++ iterator __i = begin(); ++ size_type __len = 0; ++ for (; __i != end() && __len < __new_size; ++__i, ++__len) ++ ; ++ if (__len == __new_size) ++ erase(__i, end()); ++ else // __i == end() ++ _M_default_append(__new_size - __len); + } + + template<typename _Tp, typename _Alloc> +@@ -154,14 +154,14 @@ + list<_Tp, _Alloc>:: + resize(size_type __new_size, const value_type& __x) + { +- if (__new_size > size()) +- insert(end(), __new_size - size(), __x); +- else if (__new_size < size()) +- { +- iterator __i = begin(); +- std::advance(__i, __new_size); +- erase(__i, end()); +- } ++ iterator __i = begin(); ++ size_type __len = 0; ++ for (; __i != end() && __len < __new_size; ++__i, ++__len) ++ ; ++ if (__len == __new_size) ++ erase(__i, end()); ++ else // __i == end() ++ insert(end(), __new_size - __len, __x); + } + #else + template<typename _Tp, typename _Alloc> +@@ -312,11 +312,6 @@ + ++__first1; + if (__first2 != __last2) + _M_transfer(__last1, __first2, __last2); +- +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- this->_M_impl._M_size += __x.size(); +- __x._M_impl._M_size = 0; +-#endif + } + } + +@@ -351,11 +346,6 @@ + ++__first1; + if (__first2 != __last2) + _M_transfer(__last1, __first2, __last2); +- +-#ifdef __GXX_EXPERIMENTAL_CXX0X__ +- this->_M_impl._M_size += __x.size(); +- __x._M_impl._M_size = 0; +-#endif + } + } + +Index: libstdc++-v3/ChangeLog +=================================================================== +--- libstdc++-v3/ChangeLog (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libstdc++-v3/ChangeLog (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1,3 +1,39 @@ ++2012-07-02 Paolo Carlini <[email protected]> ++ ++ Revert: ++ 2011-10-04 Paolo Carlini <[email protected]> ++ ++ PR libstdc++/49561 ++ * include/bits/stl_list.h (_List_base<>::_List_impl::_M_size): ++ Add in C++0x mode. ++ (_List_base<>::_List_impl, _List_base<>::_M_get_node, ++ _List_base<>::_M_put_node, _List_base<>::_List_base(_List_base&&), ++ list<>::size, list<>::swap, list<>::splice): Use it. ++ (operator==(const list<>&, const list<>&)): Rewrite in C++0x mode. ++ * include/bits/list.tcc (list<>::erase): Likewise. ++ (list<>::merge): Adjust in C++0x mode. ++ * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: ++ Adjust dg-error line number. ++ * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: ++ Likewise. ++ * testsuite/23_containers/list/requirements/dr438/ ++ constructor_1_neg.cc: Likewise. ++ * testsuite/23_containers/list/requirements/dr438/ ++ constructor_2_neg.cc: Likewise. ++ ++2012-06-19 Jonathan Wakely <[email protected]> ++ ++ PR libstdc++/53270 ++ * config/os/gnu-linux/os_defines.h: Disable static initializer macros ++ for gthreads types in C++11 mode. ++ ++2012-06-19 Jörg Sonnenberger <[email protected]> ++ Jonathan Wakely <[email protected]> ++ ++ PR libstdc++/53678 ++ * config/os/bsd/netbsd/ctype_base.h: Check for _CTYPE_U. ++ * testsuite/22_locale/ctype_base/53678.cc: New. ++ + 2012-06-14 Release Manager + + * GCC 4.7.1 released. +Index: libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc +=================================================================== +--- libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc (.../tags/gcc_4_7_1_release) (wersja 0) ++++ libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -0,0 +1,28 @@ ++// Copyright (C) 2012 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library is free ++// software; you can redistribute it and/or modify it under the ++// terms of the GNU General Public License as published by the ++// Free Software Foundation; either version 3, or (at your option) ++// any later version. ++ ++// This library is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++ ++// You should have received a copy of the GNU General Public License along ++// with this library; see the file COPYING3. If not see ++// <http://www.gnu.org/licenses/>. ++ ++// { dg-do compile } ++ ++// 22.2.1 The ctype category ++ ++#include <locale> ++ ++// libstdc++/53678 ++void test01() ++{ ++ bool NetBSD __attribute__((unused)) = true; ++} +Index: libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc +=================================================================== +--- libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1,6 +1,6 @@ + // 2007-04-27 Paolo Carlini <[email protected]> + +-// Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation ++// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -18,7 +18,7 @@ + // <http://www.gnu.org/licenses/>. + + // { dg-do compile } +-// { dg-error "no matching" "" { target *-*-* } 1552 } ++// { dg-error "no matching" "" { target *-*-* } 1501 } + + #include <list> + +Index: libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc +=================================================================== +--- libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1,6 +1,6 @@ + // 2007-04-27 Paolo Carlini <[email protected]> + +-// Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation ++// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -18,7 +18,7 @@ + // <http://www.gnu.org/licenses/>. + + // { dg-do compile } +-// { dg-error "no matching" "" { target *-*-* } 1508 } ++// { dg-error "no matching" "" { target *-*-* } 1457 } + + #include <list> + +Index: libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc +=================================================================== +--- libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1,6 +1,6 @@ + // 2007-04-27 Paolo Carlini <[email protected]> + +-// Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation ++// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -18,7 +18,7 @@ + // <http://www.gnu.org/licenses/>. + + // { dg-do compile } +-// { dg-error "no matching" "" { target *-*-* } 1508 } ++// { dg-error "no matching" "" { target *-*-* } 1457 } + + #include <list> + +Index: libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc +=================================================================== +--- libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1,6 +1,6 @@ + // 2007-04-27 Paolo Carlini <[email protected]> + +-// Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation ++// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -18,7 +18,7 @@ + // <http://www.gnu.org/licenses/>. + + // { dg-do compile } +-// { dg-error "no matching" "" { target *-*-* } 1508 } ++// { dg-error "no matching" "" { target *-*-* } 1457 } + + #include <list> + #include <utility> +Index: libstdc++-v3/config/os/gnu-linux/os_defines.h +=================================================================== +--- libstdc++-v3/config/os/gnu-linux/os_defines.h (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libstdc++-v3/config/os/gnu-linux/os_defines.h (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -46,4 +46,10 @@ + # undef _GLIBCXX_HAVE_GETS + #endif + ++#if defined(__hppa__) && defined(__GXX_EXPERIMENTAL_CXX0X__) ++# define _GTHREAD_USE_MUTEX_INIT_FUNC ++# define _GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC ++# define _GTHREAD_USE_COND_INIT_FUNC + #endif ++ ++#endif +Index: libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +=================================================================== +--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1,6 +1,6 @@ + // Locale support -*- C++ -*- + +-// Copyright (C) 2000, 2009 Free Software Foundation, Inc. ++// Copyright (C) 2000, 2009, 2011, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -31,8 +31,6 @@ + // [email protected]:/cvsroot/basesrc/include/ctype.h + // See www.netbsd.org for details of access. + +-#include <sys/param.h> +- + namespace std _GLIBCXX_VISIBILITY(default) + { + _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -47,7 +45,7 @@ + // on the mask type. Because of this, we don't use an enum. + typedef unsigned char mask; + +-#if __NetBSD_Version__ < 599004100 ++#ifndef _CTYPE_U + static const mask upper = _U; + static const mask lower = _L; + static const mask alpha = _U | _L; Index: gcc/tree-ssa-loop-im.c =================================================================== ---- gcc/tree-ssa-loop-im.c (.../tags/gcc_4_7_1_release) (wersja 188635) -+++ gcc/tree-ssa-loop-im.c (.../branches/gcc-4_7-branch) (wersja 188635) +--- gcc/tree-ssa-loop-im.c (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ gcc/tree-ssa-loop-im.c (.../branches/gcc-4_7-branch) (wersja 189237) @@ -52,7 +52,7 @@ } } @@ -399,7 +856,7 @@ fmt_data.orig_loop = loop; for_each_index (&ref->mem, force_move_till, &fmt_data); -+ if ((flag_tm && block_in_transaction (loop_preheader_edge (loop)->src)) ++ if (block_in_transaction (loop_preheader_edge (loop)->src) + || !PARAM_VALUE (PARAM_ALLOW_STORE_DATA_RACES)) + multi_threaded_model_p = true; + @@ -469,10 +926,94 @@ FOR_EACH_BB (bb) SET_ALWAYS_EXECUTED_IN (bb, NULL); +Index: gcc/c-family/ChangeLog +=================================================================== +--- gcc/c-family/ChangeLog (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ gcc/c-family/ChangeLog (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1,3 +1,9 @@ ++2012-06-27 Kai Tietz <[email protected]> ++ ++ Merged from trunk ++ PR preprocessor/37215 ++ * c-ppoutput.c (preprocess_file): Check for nonempty buffer. ++ + 2012-06-14 Release Manager + + * GCC 4.7.1 released. +Index: gcc/c-family/c-ppoutput.c +=================================================================== +--- gcc/c-family/c-ppoutput.c (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ gcc/c-family/c-ppoutput.c (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -86,7 +86,7 @@ + { + /* A successful cpp_read_main_file guarantees that we can call + cpp_scan_nooutput or cpp_get_token next. */ +- if (flag_no_output) ++ if (flag_no_output && pfile->buffer) + { + /* Scan -included buffers, then the main file. */ + while (pfile->buffer->prev) +Index: gcc/DATESTAMP +=================================================================== +--- gcc/DATESTAMP (.../tags/gcc_4_7_1_release) (wersja 189237) ++++ gcc/DATESTAMP (.../branches/gcc-4_7-branch) (wersja 189237) +@@ -1 +1 @@ +-20120614 <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/packages/gcc/gcc-branch.diff?r1=1.64&r2=1.65 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
