Re: [Patches] Trunk merge 2012-02-08

["Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>]

I've applied these patches to fix glibc_localedef after this merge.

Index: ChangeLog.eglibc
===================================================================
--- ChangeLog.eglibc	(revision 17051)
+++ ChangeLog.eglibc	(working copy)
@@ -1,3 +1,8 @@
+2012-02-08  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* locale/localeinfo.h: Condition <tls.h> include and
+	NL_CURRENT_INDIRECT define on !defined IN_GLIBC_LOCALEDEF.
+
 2012-01-03  Tom de Vries  <tom@xxxxxxxxxxxxxxxx>
 
 	* elf/Makefile ($(objpfx)tst-initorder2.out): Add
Index: locale/localeinfo.h
===================================================================
--- locale/localeinfo.h	(revision 17051)
+++ locale/localeinfo.h	(working copy)
@@ -216,7 +216,7 @@
    unused.  We can manage this playing some tricks with weak references.
    But with thread-local locale settings, it becomes quite ungainly unless
    we can use __thread variables.  So only in that case do we attempt this.  */
-#ifndef SHARED
+#if !defined SHARED && !defined IN_GLIBC_LOCALEDEF
 # include <tls.h>
 # define NL_CURRENT_INDIRECT	1
 #endif
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 17051)
+++ Makefile.in	(working copy)
@@ -26,7 +26,8 @@
 		  -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
 		  -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
 		  -DLOCSRCDIR='"$(i18ndir)/locales"' \
-		  -DNOT_IN_libc
+		  -DNOT_IN_libc \
+		  -DIN_GLIBC_LOCALEDEF
 INCLUDES	= -Iglibc/locale/programs \
 		  -I$(srcdir)/include \
 		  -Iglibc/locale \
Index: include/sys/cdefs.h
===================================================================
--- include/sys/cdefs.h	(revision 17051)
+++ include/sys/cdefs.h	(working copy)
@@ -46,3 +46,10 @@
      name proto __asm__ (__ASMNAME (#alias)) __THROW
 # endif
 #endif
+
+#if defined(__GNUC__) \
+    && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
+# define __attribute_alloc_size(...) __attribute__ ((alloc_size (__VA_ARGS__)))
+#else
+# define __attribute_alloc_size(...)
+#endif
Index: ChangeLog.eglibc
===================================================================
--- ChangeLog.eglibc	(revision 17051)
+++ ChangeLog.eglibc	(working copy)
@@ -1,3 +1,8 @@
+2012-02-08  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* Makefile.in (DEFINES): Add -DIN_GLIBC_LOCALEDEF.
+	* include/sys/cdefs.h (__attribute_alloc_size): Define.
+
 2011-09-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* configure.ac: Test for locale_t.

-- 
Joseph S. Myers
joseph@xxxxxxxxxxxxxxxx
_______________________________________________
Patches mailing list
Patches@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/patches