http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57643
--- Comment #2 from Peter Bergner <bergner at gcc dot gnu.org> --- Author: bergner Date: Mon Mar 3 22:13:28 2014 New Revision: 208295 URL: http://gcc.gnu.org/viewcvs?rev=208295&root=gcc&view=rev Log: Backport from mainline 2013-06-20 Torvald Riegel <trie...@redhat.com> * query.cc (_ITM_inTransaction): Abort when using the HTM fastpath. (_ITM_getTransactionId): Same. * config/x86/target.h (htm_transaction_active): New. 2013-06-20 Torvald Riegel <trie...@redhat.com> PR libitm/57643 * beginend.cc (gtm_thread::begin_transaction): Handle reentrancy in the HTM fastpath. Modified: branches/gcc-4_8-branch/libitm/ChangeLog branches/gcc-4_8-branch/libitm/beginend.cc branches/gcc-4_8-branch/libitm/config/x86/target.h branches/gcc-4_8-branch/libitm/query.cc