r3114 - in glibc-package/trunk/debian: . patches patches/any patches/kfreebsd
Author: ps-guest
Date: 2008-08-28 13:01:53 +0000 (Thu, 28 Aug 2008)
New Revision: 3114
Added:
glibc-package/trunk/debian/patches/any/local-linuxthreads-weak.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/trunk/debian/patches/series
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2310 (from glibc-bsd).
* add any/local-linuxthreads-weak.diff to pass stdio-common/scanf15.out test
on linuxthreads platforms, although it seems to be rather gcc 4.x bug.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-08-26 15:38:57 UTC (rev 3113)
+++ glibc-package/trunk/debian/changelog 2008-08-28 13:01:53 UTC (rev 3114)
@@ -1,7 +1,9 @@
glibc (2.7-14) unstable; urgency=low
[ Petr Salinger ]
- * kfreebsd/local-sysdeps.diff: update to revision 2280 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 2310 (from glibc-bsd).
+ * add any/local-linuxthreads-weak.diff to pass stdio-common/scanf15.out test
+ on linuxthreads platforms, although it seems to be rather gcc 4.x bug.
[ Aurelien Jarno ]
* patches/mips/cvs-mknod.diff: new patch from upstream to allow > 255 minors
Added: glibc-package/trunk/debian/patches/any/local-linuxthreads-weak.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-weak.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-weak.diff 2008-08-28 13:01:53 UTC (rev 3114)
@@ -0,0 +1,35 @@
+--- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h
++++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h
+@@ -25,6 +25,10 @@
+
+ #if defined _LIBC && !defined NOT_IN_libc
+ #include <linuxthreads/internals.h>
++#else
++/* This function is called to initialize the pthread library. */
++/* We need a prototype before it is bellow marked as weak */
++extern void __pthread_initialize (void);
+ #endif
+
+ /* Mutex type. */
+@@ -383,8 +383,10 @@
+ weak_extern (__pthread_atfork)
+ weak_extern (BP_SYM (_pthread_cleanup_push))
+ weak_extern (BP_SYM (_pthread_cleanup_pop))
++#ifdef __USE_GNU
+ weak_extern (BP_SYM (_pthread_cleanup_push_defer))
+ weak_extern (BP_SYM (_pthread_cleanup_pop_restore))
++#endif
+ # else
+ # pragma weak __pthread_mutex_init
+ # pragma weak __pthread_mutex_destroy
+@@ -406,8 +408,10 @@
+ # pragma weak __pthread_once
+ # pragma weak __pthread_initialize
+ # pragma weak __pthread_atfork
++#ifdef __USE_GNU
+ # pragma weak _pthread_cleanup_push_defer
+ # pragma weak _pthread_cleanup_pop_restore
++#endif
+ # pragma weak _pthread_cleanup_push
+ # pragma weak _pthread_cleanup_pop
+ # endif
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2008-08-26 15:38:57 UTC (rev 3113)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2008-08-28 13:01:53 UTC (rev 3114)
@@ -283,7 +283,7 @@
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/_G_config.h ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/_G_config.h
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/_G_config.h 1970-01-01 01:00:00.000000000 +0100
+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/_G_config.h 2008-07-11 08:06:11.000000000 +0200
-@@ -0,0 +1,102 @@
+@@ -0,0 +1,100 @@
+/* This file is needed by libio to define various configuration parameters.
+ These are always the same in the GNU C library. */
+
@@ -294,19 +294,15 @@
+
+#include <bits/types.h>
+#define __need_size_t
-+#define __need_wchar_t
-+#define __need_wint_t
++#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
++# define __need_wchar_t
++#endif
+#define __need_NULL
+#include <stddef.h>
-+#ifndef _WINT_T
-+/* Integral type unchanged by default argument promotions that can
-+ hold any value corresponding to members of the extended character
-+ set, as well as at least one value that does not correspond to any
-+ member of the extended character set. */
-+# define _WINT_T
-+typedef unsigned int wint_t;
-+#endif
+#define __need_mbstate_t
++#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
++# define __need_wint_t
++#endif
+#include <wchar.h>
+#define _G_size_t size_t
+typedef struct
@@ -327,7 +323,8 @@
+#define _G_wchar_t wchar_t
+#define _G_wint_t wint_t
+#define _G_stat64 stat64
-+#include <gconv.h>
++#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
++# include <gconv.h>
+typedef union
+{
+ struct __gconv_info __cd;
@@ -337,6 +334,7 @@
+ struct __gconv_step_data __data;
+ } __combined;
+} _G_iconv_t;
++#endif
+
+typedef int _G_int16_t __attribute__ ((__mode__ (__HI__)));
+typedef int _G_int32_t __attribute__ ((__mode__ (__SI__)));
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-08-26 15:38:57 UTC (rev 3113)
+++ glibc-package/trunk/debian/patches/series 2008-08-28 13:01:53 UTC (rev 3114)
@@ -193,6 +193,7 @@
any/local-linuxthreads-semaphore_h.diff
any/local-linuxthreads-signals.diff -p0
any/local-linuxthreads-tst-sighandler.diff
+any/local-linuxthreads-weak.diff
any/local-localedef-fix-trampoline.diff -p0
any/local-makeconfig.diff -p0
any/local-mktemp.diff -p0
Reply to: