GIT update of git://sourceware.org/git/glibc.git/release/2.19/master from glibc-2.19 diff --git a/ChangeLog b/ChangeLog index 81c393a..7fa7e06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,68 @@ +2014-06-03 Guo Yixuan + + [BZ #16882] + * nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S + (pthread_spin_lock): Branch out of spin loop to proper location. + * nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S + (pthread_spin_lock): Likewise. + + * nptl/tst-spin4.c: New test. + * nptl/Makefile (tests): Add tst-spin4. + +2014-05-17 Jose E. Marchesi + + [BZ #16958] + * sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S: Add missing + membar to avoid block loads/stores to overlap previous stores. + +2014-05-13 Sami Kerola + + * timezone/Makefile ($(objpfx)tzselect): Use zonedir instead + current working directory + +2014-05-16 Allan McRae + + * po/sv.po: Update Swedish translation from translation project. + +2014-05-16 Aurelien Jarno + + [BZ #16943] + * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Declare prlimit + and prlimit64. + +2014-05-06 Aurelien Jarno + + [BZ# 16916] + * sysdeps/unix/sysv/linux/sparc/bits/eventfd.h (EFD_SEMAPHORE): + Define. + +2014-05-04 Allan McRae + + * po/eo.po: Update Esperanto translation from translation project. + +2014-05-01 David S. Miller + + [BZ #16885] + * sysdeps/sparc/sparc64/strcmp.S: Fix end comparison handling when + multiple zero bytes exist at the end of a string. + Reported by Aurelien Jarno + + * string/test-strcmp.c (check): Add explicit test for situations where + there are multiple zero bytes after the first. + +2014-02-27 Siddhesh Poyarekar + + [BZ #16623] + * sysdeps/ieee754/dbl-64/s_sin.c (__sin): Preserve sign of A + and DA. + (__cos): Likewise. + +2014-02-12 Dylan Alex Simon + + [BZ #16545] + * sysdeps/x86_64/fpu/libm-test-ulps: Update on AMD family 21h + model 1. + 2014-02-06 Carlos O'Donell [BZ #16529] diff --git a/NEWS b/NEWS index 98b479e..64b2b11 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,13 @@ See the end for copying conditions. Please send GNU C library bug reports via using `glibc' in the "product" field. +Version 2.19.1 + +* The following bugs are resolved with this release: + + 16545, 16623, 16882, 16885, 16916, 16943, 16958. + + Version 2.19 * The following bugs are resolved with this release: diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h index 929cd87..796df90 100644 --- a/misc/sys/xattr.h +++ b/misc/sys/xattr.h @@ -26,6 +26,7 @@ __BEGIN_DECLS /* The following constants should be used for the fifth parameter of `*setxattr'. */ +#ifndef __USE_KERNEL_XATTR_DEFS enum { XATTR_CREATE = 1, /* set value, fail if attr already exists. */ @@ -33,6 +34,7 @@ enum XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */ #define XATTR_REPLACE XATTR_REPLACE }; +#endif /* Set the attribute NAME of the file pointed to by PATH to VALUE (which is SIZE bytes long). Return 0 on success, -1 for errors. */ diff --git a/nptl/Makefile b/nptl/Makefile index 57cc8c6..aa4a444 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -208,7 +208,7 @@ tests = tst-typesizes \ tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 tst-mutexpi5 \ tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a tst-mutexpi8 \ tst-mutexpi9 \ - tst-spin1 tst-spin2 tst-spin3 \ + tst-spin1 tst-spin2 tst-spin3 tst-spin4 \ tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \ tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \ tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \ diff --git a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S index ea863d7..3accc69 100644 --- a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S +++ b/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S @@ -19,11 +19,11 @@ .text ENTRY(pthread_spin_lock) - ldstub [%o0], %g1 +1: ldstub [%o0], %g1 orcc %g1, 0x0, %g0 bne,a 2f ldub [%o0], %g1 -1: retl + retl mov 0, %o0 2: orcc %g1, 0x0, %g0 bne,a 2b diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S index 0f849b2..aec6654 100644 --- a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S +++ b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S @@ -19,10 +19,10 @@ .text ENTRY(pthread_spin_lock) - ldstub [%o0], %g1 +1: ldstub [%o0], %g1 brnz,pn %g1, 2f membar #StoreLoad | #StoreStore -1: retl + retl mov 0, %o0 2: ldub [%o0], %g1 brnz,pt %g1, 2b diff --git a/nptl/tst-spin4.c b/nptl/tst-spin4.c new file mode 100644 index 0000000..5b23a17 --- /dev/null +++ b/nptl/tst-spin4.c @@ -0,0 +1,109 @@ +#include +#include +#include + +static int count = 0; + +static void * +thread_add_one (void *arg) +{ + int tmp; + pthread_spinlock_t *lock = (pthread_spinlock_t *) arg; + + /* When do_test holds the lock for 1 sec, the two thread will be + in contention for the lock. */ + if (pthread_spin_lock (lock) != 0) + { + puts ("thread_add_one(): spin_lock failed"); + pthread_exit ((void *) 1l); + } + + /* sleep 1s before modifying count */ + tmp = count; + sleep (1); + count = tmp + 1; + + if (pthread_spin_unlock (lock) != 0) + { + puts ("thread_add_one(): spin_unlock failed"); + pthread_exit ((void *) 1l); + } + + return NULL; +} + +static int +do_test (void) +{ + pthread_t thr1, thr2; + pthread_spinlock_t lock; + int tmp; + + if (pthread_spin_init (&lock, PTHREAD_PROCESS_PRIVATE) != 0) + { + puts ("spin_init failed"); + return 1; + } + + if (pthread_spin_lock (&lock) != 0) + { + puts ("1st spin_lock failed"); + return 1; + } + + if (pthread_create (&thr1, NULL, thread_add_one, (void *) &lock) != 0) + { + puts ("1st pthread_create failed"); + return 1; + } + + if (pthread_create (&thr2, NULL, thread_add_one, (void *) &lock) != 0) + { + puts ("2nd pthread_create failed"); + return 1; + } + + /* sleep 1s before modifying count */ + tmp = count; + sleep (1); + count = tmp + 1; + + if (pthread_spin_unlock (&lock) != 0) + { + puts ("1st spin_unlock failed"); + return 1; + } + + void *status; + if (pthread_join (thr1, &status) != 0) + { + puts ("1st pthread_join failed"); + return 1; + } + if (status != NULL) + { + puts ("failure in the 1st thread"); + return 1; + } + if (pthread_join (thr2, &status) != 0) + { + puts ("2nd pthread_join failed"); + return 1; + } + if (status != NULL) + { + puts ("failure in the 2nd thread"); + return 1; + } + + if (count != 3) + { + printf ("count is %d, should be 3\n", count); + return 1; + } + return 0; +} + +#define TIMEOUT 5 +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/po/eo.po b/po/eo.po index d01582d..f6ea766 100644 --- a/po/eo.po +++ b/po/eo.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libc 2.18.90.20140105\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-05 17:40+1000\n" -"PO-Revision-Date: 2014-01-08 21:23+0100\n" +"PO-Revision-Date: 2014-04-22 22:50+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Esperanto \n" "Language: eo\n" @@ -967,7 +967,7 @@ msgstr "mankas dosieraj argumentoj" #. TRANS expected to already exist. #: elf/ldd.bash.in:147 sysdeps/gnu/errlist.c:36 msgid "No such file or directory" -msgstr "Dosiero aü dosierujo ne ekzistas" +msgstr "Dosiero aŭ dosierujo ne ekzistas" #: elf/ldd.bash.in:150 inet/rcmd.c:488 msgid "not regular file" @@ -992,7 +992,7 @@ msgstr "eraro: vi ne havas permeson legi" #: elf/pldd-xx.c:105 #, c-format msgid "cannot find program header of process" -msgstr "" +msgstr "ne eblas trovi programĉapon de procezo" #: elf/pldd-xx.c:110 #, c-format @@ -1055,7 +1055,7 @@ msgstr "ne eblas malfermi %s/task" #: elf/pldd.c:145 #, c-format msgid "cannot prepare reading %s/task" -msgstr "" +msgstr "ne eblas prepari legado de %s/task" #: elf/pldd.c:158 #, c-format @@ -1070,7 +1070,7 @@ msgstr "" #: elf/pldd.c:261 #, c-format msgid "cannot get information about process %lu" -msgstr "" +msgstr "ne eblas ekhavi informon pri procezo %lu" #: elf/pldd.c:274 #, c-format @@ -1080,7 +1080,7 @@ msgstr "procezo %lu ne estas ELF-programo" #: elf/readelflib.c:34 #, c-format msgid "file %s is truncated\n" -msgstr "" +msgstr "dosiero %s trunkiĝis\n" #: elf/readelflib.c:66 #, c-format @@ -1105,7 +1105,7 @@ msgstr "" #: elf/readelflib.c:108 #, c-format msgid "more than one dynamic segment\n" -msgstr "" +msgstr "pli ol unu dinamika segmento\n" #: elf/readlib.c:96 #, c-format @@ -1191,7 +1191,7 @@ msgstr "" #: elf/sotruss.ksh:46 msgid "Mandatory arguments to long options are also mandatory for any corresponding\\nshort options.\\n" -msgstr "" +msgstr "Endaj argumentoj por longaj opcioj ankaŭ endas por korespondaj mallongaj opcioj.\\n" #: elf/sotruss.ksh:55 msgid "%s: option requires an argument -- '%s'\\n" @@ -1576,7 +1576,7 @@ msgstr "malsukcesis eltrovi statinformon" #: inet/rcmd.c:493 msgid "cannot open" -msgstr "" +msgstr "ne eblas malfermi" #: inet/rcmd.c:495 msgid "fstat failed" @@ -5788,7 +5788,7 @@ msgstr "Eraro de en-eligo" #. TRANS computer. #: sysdeps/gnu/errlist.c:82 msgid "No such device or address" -msgstr "Tiu aparato aü adreso ne ekzistas" +msgstr "Tiu aparato aŭ adreso ne ekzistas" #. TRANS Argument list too long; used when the arguments passed to a new program #. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a @@ -6311,7 +6311,7 @@ msgstr "Ne subtenatas" #. TRANS or an incomplete sequence of bytes or the given wide character is invalid. #: sysdeps/gnu/errlist.c:931 msgid "Invalid or incomplete multibyte or wide character" -msgstr "Nevalida aü nekompleta plurbajta aü larĝa signo" +msgstr "Nevalida aŭ nekompleta plurbajta aŭ larĝa signo" #. TRANS On @gnuhurdsystems{}, servers supporting the @code{term} protocol return #. TRANS this error for certain operations when the caller is not in the diff --git a/po/sv.po b/po/sv.po index beeb071..5f2fb07 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: libc 2.18.90.20140105\n" "POT-Creation-Date: 2014-01-05 17:40+1000\n" -"PO-Revision-Date: 2014-01-09 10:33+0100\n" +"PO-Revision-Date: 2014-05-06 18:15+0200\n" "Last-Translator: Jan Djärv \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -883,7 +883,7 @@ msgstr "bibliotek %s och %s i katalog %s har samma \"soname\" men olika typ." #: elf/ldconfig.c:1072 #, c-format msgid "Warning: ignoring configuration file that cannot be opened: %s" -msgstr "Varning: Ignorerar konfigurationsfil som inte kan öppnas: %s" +msgstr "Varning: ignorerar konfigurationsfil som inte kan öppnas: %s" #: elf/ldconfig.c:1138 #, c-format @@ -4104,7 +4104,7 @@ msgstr "Skapa inte barnprocess, visa meddelanden på nuvarande tty" #: nscd/nscd.c:120 msgid "Do not fork, but otherwise behave like a daemon" -msgstr "Skapa inte brnprocess, men i allt annat uppträd som en demon" +msgstr "Skapa inte barnprocess, men i allt annat uppträd som en demon" #: nscd/nscd.c:121 msgid "NUMBER" @@ -4630,7 +4630,7 @@ msgstr "problem när \"%s\" lästes" #: nss/makedb.c:799 #, c-format msgid "failed to write new database file" -msgstr "misslyckades med att skriva databasfil" +msgstr "misslyckades med att skriva ny databasfil" #: nss/makedb.c:812 #, c-format @@ -5496,7 +5496,7 @@ msgstr "-Y sökväg\t\tkatalog för att hitta C preprocessorn (cpp)\n" #: sunrpc/rpc_main.c:1445 #, c-format msgid "-5\t\tSysVr4 compatibility mode\n" -msgstr "-5\t\tSysVr4 kompabilitetsläge\n" +msgstr "-5\t\tSysVr4-kompatibilitetsläge\n" #: sunrpc/rpc_main.c:1446 #, c-format @@ -6812,7 +6812,7 @@ msgid "" "\n" "Report bugs to %s.\n" msgstr "" -"%s: användning är %s [ --version ] [ --help ] [ -{vV} ] [ -{ct} [start,]slut] zonnamn ...\n" +"%s: användning: %s [ --version ] [ --help ] [ -{vV} ] [ -{ct} [start,]slut] zonnamn ...\n" "Rapportera fel till %s.\n" "Rapportera fel eller synpunkter på översättningen till .\n" diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index 6d4ab47..1dfc50b 100644 --- a/ports/ChangeLog.aarch64 +++ b/ports/ChangeLog.aarch64 @@ -1,3 +1,9 @@ +2014-05-21 Richard Henderson + + * sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h + (SINGLE_THREAD_P): Use the correct width load. Fold an add + into the ldr offset. + 2014-01-22 Marcus Shawcroft * sysdeps/aarch64/libm-test-ulps: Regenerated. diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h b/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h index f6903b5..fed1dcb 100644 --- a/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h +++ b/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h @@ -162,9 +162,8 @@ extern int __local_multiple_threads attribute_hidden; # else # define SINGLE_THREAD_P \ adrp x16, __local_multiple_threads; \ - add x16, x16, #:lo12:__local_multiple_threads; \ - ldr x16, [x16]; \ - cmp x16, 0; + ldr w16, [x16, :lo12:__local_multiple_threads]; \ + cmp w16, 0; # endif # else /* There is no __local_multiple_threads for librt, so use the TCB. */ @@ -180,12 +179,12 @@ extern int __local_multiple_threads attribute_hidden; cfi_rel_offset (x30, 8); \ bl __read_tp; \ sub x0, x0, PTHREAD_SIZEOF; \ - ldr x16, [x0, PTHREAD_MULTIPLE_THREADS_OFFSET]; \ + ldr w16, [x0, PTHREAD_MULTIPLE_THREADS_OFFSET]; \ ldp x0, x30, [sp], 16; \ cfi_restore (x0); \ cfi_restore (x30); \ cfi_adjust_cfa_offset (-16); \ - cmp x16, 0 + cmp w16, 0 # define SINGLE_THREAD_P_PIC(x) SINGLE_THREAD_P # endif # endif diff --git a/string/test-strcmp.c b/string/test-strcmp.c index b395dc7..fcd059f 100644 --- a/string/test-strcmp.c +++ b/string/test-strcmp.c @@ -329,6 +329,34 @@ check (void) FOR_EACH_IMPL (impl, 0) check_result (impl, s1 + i1, s2 + i2, exp_result); } + + /* Test cases where there are multiple zero bytes after the first. */ + + for (size_t i = 0; i < 16 + 1; i++) + { + s1[i] = 0x00; + s2[i] = 0x00; + } + + for (size_t i = 0; i < 16; i++) + { + int exp_result; + + for (int val = 0x01; val < 0x100; val++) + { + for (size_t j = 0; j < i; j++) + { + s1[j] = val; + s2[j] = val; + } + + s2[i] = val; + + exp_result = SIMPLE_STRCMP (s1, s2); + FOR_EACH_IMPL (impl, 0) + check_result (impl, s1, s2, exp_result); + } + } } diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c index 6105e9f..50109b8 100644 --- a/sysdeps/ieee754/dbl-64/s_sin.c +++ b/sysdeps/ieee754/dbl-64/s_sin.c @@ -447,19 +447,21 @@ __sin (double x) } else { + double t; if (a > 0) { m = 1; + t = a; db = da; } else { m = 0; - a = -a; + t = -a; db = -da; } - u.x = big + a; - y = a - (u.x - big); + u.x = big + t; + y = t - (u.x - big); res = do_sin (u, y, db, &cor); cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps; retval = ((res == res + cor) ? ((m) ? res : -res) @@ -671,19 +673,21 @@ __cos (double x) } else { + double t; if (a > 0) { m = 1; + t = a; db = da; } else { m = 0; - a = -a; + t = -a; db = -da; } - u.x = big + a; - y = a - (u.x - big); + u.x = big + t; + y = t - (u.x - big); res = do_sin (u, y, db, &cor); cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps; retval = ((res == res + cor) ? ((m) ? res : -res) diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S index b43a9e3..a1a9642 100644 --- a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S +++ b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S @@ -211,6 +211,7 @@ ENTRY(__memcpy_niagara2) */ VISEntryHalf + membar #Sync alignaddr %o1, %g0, %g0 add %o1, (64 - 1), %o4 diff --git a/sysdeps/sparc/sparc64/strcmp.S b/sysdeps/sparc/sparc64/strcmp.S index 8925396..f32b0fc 100644 --- a/sysdeps/sparc/sparc64/strcmp.S +++ b/sysdeps/sparc/sparc64/strcmp.S @@ -121,6 +121,37 @@ ENTRY(strcmp) movleu %xcc, -1, %o0 srlx rTMP1, 7, rTMP1 + /* In order not to be influenced by bytes after the zero byte, we + * have to retain only the highest bit in the mask for the comparison + * with rSTRXOR to work properly. + */ + mov 0, rTMP2 + andcc rTMP1, 0x0100, %g0 + + movne %xcc, 8, rTMP2 + sllx rTMP1, 63 - 16, %o1 + + movrlz %o1, 16, rTMP2 + sllx rTMP1, 63 - 24, %o1 + + movrlz %o1, 24, rTMP2 + sllx rTMP1, 63 - 32, %o1 + + movrlz %o1, 32, rTMP2 + sllx rTMP1, 63 - 40, %o1 + + movrlz %o1, 40, rTMP2 + sllx rTMP1, 63 - 48, %o1 + + movrlz %o1, 48, rTMP2 + sllx rTMP1, 63 - 56, %o1 + + movrlz %o1, 56, rTMP2 + + srlx rTMP1, rTMP2, rTMP1 + + sllx rTMP1, rTMP2, rTMP1 + cmp rTMP1, rSTRXOR retl movgu %xcc, 0, %o0 diff --git a/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h b/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h index c81ddff..4d3ae3b 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/eventfd.h @@ -22,6 +22,8 @@ /* Flags for eventfd. */ enum { + EFD_SEMAPHORE = 0x000001, +#define EFD_SEMAPHORE EFD_SEMAPHORE EFD_CLOEXEC = 0x400000, #define EFD_CLOEXEC EFD_CLOEXEC EFD_NONBLOCK = 0x004000 diff --git a/sysdeps/unix/sysv/linux/sparc/bits/resource.h b/sysdeps/unix/sysv/linux/sparc/bits/resource.h index aa201fe..518264f 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/resource.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/resource.h @@ -252,3 +252,30 @@ enum __priority_which PRIO_USER = 2 /* WHO is a user ID. */ #define PRIO_USER PRIO_USER }; + +__BEGIN_DECLS + +#ifdef __USE_GNU +/* Modify and return resource limits of a process atomically. */ +# ifndef __USE_FILE_OFFSET64 +extern int prlimit (__pid_t __pid, enum __rlimit_resource __resource, + const struct rlimit *__new_limit, + struct rlimit *__old_limit) __THROW; +# else +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (prlimit, (__pid_t __pid, + enum __rlimit_resource __resource, + const struct rlimit *__new_limit, + struct rlimit *__old_limit), prlimit64); +# else +# define prlimit prlimit64 +# endif +# endif +# ifdef __USE_LARGEFILE64 +extern int prlimit64 (__pid_t __pid, enum __rlimit_resource __resource, + const struct rlimit64 *__new_limit, + struct rlimit64 *__old_limit) __THROW; +# endif +#endif + +__END_DECLS diff --git a/sysdeps/x86_64/fpu/libm-test-ulps b/sysdeps/x86_64/fpu/libm-test-ulps index 207b6c0..25c112f 100644 --- a/sysdeps/x86_64/fpu/libm-test-ulps +++ b/sysdeps/x86_64/fpu/libm-test-ulps @@ -8445,9 +8445,14 @@ double: 1 float: 2 idouble: 1 ifloat: 2 +Test "Real part of: ctan (0xcp-4 + 0x1.4p+0 i)": +float: 1 +ifloat: 1 Test "Imaginary part of: ctan (0xcp-4 + 0x1.4p+0 i)": double: 1 +float: 1 idouble: 1 +ifloat: 1 ildouble: 1 ldouble: 1 Test "Real part of: ctan (0xf.ffffffffffff8p+1020 + 0x1p+0 i)": @@ -8766,9 +8771,14 @@ double: 1 float: 2 idouble: 1 ifloat: 2 +Test "Real part of: ctan_tonearest (0xcp-4 + 0x1.4p+0 i)": +float: 1 +ifloat: 1 Test "Imaginary part of: ctan_tonearest (0xcp-4 + 0x1.4p+0 i)": double: 1 +float: 1 idouble: 1 +ifloat: 1 ildouble: 1 ldouble: 1 Test "Real part of: ctan_tonearest (0xf.ffffffffffff8p+1020 + 0x1p+0 i)": @@ -9289,9 +9299,9 @@ ildouble: 1 ldouble: 1 Test "Real part of: ctanh (-0x2p+0 - 0x3p+0 i)": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 +ifloat: 2 ildouble: 1 ldouble: 1 Test "Imaginary part of: ctanh (-0x2p+0 - 0x3p+0 i)": @@ -9647,9 +9657,9 @@ ildouble: 1 ldouble: 1 Test "Real part of: ctanh_tonearest (-0x2p+0 - 0x3p+0 i)": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 +ifloat: 2 ildouble: 1 ldouble: 1 Test "Imaginary part of: ctanh_tonearest (-0x2p+0 - 0x3p+0 i)": @@ -9815,7 +9825,9 @@ float: 1 ifloat: 1 Test "Real part of: ctanh_towardzero (-0x2p+0 - 0x3p+0 i)": double: 2 +float: 1 idouble: 2 +ifloat: 1 Test "Imaginary part of: ctanh_towardzero (-0x2p+0 - 0x3p+0 i)": double: 1 float: 1 @@ -10089,9 +10101,9 @@ ildouble: 1 ldouble: 1 Test "Real part of: ctanh_upward (0x1p+0 + 0x8p+124 i)": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 +ifloat: 2 Test "Imaginary part of: ctanh_upward (0x1p+0 + 0x8p+124 i)": double: 2 float: 1 @@ -10128,7 +10140,9 @@ ifloat: 1 ildouble: 2 ldouble: 2 Test "Imaginary part of: ctanh_upward (0x2.dp+4 + 0x1p+0 i)": +double: 1 float: 1 +idouble: 1 ifloat: 1 ildouble: 1 ldouble: 1 @@ -10260,6 +10274,9 @@ idouble: 1 ifloat: 1 ildouble: 1 ldouble: 1 +Test "Real part of: ctanh_upward (0xcp-4 + 0x1.4p+0 i)": +float: 1 +ifloat: 1 Test "Imaginary part of: ctanh_upward (0xcp-4 + 0x1.4p+0 i)": float: 2 ifloat: 2 @@ -10312,6 +10329,9 @@ ldouble: 1 Test "erfc (0x7.fffd6p+0)": float: 1 ifloat: 1 +Test "erfc (0xcp-4)": +float: 1 +ifloat: 1 # exp10 Test "exp10 (-0x1.31p+8)": @@ -11206,7 +11226,9 @@ idouble: 1 ildouble: 1 ldouble: 1 Test "jn (4, 0x2.67a2a8p+0)": +double: 1 float: 1 +idouble: 1 ifloat: 1 ildouble: 1 ldouble: 1 @@ -11232,7 +11254,9 @@ idouble: 2 ildouble: 1 ldouble: 1 Test "jn (5, 0x2.67a2a8p+0)": +double: 1 float: 2 +idouble: 1 ifloat: 2 Test "jn (6, 0x2.67a2a4p+0)": double: 2 @@ -12932,7 +12956,9 @@ ildouble: 1 ldouble: 1 Test "tgamma (-0x4.fffff8p+0)": double: 1 +float: 1 idouble: 1 +ifloat: 1 ildouble: 1 ldouble: 1 Test "tgamma (-0x4.ffffffffffffcp+0)": @@ -12946,9 +12972,9 @@ ildouble: 1 ldouble: 1 Test "tgamma (-0x5.000008p+0)": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 +ifloat: 2 ildouble: 1 ldouble: 1 Test "tgamma (-0x5.8p+0)": @@ -13086,9 +13112,9 @@ double: 1 idouble: 1 Test "tgamma (-0x9.8p+0)": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 +ifloat: 2 ildouble: 2 ldouble: 2 Test "tgamma (-0x9.ffffffffffff8p+0)": @@ -13322,6 +13348,8 @@ float: 1 idouble: 1 ifloat: 1 Test "tgamma (0x4.fffff8p+0)": +float: 1 +ifloat: 1 ildouble: 1 ldouble: 1 Test "tgamma (0x4.ffffffffffffcp+0)": @@ -13340,8 +13368,8 @@ Test "tgamma (0x5.0000000000004p+0)": double: 1 idouble: 1 Test "tgamma (0x5.000008p+0)": -float: 2 -ifloat: 2 +float: 3 +ifloat: 3 ildouble: 1 ldouble: 1 Test "tgamma (0x5.8p+0)": @@ -13453,7 +13481,9 @@ double: 1 idouble: 1 Test "tgamma (0x9.8p+0)": double: 1 +float: 1 idouble: 1 +ifloat: 1 ildouble: 1 ldouble: 1 Test "tgamma (0x9p+0)": @@ -13506,18 +13536,26 @@ ifloat: 1 ildouble: 1 ldouble: 1 Test "y0 (0x1p-20)": +double: 1 float: 1 +idouble: 1 ifloat: 1 Test "y0 (0x1p-40)": double: 1 float: 1 idouble: 1 ifloat: 1 +Test "y0 (0x1p-60)": +float: 1 +ifloat: 1 Test "y0 (0x1p-80)": double: 1 float: 1 idouble: 1 ifloat: 1 +Test "y0 (0x2p+0)": +double: 1 +idouble: 1 Test "y0 (0x2p-4)": ildouble: 1 ldouble: 1 @@ -13547,7 +13585,9 @@ float: 1 ifloat: 1 Test "y0 (0x4p-72)": double: 1 +float: 1 idouble: 1 +ifloat: 1 Test "y0 (0x8p+0)": double: 1 float: 1 @@ -13556,7 +13596,9 @@ ifloat: 1 ildouble: 1 ldouble: 1 Test "y0 (0xap+0)": +double: 1 float: 1 +idouble: 1 ifloat: 1 Test "y0 (0xf.ffffffffffff8p+1020)": double: 1 @@ -13638,6 +13680,9 @@ idouble: 2 ifloat: 1 ildouble: 1 ldouble: 1 +Test "yn (0, 0x2p+0)": +double: 1 +idouble: 1 Test "yn (0, 0x2p-4)": ildouble: 1 ldouble: 1 @@ -13649,7 +13694,9 @@ ifloat: 1 ildouble: 1 ldouble: 1 Test "yn (0, 0xap+0)": +double: 1 float: 1 +idouble: 1 ifloat: 1 Test "yn (1, 0x1.8p+0)": float: 1 @@ -13682,9 +13729,9 @@ float: 2 idouble: 1 ifloat: 2 Test "yn (10, 0x2p+0)": -double: 2 +double: 3 float: 1 -idouble: 2 +idouble: 3 ifloat: 1 Test "yn (10, 0x2p-4)": double: 1 @@ -13701,9 +13748,9 @@ Test "yn (10, 0x8p-972)": ildouble: 1 ldouble: 1 Test "yn (10, 0xap+0)": -double: 1 +double: 2 float: 1 -idouble: 1 +idouble: 2 ifloat: 1 Test "yn (10, 0xcp-4)": double: 1 diff --git a/timezone/Makefile b/timezone/Makefile index f5fb424..58e7f50 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -114,7 +114,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps) $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make sed -e 's|/bin/bash|$(KSH)|g' \ - -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \ + -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \