From: iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 18 Aug 2013 15:50:17 +0000 (+0000)
Subject: libgcc:
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5f1a7470ae82215ec01f71197ed442175689cab;p=thirdparty%2Fgcc.git

libgcc:

	PR gcov-profile/58127
	* libgcov.c (__gcov_indirect_call_callee): Don't make this a
	__thread var for emulated TLS.
	(__gcov_indirect_call_counters): Likewise.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@201829 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 00fdc8d891ef..2f415bfc80a2 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-18  Iain Sandoe  <iain@codesourcery.com>
+
+	PR gcov-profile/58127
+	* libgcov.c (__gcov_indirect_call_callee): Don't make this a
+	__thread var for emulated TLS.
+	(__gcov_indirect_call_counters): Likewise.
+
 2013-08-16  Maciej W. Rozycki  <macro@codesourcery.com>
             Catherine Moore  <clm@codesourcery.com>
             Richard Sandiford <rdsandiford@googlemail.com>
diff --git a/libgcc/libgcov.c b/libgcc/libgcov.c
index d1a989274f4a..3c39331e6baa 100644
--- a/libgcc/libgcov.c
+++ b/libgcc/libgcov.c
@@ -1162,11 +1162,11 @@ __gcov_indirect_call_profiler (gcov_type* counter, gcov_type value,
    The variables are set directly by GCC instrumented code, so declaration
    here must match one in tree-profile.c  */
 
-#ifdef HAVE_CC_TLS
+#if defined(HAVE_CC_TLS) && !defined (USE_EMUTLS)
 __thread 
 #endif
 void * __gcov_indirect_call_callee;
-#ifdef HAVE_CC_TLS
+#if defined(HAVE_CC_TLS) && !defined (USE_EMUTLS) 
 __thread 
 #endif
 gcov_type * __gcov_indirect_call_counters;