[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r21694 - in /fsf/trunk/libc: ./ resolv/ soft-fp/ timezone/
- To: commits@xxxxxxxxxx
- Subject: [Commits] r21694 - in /fsf/trunk/libc: ./ resolv/ soft-fp/ timezone/
- From: eglibc@xxxxxxxxxx
- Date: Wed, 14 Nov 2012 00:02:01 -0000
Author: eglibc
Date: Wed Nov 14 00:02:00 2012
New Revision: 21694
Log:
Import glibc-mainline for 2012-11-14
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/NEWS
fsf/trunk/libc/resolv/netdb.h
fsf/trunk/libc/soft-fp/op-common.h
fsf/trunk/libc/soft-fp/soft-fp.h
fsf/trunk/libc/timezone/Makefile
fsf/trunk/libc/timezone/tzselect.ksh
fsf/trunk/libc/timezone/zdump.c
fsf/trunk/libc/timezone/zic.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Nov 14 00:02:00 2012
@@ -1,3 +1,25 @@
+2012-11-13 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * timezone/tzselect.ksh: Update from tzcode git revision
+ a435f9f0ecafa56d9e0263835836bd0c64cd7307.
+ * timezone/zdump.c: Likewise.
+ * timezone/zic.c: Likewise.
+ * timezone/Makefile ($(objpfx)version.h): Only include $(version)
+ in TZVERSION setting, not $(PKGVERSION).
+ ($(objpfx)tzselect): Likewise. Also substitute PKGVERSION and
+ REPORT_BUGS_TO settings.
+
+ [BZ #14838]
+ * resolv/netdb.h [__USE_XOPEN_EXTENDED] (IPPORT_RESERVED): Define
+ macro.
+
+2012-11-13 Marcus Shawcroft <marcus.shawcroft@xxxxxxxxxx>
+
+ * soft-fp/op-common.h (_FP_PACK_SEMIRAW): Move underflow
+ detection to immediately after _FP_ROUND().
+ * soft-fp/soft-fp.h (_FP_ROUND): Don't round if working
+ bits are 0.
+
2012-11-11 David S. Miller <davem@xxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Include
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Wed Nov 14 00:02:00 2012
@@ -19,7 +19,7 @@
14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621,
14638, 14645, 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716,
14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805,
- 14807, 14809, 14811, 14815, 14821, 14824.
+ 14807, 14809, 14811, 14815, 14821, 14824, 14838.
* Port to ARM AArch64 contributed by Linaro.
Modified: fsf/trunk/libc/resolv/netdb.h
==============================================================================
--- fsf/trunk/libc/resolv/netdb.h (original)
+++ fsf/trunk/libc/resolv/netdb.h Wed Nov 14 00:02:00 2012
@@ -76,7 +76,7 @@
# define NO_ADDRESS NO_DATA /* No address, look for MX record. */
#endif
-#ifdef __USE_XOPEN2K
+#if defined __USE_XOPEN2K || defined __USE_XOPEN_EXTENDED
/* Highest reserved Internet port number. */
# define IPPORT_RESERVED 1024
#endif
Modified: fsf/trunk/libc/soft-fp/op-common.h
==============================================================================
--- fsf/trunk/libc/soft-fp/op-common.h (original)
+++ fsf/trunk/libc/soft-fp/op-common.h Wed Nov 14 00:02:00 2012
@@ -134,6 +134,12 @@
#define _FP_PACK_SEMIRAW(fs, wc, X) \
do { \
_FP_ROUND(wc, X); \
+ if (X##_e == 0 && !_FP_FRAC_ZEROP_##wc(X)) \
+ { \
+ if ((FP_CUR_EXCEPTIONS & FP_EX_INEXACT) \
+ || (FP_TRAPPING_EXCEPTIONS & FP_EX_UNDERFLOW)) \
+ FP_SET_EXCEPTION(FP_EX_UNDERFLOW); \
+ } \
if (_FP_FRAC_HIGH_##fs(X) \
& (_FP_OVERFLOW_##fs >> 1)) \
{ \
@@ -143,24 +149,15 @@
_FP_OVERFLOW_SEMIRAW(fs, wc, X); \
} \
_FP_FRAC_SRL_##wc(X, _FP_WORKBITS); \
- if (!_FP_EXP_NORMAL(fs, wc, X) && !_FP_FRAC_ZEROP_##wc(X)) \
+ if (X##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(X)) \
{ \
- if (X##_e == 0) \
+ if (!_FP_KEEPNANFRACP) \
{ \
- if ((FP_CUR_EXCEPTIONS & FP_EX_INEXACT) \
- || (FP_TRAPPING_EXCEPTIONS & FP_EX_UNDERFLOW)) \
- FP_SET_EXCEPTION(FP_EX_UNDERFLOW); \
+ _FP_FRAC_SET_##wc(X, _FP_NANFRAC_##fs); \
+ X##_s = _FP_NANSIGN_##fs; \
} \
else \
- { \
- if (!_FP_KEEPNANFRACP) \
- { \
- _FP_FRAC_SET_##wc(X, _FP_NANFRAC_##fs); \
- X##_s = _FP_NANSIGN_##fs; \
- } \
- else \
- _FP_FRAC_HIGH_RAW_##fs(X) |= _FP_QNANBIT_##fs; \
- } \
+ _FP_FRAC_HIGH_RAW_##fs(X) |= _FP_QNANBIT_##fs; \
} \
} while (0)
Modified: fsf/trunk/libc/soft-fp/soft-fp.h
==============================================================================
--- fsf/trunk/libc/soft-fp/soft-fp.h (original)
+++ fsf/trunk/libc/soft-fp/soft-fp.h Wed Nov 14 00:02:00 2012
@@ -158,22 +158,24 @@
#define _FP_ROUND(wc, X) \
do { \
if (_FP_FRAC_LOW_##wc(X) & 7) \
- FP_SET_EXCEPTION(FP_EX_INEXACT); \
- switch (FP_ROUNDMODE) \
- { \
- case FP_RND_NEAREST: \
- _FP_ROUND_NEAREST(wc,X); \
- break; \
- case FP_RND_ZERO: \
- _FP_ROUND_ZERO(wc,X); \
- break; \
- case FP_RND_PINF: \
- _FP_ROUND_PINF(wc,X); \
- break; \
- case FP_RND_MINF: \
- _FP_ROUND_MINF(wc,X); \
- break; \
- } \
+ { \
+ FP_SET_EXCEPTION(FP_EX_INEXACT); \
+ switch (FP_ROUNDMODE) \
+ { \
+ case FP_RND_NEAREST: \
+ _FP_ROUND_NEAREST(wc,X); \
+ break; \
+ case FP_RND_ZERO: \
+ _FP_ROUND_ZERO(wc,X); \
+ break; \
+ case FP_RND_PINF: \
+ _FP_ROUND_PINF(wc,X); \
+ break; \
+ case FP_RND_MINF: \
+ _FP_ROUND_MINF(wc,X); \
+ break; \
+ } \
+ } \
} while (0)
#define FP_CLS_NORMAL 0
Modified: fsf/trunk/libc/timezone/Makefile
==============================================================================
--- fsf/trunk/libc/timezone/Makefile (original)
+++ fsf/trunk/libc/timezone/Makefile Wed Nov 14 00:02:00 2012
@@ -57,7 +57,7 @@
$(objpfx)zic.o $(objpfx)zdump.o: $(objpfx)version.h
$(objpfx)version.h: $(common-objpfx)config.make
- echo 'static char const TZVERSION[]="$(PKGVERSION)$(version)";' \
+ echo 'static char const TZVERSION[]="$(version)";' \
> $@.new
mv -f $@.new $@
@@ -115,7 +115,9 @@
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
sed -e 's|/bin/bash|$(KSH)|g' \
-e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
- -e '/TZVERSION=/s|see_Makefile|"$(PKGVERSION)$(version)"|' \
+ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
+ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
+ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
< $< > $@.new
chmod 555 $@.new
mv -f $@.new $@
Modified: fsf/trunk/libc/timezone/tzselect.ksh
==============================================================================
--- fsf/trunk/libc/timezone/tzselect.ksh (original)
+++ fsf/trunk/libc/timezone/tzselect.ksh Wed Nov 14 00:02:00 2012
@@ -1,6 +1,8 @@
#!/bin/bash
+PKGVERSION='(tzcode) '
TZVERSION=see_Makefile
+REPORT_BUGS_TO=tz@xxxxxxxx
# Ask the user about the time zone, and output the resulting TZ value to stdout.
# Interact with the user via stderr and stdin.
@@ -43,14 +45,14 @@
Usage: tzselect
Select a time zone interactively.
-Report bugs to tz@xxxxxxxxxxxxxxxxxx
+Report bugs to $REPORT_BUGS_TO.
EOF
- exit 0
+ exit
elif [ "$1" = "--version" ]; then
cat <<EOF
-tzselect $TZVERSION
+tzselect $PKGVERSION$TZVERSION
EOF
- exit 0
+ exit
fi
# Make sure the tables are readable.
Modified: fsf/trunk/libc/timezone/zdump.c
==============================================================================
--- fsf/trunk/libc/timezone/zdump.c (original)
+++ fsf/trunk/libc/timezone/zdump.c Wed Nov 14 00:02:00 2012
@@ -272,8 +272,8 @@
(void) fprintf(stream,
_("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n\
\n\
-Report bugs to tz@xxxxxxxxxxxxxxxxxx\n"),
- progname, progname);
+Report bugs to %s.\n"),
+ progname, progname, REPORT_BUGS_TO);
exit(status);
}
@@ -309,7 +309,7 @@
progname = argv[0];
for (i = 1; i < argc; ++i)
if (strcmp(argv[i], "--version") == 0) {
- (void) printf("%s\n", TZVERSION);
+ (void) printf("zdump %s%s\n", PKGVERSION, TZVERSION);
exit(EXIT_SUCCESS);
} else if (strcmp(argv[i], "--help") == 0) {
usage(stdout, EXIT_SUCCESS);
Modified: fsf/trunk/libc/timezone/zic.c
==============================================================================
--- fsf/trunk/libc/timezone/zic.c (original)
+++ fsf/trunk/libc/timezone/zic.c Wed Nov 14 00:02:00 2012
@@ -426,8 +426,8 @@
[ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\
\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n\
\n\
-Report bugs to tz@xxxxxxxxxxxxxxxxxx\n"),
- progname, progname);
+Report bugs to %s.\n"),
+ progname, progname, REPORT_BUGS_TO);
exit(status);
}
@@ -462,7 +462,7 @@
}
for (i = 1; i < argc; ++i)
if (strcmp(argv[i], "--version") == 0) {
- (void) printf("%s\n", TZVERSION);
+ (void) printf("zic %s%s\n", PKGVERSION, TZVERSION);
exit(EXIT_SUCCESS);
} else if (strcmp(argv[i], "--help") == 0) {
usage(stdout, EXIT_SUCCESS);
@@ -2534,8 +2534,8 @@
++cp;
if (cp - string == 0)
mp = _("time zone abbreviation lacks alphabetic at start");
- if (noise && cp - string > 3)
-mp = _("time zone abbreviation has more than 3 alphabetics");
+ if (noise && cp - string < 3)
+mp = _("time zone abbreviation has fewer than 3 alphabetics");
if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
mp = _("time zone abbreviation has too many alphabetics");
if (mp == NULL && (*cp == '+' || *cp == '-')) {
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits