This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, release/2.14/master, updated. glibc-2.14-38-g4eddf93
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Aug 2011 13:50:35 -0000
- Subject: GNU C Library master sources branch, release/2.14/master, updated. glibc-2.14-38-g4eddf93
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.14/master has been updated
via 4eddf93f5cc2711187e5e397a76ed727b440e972 (commit)
via f370dd3dc5372011236ea41d54452231b4ca7858 (commit)
via f47fcd632e676612ff7c74d2cfa83506b2cb4f85 (commit)
via 3ae1021beaaff6d17198959ce21a301992b1f776 (commit)
from e2a309033d626c4b643afaf7e7ad2ccf4930dc35 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4eddf93f5cc2711187e5e397a76ed727b440e972
commit 4eddf93f5cc2711187e5e397a76ed727b440e972
Author: Roland McGrath <roland@hack.frob.com>
Date: Sun Aug 14 16:08:37 2011 -0700
Clean up locale/Makefile variables for -D switches.
(cherry picked from commit 675456ef83622a17c86ae60b94b8e5e3a9d5bb2f)
diff --git a/ChangeLog b/ChangeLog
index 1af4ec2..df81b4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-14 Roland McGrath <roland@hack.frob.com>
+
+ * locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
+ (locale-CPPFLAGS): New variable; put LOCALEDIR, LOCALE_ALIAS_PATH and
+ -Iprograms here.
+ (cppflags-iterator.mk sequence): Use locale-programs in place of nonlib.
+ (localedef-modules): Add localedef.
+ (locale-modules): Add locale.
+
2011-08-13 Ulrich Drepper <drepper@gmail.com>
* intl/l10nflist.c (_nl_normalize_codeset): Make it compile outside
diff --git a/locale/Makefile b/locale/Makefile
index 87c29a5..ccaebf1 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -60,10 +60,11 @@ vpath %.c programs ../crypt
vpath %.h programs
vpath %.gperf programs
-localedef-modules := $(categories:%=ld-%) charmap linereader locfile \
+localedef-modules := localedef $(categories:%=ld-%) \
+ charmap linereader locfile \
repertoire locarchive
localedef-aux := md5
-locale-modules := locale-spec
+locale-modules := locale locale-spec
lib-modules := charmap-dir simple-hash xmalloc xstrdup
@@ -91,22 +92,27 @@ endif
localepath = "$(localedir):$(i18ndir)"
-locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
- -DLOCALEDIR='"$(localedir)"' \
- -DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
- -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
- -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
- -DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
- -Iprograms -DNOT_IN_libc
+# -Iprograms doesn't really belong here, but this gets it at the head
+# of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
+# We need it before the standard -I's to see programs/config.h first.
+locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
+ -DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
+ -Iprograms
+
+CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
+ -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
+ -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
+ -DLOCSRCDIR='"$(i18ndir)/locales"' \
+ -DHAVE_CONFIG_H -DNOT_IN_libc
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-charmap-dir.c = -Wno-write-strings
-# This makes sure -DNOT_IN_libc is passed for all these modules.
+# This makes sure -DNOT_IN_libc et al are passed for all these modules.
cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \
$(locale-modules) $(lib-modules))
-lib := nonlib
+lib := locale-programs
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f370dd3dc5372011236ea41d54452231b4ca7858
commit f370dd3dc5372011236ea41d54452231b4ca7858
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Aug 13 12:21:10 2011 -0400
Fix compile problem
l10nflist compiles for localedef now. Optimize a bit.
(cherry picked from commit f9ddf089f124279836930692b9cd7bc807e60088)
diff --git a/ChangeLog b/ChangeLog
index aeb7f83..1af4ec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-13 Ulrich Drepper <drepper@gmail.com>
+
+ * intl/l10nflist.c (_nl_normalize_codeset): Make it compile outside
+ of libc. Make tolower call locale-independent. Optimize a bit by
+ using isdigit instead of isalnum.
+ * locale/Makefile (locale-CPPFLAGS): Add -DNOT_IN_libc.
+
2011-08-11 Ulrich Drepper <drepper@gmail.com>
* intl/l10nflist.c (_nl_make_l10nflist): Use locale-independent
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index a38e0ef..0b071e0 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -332,13 +332,18 @@ _nl_normalize_codeset (codeset, name_len)
char *retval;
char *wp;
size_t cnt;
+#ifdef NOT_IN_libc
+ locale_t locale = newlocale (0, "C", NULL);
+#else
+# define locale _nl_C_locobj_ptr
+#endif
for (cnt = 0; cnt < name_len; ++cnt)
- if (__isalnum_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
+ if (__isalnum_l ((unsigned char) codeset[cnt], locale))
{
++len;
- if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
+ if (! __isdigit_l ((unsigned char) codeset[cnt], locale))
only_digit = 0;
}
@@ -346,15 +351,14 @@ _nl_normalize_codeset (codeset, name_len)
if (retval != NULL)
{
+ wp = retval;
if (only_digit)
- wp = stpcpy (retval, "iso");
- else
- wp = retval;
+ wp = stpcpy (wp, "iso");
for (cnt = 0; cnt < name_len; ++cnt)
- if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
- *wp++ = tolower ((unsigned char) codeset[cnt]);
- else if (__isdigit_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
+ if (__isalpha_l ((unsigned char) codeset[cnt], locale))
+ *wp++ = __tolower_l ((unsigned char) codeset[cnt], locale);
+ else if (__isdigit_l ((unsigned char) codeset[cnt], locale))
*wp++ = codeset[cnt];
*wp = '\0';
diff --git a/locale/Makefile b/locale/Makefile
index 2dbd8dc..87c29a5 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1991,1992,1995-2003,2005,2009 Free Software Foundation, Inc.
+# Copyright (C) 1991,1992,1995-2003,2005,2009,2011
+# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -96,7 +97,7 @@ locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
-DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
- -Iprograms
+ -Iprograms -DNOT_IN_libc
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f47fcd632e676612ff7c74d2cfa83506b2cb4f85
commit f47fcd632e676612ff7c74d2cfa83506b2cb4f85
Author: Ulrich Drepper <drepper@gmail.com>
Date: Thu Aug 11 14:04:08 2011 -0400
Locale-independent parsing in libintl
(cherry picked from commit 89edf2e9119b57fc404891670d2bc47bdfdb61ef)
diff --git a/ChangeLog b/ChangeLog
index 0be6e1b..aeb7f83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-11 Ulrich Drepper <drepper@gmail.com>
+
+ * intl/l10nflist.c (_nl_make_l10nflist): Use locale-independent
+ classification.
+
2011-07-22 Andreas Schwab <schwab@redhat.com>
* resolv/res_init.c (__res_vinit): Properly tokenize nameserver
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 2c06a91..a38e0ef 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2002, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2002, 2004, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -134,7 +134,7 @@ argz_next__ (argz, argz_len, entry)
if (entry)
{
if (entry < argz + argz_len)
- entry = strchr (entry, '\0') + 1;
+ entry = strchr (entry, '\0') + 1;
return entry >= argz + argz_len ? NULL : (char *) entry;
}
@@ -334,11 +334,11 @@ _nl_normalize_codeset (codeset, name_len)
size_t cnt;
for (cnt = 0; cnt < name_len; ++cnt)
- if (isalnum ((unsigned char) codeset[cnt]))
+ if (__isalnum_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
{
++len;
- if (isalpha ((unsigned char) codeset[cnt]))
+ if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
only_digit = 0;
}
@@ -352,9 +352,9 @@ _nl_normalize_codeset (codeset, name_len)
wp = retval;
for (cnt = 0; cnt < name_len; ++cnt)
- if (isalpha ((unsigned char) codeset[cnt]))
+ if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
*wp++ = tolower ((unsigned char) codeset[cnt]);
- else if (isdigit ((unsigned char) codeset[cnt]))
+ else if (__isdigit_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
*wp++ = codeset[cnt];
*wp = '\0';
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3ae1021beaaff6d17198959ce21a301992b1f776
commit 3ae1021beaaff6d17198959ce21a301992b1f776
Author: Andreas Schwab <schwab@redhat.com>
Date: Tue Aug 9 10:07:10 2011 -0400
Fix stack alignment on x86_64
(cherry picked from commit a724d1b9bfa0f6ee9146b365e43ea6e245d0cf0c)
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index c545b07..7411ae5 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-08 Andreas Schwab <schwab@redhat.com>
+
+ * sysdeps/unix/sysv/linux/x86_64/cancellation.S: Maintain aligned
+ stack.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise.
+
2011-06-30 Ulrich Drepper <drepper@gmail.com>
* nptl-init.c (__nptl_set_robust): New function.
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
index 6806962..a06cd9b 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2009.
@@ -71,7 +71,9 @@ ENTRY(__pthread_enable_asynccancel)
1: ret
-3: movq $TCB_PTHREAD_CANCELED, %fs:RESULT
+3: subq $8, %rsp
+ cfi_adjust_cfa_offset(8)
+ movq $TCB_PTHREAD_CANCELED, %fs:RESULT
lock
orl $TCB_EXITING_BITMASK, %fs:CANCELHANDLING
movq %fs:CLEANUP_JMP_BUF, %rdi
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
index e6535fb..48ea8b9 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2005, 2007, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2005, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -63,9 +63,9 @@ __pthread_cond_timedwait:
cfi_adjust_cfa_offset(8)
cfi_rel_offset(%r15, 0)
#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
-# define FRAME_SIZE 32
+# define FRAME_SIZE (32+8)
#else
-# define FRAME_SIZE 48
+# define FRAME_SIZE (48+8)
#endif
subq $FRAME_SIZE, %rsp
cfi_adjust_cfa_offset(FRAME_SIZE)
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
index f5b929e..7535baa 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2007, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -45,7 +45,7 @@ __pthread_cond_wait:
cfi_lsda(DW_EH_PE_udata4, .LexceptSTART)
#endif
-#define FRAME_SIZE 32
+#define FRAME_SIZE (32+8)
leaq -FRAME_SIZE(%rsp), %rsp
cfi_adjust_cfa_offset(FRAME_SIZE)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 21 +++++++++++++
intl/l10nflist.c | 24 +++++++++------
locale/Makefile | 31 ++++++++++++-------
nptl/ChangeLog | 7 ++++
nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S | 6 ++-
.../sysv/linux/x86_64/pthread_cond_timedwait.S | 6 ++--
.../unix/sysv/linux/x86_64/pthread_cond_wait.S | 4 +-
7 files changed, 70 insertions(+), 29 deletions(-)
hooks/post-receive
--
GNU C Library master sources