[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r23947 - in /trunk: ./ libc/ libc/benchtests/ libc/inet/netinet/ libc/locale/programs/ libc/localedata/ libc/localedata/loca...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r23947 - in /trunk: ./ libc/ libc/benchtests/ libc/inet/netinet/ libc/locale/programs/ libc/localedata/ libc/localedata/loca...
- From: joseph@xxxxxxxxxx
- Date: Fri, 06 Sep 2013 21:34:39 -0000
Author: joseph
Date: Fri Sep 6 21:34:38 2013
New Revision: 23947
Log:
Merge changes between r23927 and r23946 from /fsf/trunk.
Added:
trunk/libc/benchtests/bench-memrchr-ifunc.c
- copied unchanged from r23946, fsf/trunk/libc/benchtests/bench-memrchr-ifunc.c
trunk/libc/benchtests/bench-memrchr.c
- copied unchanged from r23946, fsf/trunk/libc/benchtests/bench-memrchr.c
trunk/libc/string/test-memrchr-ifunc.c
- copied unchanged from r23946, fsf/trunk/libc/string/test-memrchr-ifunc.c
trunk/libc/string/test-memrchr.c
- copied unchanged from r23946, fsf/trunk/libc/string/test-memrchr.c
Modified:
trunk/ (props changed)
trunk/libc/ChangeLog
trunk/libc/benchtests/Makefile
trunk/libc/benchtests/bench-memchr.c
trunk/libc/inet/netinet/in.h
trunk/libc/locale/programs/locfile.c
trunk/libc/localedata/ChangeLog
trunk/libc/localedata/locales/nr_ZA
trunk/libc/localedata/locales/nso_ZA
trunk/libc/localedata/locales/ss_ZA
trunk/libc/localedata/locales/tk_TM
trunk/libc/localedata/locales/tn_ZA
trunk/libc/localedata/locales/ve_ZA
trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data (props changed)
trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data (props changed)
trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data (props changed)
trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data (props changed)
trunk/libc/string/Makefile
trunk/libc/sysdeps/powerpc/powerpc32/power7/memrchr.S
trunk/libc/sysdeps/powerpc/powerpc64/power7/memrchr.S
trunk/libc/sysdeps/unix/sysv/linux/bits/in.h
trunk/libc/sysdeps/unix/sysv/linux/tst-fanotify.c
Propchange: trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 6 21:34:38 2013
@@ -1,1 +1,1 @@
-/fsf/trunk:15224-23927
+/fsf/trunk:15224-23946
Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Fri Sep 6 21:34:38 2013
@@ -1,3 +1,124 @@
+2013-09-06 Richard Sandiford <richard@xxxxxxxxxxxxxxxx>
+ Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * locale/programs/locfile.c: Include <assert.h>, <wchar.h> and
+ "localeinfo.h".
+ (obstack_chunk_alloc): New macro.
+ (obstack_chunk_free): Likewise.
+ (record_offset): New function.
+ (init_locale_data): Likewise.
+ (align_locale_data): Likewise.
+ (add_locale_empty): Likewise.
+ (add_locale_raw_data): Likewise.
+ (add_locale_raw_obstack): Likewise.
+ (add_locale_string): Likewise.
+ (add_locale_wstring): Likewise.
+ (add_locale_uint32): Likewise.
+ (add_locale_uint32_array): Likewise.
+ (add_locale_char): Likewise.
+ (start_locale_structure): Likewise.
+ (end_locale_structure): Likewise.
+ (start_locale_prelude): Likewise.
+ (end_locale_prelude): Likewise.
+ (write_locale_data): Take locale_file structure rather than an
+ iovec.
+ * locale/programs/locfile.h: Include "obstack.h".
+ (struct locale_file): Change to store locale file contents instead
+ of header.
+ (init_locale_data): New prototype.
+ (align_locale_data): Likewise.
+ (add_locale_empty): Likewise.
+ (add_locale_raw_data): Likewise.
+ (add_locale_raw_obstack): Likewise.
+ (add_locale_string): Likewise.
+ (add_locale_wstring): Likewise.
+ (add_locale_uint32): Likewise.
+ (add_locale_uint32_array): Likewise.
+ (add_locale_char): Likewise.
+ (start_locale_structure): Likewise.
+ (end_locale_structure): Likewise.
+ (start_locale_prelude): Likewise.
+ (end_locale_prelude): Likewise.
+ (write_locale_data): Update prototype.
+ * locale/programs/3level.h (struct TABLE): Remove result field.
+ (CONCAT(TABLE,_finalize)): Change to CONCAT(add_locale_,TABLE).
+ Use new locale_file interface.
+ [!NO_FINALIZE]: Change condition to [!NO_ADD_LOCALE].
+ (NO_FINALIZE): Change #undef to #undef of NO_ADD_LOCALE.
+ * locale/programs/ld-address.c (address_output): Use new
+ locale_file interface.
+ * locale/programs/ld-collate.c (NO_FINALIZE): Change to
+ NO_ADD_LOCALE.
+ (collate_finish): Don't call collseq_table_finalize.
+ (collate_output): Use new locale_file interface.
+ * locale/programs/ld-ctype.c: Move includes of "3level.h" earlier
+ in file.
+ (NO_FINALIZE): Change to NO_ADD_LOCALE.
+ (TABLE): Move defines earlier in file.
+ (ELEMENT): Likewise.
+ (DEFAULT): Likewise.
+ (wctrans_table_add): Move macro and inline function earlier in
+ file.
+ (struct wctype_table): Move type earlier in file.
+ (add_locale_wctype_table): New static prototype.
+ (struct locale_ctype_t): Use logical types instead of struct iovec
+ pointers for members.
+ (ctype_output): Use new locale_file interface.
+ (wctype_table_finalize): Change to add_locale_wctype_table. Use
+ new locale_file interface.
+ (allocate_arrays): Update for use of new locale_file interface.
+ * locale/programs/ld-identification.c (identification_output): Use
+ new locale_file interface.
+ * locale/programs/ld-measurement.c (measurement_output): Likewise.
+ * locale/programs/ld-messages.c (messages_output): Likewise.
+ * locale/programs/ld-monetary.c (monetary_output): Likewise.
+ * locale/programs/ld-name.c (name_output): Likewise.
+ * locale/programs/ld-numeric.c (numeric_output): Likewise.
+ * locale/programs/ld-paper.c (paper_output): Likewise.
+ * locale/programs/ld-telephone.c (telephone_output): Likewise.
+ * locale/programs/ld-time.c (time_output): Likewise.
+
+2013-09-06 Adhemerval Zanella <azanella@xxxxxxxxxxxxxxxxxx>
+
+ * benchtests/Makefile: Add memrchr benchmark.
+ * benchtests/bench-memchr.c (USE_AS_MEMRCHR): Add define to use
+ benchmark as memrchr.
+ * benchtests/bench-memrchr-ifunc.c: New file.
+ * benchtests/bench-memrchr.c: New file.
+
+2013-09-06 Will Newton <will.newton@xxxxxxxxxx>
+
+ * benchtests/Makefile (string-bench): Add memcpy.
+
+2013-09-05 Carlos O'Donell <carlos@xxxxxxxxxx>
+ Cong Wang <amwang@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/bits/in.h
+ [_UAPI_LINUX_IN6_H]: Define __USE_KERNEL_IPV6_DEFS.
+ * inet/netinet/in.h: Move in_addr definition and bits/in.h inclusion
+ before __USE_KERNEL_IPV6_DEFS uses.
+ * inet/netinet/in.h [!__USE_KERNEL_IPV6_DEFS]: Define IPPROTO_MH, and
+ IPPROTO_BEETPH.
+ [__USE_KERNEL_IPV6_DEFS]: Don't define any of IPPROTO_*, in6_addr,
+ sockaddr_in6, or ipv6_mreq.
+
+2013-09-05 Adhemerval Zanella <azanella@xxxxxxxxxxxxxxxxxx>
+
+ * sysdeps/powerpc/powerpc32/power7/memrchr.S (__memrchr): Fix invalid
+ memory access for final bytes in some large inputs.
+ * sysdeps/powerpc/powerpc64/power7/memrchr.S (__memrchr): Likewise.
+
+2013-09-05 Adhemerval Zanella <azanella@xxxxxxxxxxxxxxxxxx>
+
+ * string/test-memrchr.c: New file.
+ * string/test-memrchr-ifunc.c: New file.
+ * string/Makefile: Add new memrchr testcase.
+
+2013-09-05 Mike Frysinger <vapier@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/tst-fanotify.c (do_test): Skip test when
+ fanotify_init returns EPERM.
+
2013-09-04 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* conform/conformtest.pl (newtoken): Treat tokens not allowed as
Modified: trunk/libc/benchtests/Makefile
==============================================================================
--- trunk/libc/benchtests/Makefile (original)
+++ trunk/libc/benchtests/Makefile Fri Sep 6 21:34:38 2013
@@ -24,11 +24,11 @@
sinh tan tanh
# String function benchmarks.
-string-bench := bcopy bzero memccpy memchr memcmp memmem memmove mempcpy \
- memset rawmemchr stpcpy stpncpy strcasecmp strcasestr strcat \
- strchr strchrnul strcmp strcpy strcspn strlen strncasecmp \
- strncat strncmp strncpy strnlen strpbrk strrchr strspn strstr \
- strcpy_chk stpcpy_chk
+string-bench := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \
+ mempcpy memset rawmemchr stpcpy stpncpy strcasecmp strcasestr \
+ strcat strchr strchrnul strcmp strcpy strcspn strlen \
+ strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \
+ strspn strstr strcpy_chk stpcpy_chk memrchr
string-bench-ifunc := $(addsuffix -ifunc, $(string-bench))
string-bench-all := $(string-bench) $(string-bench-ifunc)
Modified: trunk/libc/benchtests/bench-memchr.c
==============================================================================
--- trunk/libc/benchtests/bench-memchr.c (original)
+++ trunk/libc/benchtests/bench-memchr.c Fri Sep 6 21:34:38 2013
@@ -16,9 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define TEST_MAIN
-#define TEST_NAME "memchr"
-#include "bench-string.h"
+#ifndef USE_AS_MEMRCHR
+# define TEST_MAIN
+# define TEST_NAME "memchr"
+# include "bench-string.h"
typedef char *(*proto_t) (const char *, int, size_t);
char *simple_memchr (const char *, int, size_t);
@@ -34,6 +35,7 @@
return (char *) s - 1;
return NULL;
}
+#endif
static void
do_one_test (impl_t *impl, const char *s, int c, size_t n, char *exp_res)
Modified: trunk/libc/inet/netinet/in.h
==============================================================================
--- trunk/libc/inet/netinet/in.h (original)
+++ trunk/libc/inet/netinet/in.h Fri Sep 6 21:34:38 2013
@@ -26,13 +26,21 @@
__BEGIN_DECLS
+/* Internet address. */
+typedef uint32_t in_addr_t;
+struct in_addr
+ {
+ in_addr_t s_addr;
+ };
+
+/* Get system-specific definitions. */
+#include <bits/in.h>
+
/* Standard well-defined IP protocols. */
enum
{
IPPROTO_IP = 0, /* Dummy protocol for TCP. */
#define IPPROTO_IP IPPROTO_IP
- IPPROTO_HOPOPTS = 0, /* IPv6 Hop-by-Hop options. */
-#define IPPROTO_HOPOPTS IPPROTO_HOPOPTS
IPPROTO_ICMP = 1, /* Internet Control Message Protocol. */
#define IPPROTO_ICMP IPPROTO_ICMP
IPPROTO_IGMP = 2, /* Internet Group Management Protocol. */
@@ -55,10 +63,6 @@
#define IPPROTO_DCCP IPPROTO_DCCP
IPPROTO_IPV6 = 41, /* IPv6 header. */
#define IPPROTO_IPV6 IPPROTO_IPV6
- IPPROTO_ROUTING = 43, /* IPv6 routing header. */
-#define IPPROTO_ROUTING IPPROTO_ROUTING
- IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header. */
-#define IPPROTO_FRAGMENT IPPROTO_FRAGMENT
IPPROTO_RSVP = 46, /* Reservation Protocol. */
#define IPPROTO_RSVP IPPROTO_RSVP
IPPROTO_GRE = 47, /* General Routing Encapsulation. */
@@ -67,14 +71,10 @@
#define IPPROTO_ESP IPPROTO_ESP
IPPROTO_AH = 51, /* authentication header. */
#define IPPROTO_AH IPPROTO_AH
- IPPROTO_ICMPV6 = 58, /* ICMPv6. */
-#define IPPROTO_ICMPV6 IPPROTO_ICMPV6
- IPPROTO_NONE = 59, /* IPv6 no next header. */
-#define IPPROTO_NONE IPPROTO_NONE
- IPPROTO_DSTOPTS = 60, /* IPv6 destination options. */
-#define IPPROTO_DSTOPTS IPPROTO_DSTOPTS
IPPROTO_MTP = 92, /* Multicast Transport Protocol. */
#define IPPROTO_MTP IPPROTO_MTP
+ IPPROTO_BEETPH = 94, /* IP option pseudo header for BEET. */
+#define IPPROTO_BEETPH IPPROTO_BEETPH
IPPROTO_ENCAP = 98, /* Encapsulation Header. */
#define IPPROTO_ENCAP IPPROTO_ENCAP
IPPROTO_PIM = 103, /* Protocol Independent Multicast. */
@@ -90,6 +90,28 @@
IPPROTO_MAX
};
+/* If __USER_KERNEL_IPV6_DEFS is defined then the user has included the kernel
+ network headers first and we should use those ABI-identical definitions
+ instead of our own. */
+#ifndef __USE_KERNEL_IPV6_DEFS
+enum
+ {
+ IPPROTO_HOPOPTS = 0, /* IPv6 Hop-by-Hop options. */
+#define IPPROTO_HOPOPTS IPPROTO_HOPOPTS
+ IPPROTO_ROUTING = 43, /* IPv6 routing header. */
+#define IPPROTO_ROUTING IPPROTO_ROUTING
+ IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header. */
+#define IPPROTO_FRAGMENT IPPROTO_FRAGMENT
+ IPPROTO_ICMPV6 = 58, /* ICMPv6. */
+#define IPPROTO_ICMPV6 IPPROTO_ICMPV6
+ IPPROTO_NONE = 59, /* IPv6 no next header. */
+#define IPPROTO_NONE IPPROTO_NONE
+ IPPROTO_DSTOPTS = 60, /* IPv6 destination options. */
+#define IPPROTO_DSTOPTS IPPROTO_DSTOPTS
+ IPPROTO_MH = 135, /* IPv6 mobility header. */
+#define IPPROTO_MH IPPROTO_MH
+ };
+#endif /* !__USE_KERNEL_IPV6_DEFS */
/* Type to represent a port. */
typedef uint16_t in_port_t;
@@ -134,15 +156,6 @@
IPPORT_USERRESERVED = 5000
};
-
-/* Internet address. */
-typedef uint32_t in_addr_t;
-struct in_addr
- {
- in_addr_t s_addr;
- };
-
-
/* Definitions of the bits in an Internet address integer.
On subnets, host and network parts are found according to
@@ -191,7 +204,7 @@
#define INADDR_ALLRTRS_GROUP ((in_addr_t) 0xe0000002) /* 224.0.0.2 */
#define INADDR_MAX_LOCAL_GROUP ((in_addr_t) 0xe00000ff) /* 224.0.0.255 */
-
+#ifndef __USE_KERNEL_IPV6_DEFS
/* IPv6 address */
struct in6_addr
{
@@ -209,6 +222,7 @@
# define s6_addr32 __in6_u.__u6_addr32
#endif
};
+#endif /* !__USE_KERNEL_IPV6_DEFS */
extern const struct in6_addr in6addr_any; /* :: */
extern const struct in6_addr in6addr_loopback; /* ::1 */
@@ -233,6 +247,7 @@
sizeof (struct in_addr)];
};
+#ifndef __USE_KERNEL_IPV6_DEFS
/* Ditto, for IPv6. */
struct sockaddr_in6
{
@@ -242,7 +257,7 @@
struct in6_addr sin6_addr; /* IPv6 address */
uint32_t sin6_scope_id; /* IPv6 scope-id */
};
-
+#endif /* !__USE_KERNEL_IPV6_DEFS */
#if defined __USE_MISC || defined __USE_GNU
/* IPv4 multicast request. */
@@ -268,7 +283,7 @@
};
#endif
-
+#ifndef __USE_KERNEL_IPV6_DEFS
/* Likewise, for IPv6. */
struct ipv6_mreq
{
@@ -278,7 +293,7 @@
/* local interface */
unsigned int ipv6mr_interface;
};
-
+#endif /* !__USE_KERNEL_IPV6_DEFS */
#if defined __USE_MISC || defined __USE_GNU
/* Multicast group request. */
@@ -348,10 +363,6 @@
+ ((numsrc) \
* sizeof (struct sockaddr_storage)))
#endif
-
-
-/* Get system-specific definitions. */
-#include <bits/in.h>
/* Functions to convert between host and network byte order.
Modified: trunk/libc/locale/programs/locfile.c
==============================================================================
--- trunk/libc/locale/programs/locfile.c (original)
+++ trunk/libc/locale/programs/locfile.c Fri Sep 6 21:34:38 2013
@@ -545,12 +545,12 @@
/* The target's value of __align__(uint32_t) - 1. */
unsigned int uint32_align_mask = 3;
-/* When called outside a start_locale_structure()/end_locale_structure()
- or start_locale_prelude()/end_locale_prelude() block, record that the
+/* When called outside a start_locale_structure/end_locale_structure
+ or start_locale_prelude/end_locale_prelude block, record that the
next byte in FILE's obstack will be the first byte of a new element.
- Do likewise for the first call inside a start_locale_structure()/
- end_locale_structure() block. */
-static inline void
+ Do likewise for the first call inside a start_locale_structure/
+ end_locale_structure block. */
+static void
record_offset (struct locale_file *file)
{
if (file->structure_stage < 2)
Modified: trunk/libc/localedata/ChangeLog
==============================================================================
--- trunk/libc/localedata/ChangeLog (original)
+++ trunk/libc/localedata/ChangeLog Fri Sep 6 21:34:38 2013
@@ -1,3 +1,12 @@
+2013-09-06 Chris Leonard <cjl@sugarlabs,.org>
+
+ * locales/nr_ZA: Deduplicate country_car.
+ * locales/nso_ZA: Likewise.
+ * locales/ss_ZA: Likewise.
+ * locales/tn_ZA: Likewise.
+ * locales/ve_ZA: Likewise.
+ * locales/tk_TM: Comment reformat.
+
2013-09-04 Chris Leonard <cjl@sugarlabs,.org>
[BZ #15923]
Modified: trunk/libc/localedata/locales/nr_ZA
==============================================================================
--- trunk/libc/localedata/locales/nr_ZA (original)
+++ trunk/libc/localedata/locales/nr_ZA Fri Sep 6 21:34:38 2013
@@ -227,7 +227,7 @@
% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
-% "ZA"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -281,7 +281,4 @@
% ZAF
country_ab3 "<U005A><U0041><U0046>"
country_num 710
-% ZA
-country_car "<U005A><U0041>"
-
END LC_ADDRESS
Modified: trunk/libc/localedata/locales/nso_ZA
==============================================================================
--- trunk/libc/localedata/locales/nso_ZA (original)
+++ trunk/libc/localedata/locales/nso_ZA Fri Sep 6 21:34:38 2013
@@ -223,7 +223,7 @@
% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
-% "ZA"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -277,8 +277,6 @@
% ZAF
country_ab3 "<U005A><U0041><U0046>"
country_num 710
-% ZA
-country_car "<U005A><U0041>"
END LC_ADDRESS
Modified: trunk/libc/localedata/locales/ss_ZA
==============================================================================
--- trunk/libc/localedata/locales/ss_ZA (original)
+++ trunk/libc/localedata/locales/ss_ZA Fri Sep 6 21:34:38 2013
@@ -232,7 +232,7 @@
% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
-% "ZA"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -284,7 +284,5 @@
country_num 710
country_ab2 "<U005A><U0041>"
country_ab3 "<U005A><U0041><U0046>"
-% ZA
-country_car "<U005A><U0041>"
END LC_ADDRESS
Modified: trunk/libc/localedata/locales/tk_TM
==============================================================================
--- trunk/libc/localedata/locales/tk_TM (original)
+++ trunk/libc/localedata/locales/tk_TM Fri Sep 6 21:34:38 2013
@@ -399,18 +399,20 @@
% (used for "yes" in English, but corresponding to "no" in Turkmen (well,
% ÃÂ actually)
%%%%%%%%
-yesstr "<U0068><U0061><U0077><U0061>" % hawa
-nostr "<U00FD><U006F><U006B>" % ÃÂok
+% hawa
+yesstr "<U0068><U0061><U0077><U0061>"
+% ÃÂok
+nostr "<U00FD><U006F><U006B>"
+% [hH]
yesexpr "<U005E><U005B><U0068><U0048>/
-<U005D><U002E><U002A>" % [hH]
+<U005D><U002E><U002A>"
+% [ÃÂÃÂnN]
noexpr "<U005E><U005B><U00FD><U00DD>/
-<U006E><U004E><U005D><U002E><U002A>" % [ÃÂÃÂnN]
+<U006E><U004E><U005D><U002E><U002A>"
END LC_MESSAGES
LC_PAPER
-%
% A4 Paper
-%
height 297
width 210
END LC_PAPER
@@ -433,19 +435,27 @@
<U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073><U0020><U0025>/
<U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025><U004E><U0025>/
<U007A><U0020><U0025><U0054><U0025><U004E><U0025><U0063><U0025><U004E>"
-
+% TÃÂrkmenistan
country_name "<U0054><U00FC><U0072><U006B><U006D>/
-<U0065><U006E><U0069><U0073><U0074><U0061><U006E>" % TÃÂrkmenistan
-country_post "<U0054><U004D>" % TM
-country_car "<U0054><U004D>" % TM
+<U0065><U006E><U0069><U0073><U0074><U0061><U006E>"
+% TM
+country_post "<U0054><U004D>"
+% TM
+country_car "<U0054><U004D>"
country_num 795
-country_ab2 "<U0054><U004D>" % TM
-country_ab3 "<U0054><U004B><U004D>" % TKM
+% TM
+country_ab2 "<U0054><U004D>"
+% TKM
+country_ab3 "<U0054><U004B><U004D>"
+% TÃÂrkmenÃÂe
lang_name "<U0054><U00FC><U0072><U006B><U006D>/
-<U0065><U006E><U00E7><U0065>" % TÃÂrkmenÃÂe
-lang_term "<U0074><U0075><U006B>" % tuk
-lang_lib "<U0074><U0075><U006B>" % tuk
-lang_ab "<U0074><U006B>" % tk
+<U0065><U006E><U00E7><U0065>"
+% tuk
+lang_term "<U0074><U0075><U006B>"
+% tuk
+lang_lib "<U0074><U0075><U006B>"
+% tk
+lang_ab "<U0074><U006B>"
END LC_ADDRESS
LC_TELEPHONE
Modified: trunk/libc/localedata/locales/tn_ZA
==============================================================================
--- trunk/libc/localedata/locales/tn_ZA (original)
+++ trunk/libc/localedata/locales/tn_ZA Fri Sep 6 21:34:38 2013
@@ -235,7 +235,7 @@
% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
-% "ZA"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -288,8 +288,7 @@
% ZAF
country_ab3 "<U005A><U0041><U0046>"
country_num 710
-% ZA
-country_car "<U005A><U0041>"
+
END LC_ADDRESS
Modified: trunk/libc/localedata/locales/ve_ZA
==============================================================================
--- trunk/libc/localedata/locales/ve_ZA (original)
+++ trunk/libc/localedata/locales/ve_ZA Fri Sep 6 21:34:38 2013
@@ -232,7 +232,7 @@
% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic
% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf
-% "ZA"
+% ZA
country_car "<U005A><U0041>"
% FIXME define the following correctly
@@ -287,7 +287,5 @@
country_num 710
country_ab2 "<U005A><U0041>"
country_ab3 "<U005A><U0041><U0046>"
-% ZA
-country_car "<U005A><U0041>"
END LC_ADDRESS
Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 6 21:34:38 2013
@@ -1,2 +1,2 @@
/fsf/trunk/libc/ports/data/c++-types-powerpce500v2-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:19921-23927
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:19921-23946
Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 6 21:34:38 2013
@@ -1,2 +1,2 @@
/fsf/trunk/libc/ports/data/localplt-powerpce500v2-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:19921-23927
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:19921-23946
Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 6 21:34:38 2013
@@ -1,2 +1,2 @@
/fsf/trunk/libc/ports/data/c++-types-powerpce500v1-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:19921-23927
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:19921-23946
Propchange: trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 6 21:34:38 2013
@@ -1,2 +1,2 @@
/fsf/trunk/libc/ports/data/localplt-powerpce500v1-linux-gnu.data:15224-19464
-/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:19921-23927
+/fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:19921-23946
Modified: trunk/libc/string/Makefile
==============================================================================
--- trunk/libc/string/Makefile (original)
+++ trunk/libc/string/Makefile Fri Sep 6 21:34:38 2013
@@ -49,7 +49,7 @@
stpcpy stpncpy strcat strchr strcmp strcpy strcspn \
strlen strncmp strncpy strpbrk strrchr strspn memmem \
strstr strcasestr strnlen strcasecmp strncasecmp \
- strncat rawmemchr strchrnul bcopy bzero
+ strncat rawmemchr strchrnul bcopy bzero memrchr
tests := tester inl-tester noinl-tester testcopy test-ffs \
tst-strlen stratcliff tst-svc tst-inlcall \
bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap \
Modified: trunk/libc/sysdeps/powerpc/powerpc32/power7/memrchr.S
==============================================================================
--- trunk/libc/sysdeps/powerpc/powerpc32/power7/memrchr.S (original)
+++ trunk/libc/sysdeps/powerpc/powerpc32/power7/memrchr.S Fri Sep 6 21:34:38 2013
@@ -101,8 +101,8 @@
/* We're here because the counter reached 0, and that means we
didn't have any matches for BYTE in the whole range. Just return
the original range. */
- addi r9,r8,4
- cmplw cr6,r9,r7
+ addi r8,r8,4
+ cmplw cr6,r8,r7
bgt cr6,L(loop_small)
b L(null)
Modified: trunk/libc/sysdeps/powerpc/powerpc64/power7/memrchr.S
==============================================================================
--- trunk/libc/sysdeps/powerpc/powerpc64/power7/memrchr.S (original)
+++ trunk/libc/sysdeps/powerpc/powerpc64/power7/memrchr.S Fri Sep 6 21:34:38 2013
@@ -102,8 +102,8 @@
/* We're here because the counter reached 0, and that means we
didn't have any matches for BYTE in the whole range. Just return
the original range. */
- addi r9,r8,8
- cmpld cr6,r9,r7
+ addi r8,r8,8
+ cmpld cr6,r8,r7
bgt cr6,L(loop_small)
b L(null)
Modified: trunk/libc/sysdeps/unix/sysv/linux/bits/in.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/bits/in.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/bits/in.h Fri Sep 6 21:34:38 2013
@@ -19,6 +19,18 @@
#ifndef _NETINET_IN_H
# error "Never use <bits/in.h> directly; include <netinet/in.h> instead."
+#endif
+
+/* If the application has already included linux/in6.h from a linux-based
+ kernel then we will not define the IPv6 IPPROTO_* defines, in6_addr (nor the
+ defines), sockaddr_in6, or ipv6_mreq. The ABI used by the linux-kernel and
+ glibc match exactly. Neither the linux kernel nor glibc should break this
+ ABI without coordination. */
+#ifdef _UAPI_LINUX_IN6_H
+/* This is not quite the same API since the kernel always defines s6_addr16 and
+ s6_addr32. This is not a violation of POSIX since POSIX says "at least the
+ following member" and that holds true. */
+# define __USE_KERNEL_IPV6_DEFS
#endif
/* Options for use with `getsockopt' and `setsockopt' at the IP level.
Modified: trunk/libc/sysdeps/unix/sysv/linux/tst-fanotify.c
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/tst-fanotify.c (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/tst-fanotify.c Fri Sep 6 21:34:38 2013
@@ -29,11 +29,14 @@
fd = fanotify_init (0, 0);
if (fd < 0)
{
- if (errno == ENOSYS)
- {
- puts ("SKIP: missing support for fanotify (check CONFIG_FANOTIFY=y)");
- return 0;
- }
+ switch (errno) {
+ case ENOSYS:
+ puts ("SKIP: missing support for fanotify (check CONFIG_FANOTIFY=y)");
+ return 0;
+ case EPERM:
+ puts ("SKIP: missing proper permissions for runtime test");
+ return 0;
+ }
perror ("fanotify_init (0, 0) failed");
return 1;
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits