Author: aurel32
Date: 2006-05-28 20:01:58 +0000 (Sun, 28 May 2006)
New Revision: 1563
Added:
glibc-package/branches/glibc-2.4/debian/patches/any/local-__thread.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Add any/local-__thread.diff (make glibc buildable without __thread support)
from Michael Bank. (Closes: #361064)
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 19:54:48 UTC
(rev 1562)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 20:01:58 UTC
(rev 1563)
@@ -95,6 +95,8 @@
* Add sparc/local-sysdep.diff (pull in __syscall_error routine when
building with linuxthreads).
* debian/sysdeps/mips(el).mk: disable TLS (as on 2.3.6).
+ * Add any/local-__thread.diff (make glibc buildable without __thread support)
+ from Michael Bank. (Closes: #361064)
-- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 28 May 2006 03:28:14 +0200
Added: glibc-package/branches/glibc-2.4/debian/patches/any/local-__thread.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-__thread.diff
2006-05-28 19:54:48 UTC (rev 1562)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-__thread.diff
2006-05-28 20:01:58 UTC (rev 1563)
@@ -0,0 +1,30 @@
+# DP: Description: Fix build when __thread is not available.
+# DP: Dpatch author: Michael Banck <[EMAIL PROTECTED]>
+# DP: Patch author: Thomas Schwinge
+# DP: Upstream status: Rejected
+# DP: Date: 2005-08-28
+
+2005-08-28 Thomas Schwinge <[EMAIL PROTECTED]>
+
+ malloc/memusage.c: Only use __thread if USE___THREAD.
+
+
+Index: malloc/memusage.c
+===================================================================
+RCS file: /cvs/glibc/libc/malloc/memusage.c,v
+retrieving revision 1.12
+diff -u -r1.12 memusage.c
+--- malloc/memusage.c 20 Aug 2005 01:12:37 -0000 1.12
++++ malloc/memusage.c 27 Aug 2005 23:43:02 -0000
+@@ -83,7 +83,11 @@
+ static memusage_cntr_t decreasing_mremap;
+ static memusage_size_t current_heap;
+ static memusage_size_t peak_use[3];
++#if USE___THREAD
+ static __thread uintptr_t start_sp;
++#else
++static uintptr_t start_sp;
++#endif
+
+ /* A few macros to make the source more readable. */
+ #define peak_heap peak_use[0]
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28
19:54:48 UTC (rev 1562)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28
20:01:58 UTC (rev 1563)
@@ -103,6 +103,7 @@
all/submitted-new-brf-encoding.diff -p0
any/cvs-getcwd_c.diff -p1
+any/local-__thread.diff -p0
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
any/local-bashisms.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
