From patchwork Wed Mar 1 14:02:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 19416 Received: (qmail 81800 invoked by alias); 1 Mar 2017 14:02:18 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 81713 invoked by uid 89); 1 Mar 2017 14:02:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=highlight X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Cc: carlos@redhat.com, joseph@codesourcery.com, adhemerval.zanella@linaro.org, fweimer@redhat.com Subject: [PATCH 1/3] Miscellaneous low-risk changes preparing for _ISOMAC testsuite. Date: Wed, 1 Mar 2017 09:02:10 -0500 Message-Id: <20170301140212.14354-2-zackw@panix.com> In-Reply-To: <20170301140212.14354-1-zackw@panix.com> References: <20170301140212.14354-1-zackw@panix.com> MIME-Version: 1.0 These are a grab bag of changes where the testsuite was using internal symbols of some variety, but this was straightforward to fix, and the fixed code should work with or without the change to compile the testsuite under _ISOMAC. Four of these are just more #include adjustments, but I want to highlight sysdeps/powerpc/fpu/tst-setcontext-fpscr.c, which appears to have been written before the advent of sys/auxv.h. I think a big chunk of this file could be replaced by a simple call to getauxval, but I'll let someone who actually has a powerpc machine to test on do that. dlfcn/tst-dladdr.c was including ldsodefs.h just so it could use DL_LOOKUP_ADDRESS to print an additional diagnostic; as requested by Carlos, I have removed this. math/test-misc.c was using #ifndef NO_LONG_DOUBLE, which is an internal configuration macro, to decide whether to do certain tests involving 'long double'. I changed the test to #if LDBL_MANT_DIG > DBL_MANT_DIG instead, which uses only public float.h macros and is equivalent on all supported platforms. (Note that NO_LONG_DOUBLE doesn't mean 'the compiler doesn't support long double', it means 'long double is the same as double'.) tst-writev.c has a configuration macro 'ARTIFICIAL_LIMIT' that the Makefiles are expected to define, and sysdeps/unix/sysv/linux/Makefile was using the internal __getpagesize in the definition; changed to sysconf(_SC_PAGESIZE) which is the POSIX equivalent. ia64-linux doesn't supply 'clone', only '__clone2', which is not defined in the public headers(!) All the other clone tests have local extern declarations of __clone2, but tst-clone.c doesn't; it was getting away with this because include/sched.h does declare __clone2. * nss/tst-cancel-getpwuid_r.c: Include nss.h. * string/strcasestr.c: No need to include config.h. * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c: Include sys/auxv.h. Don't include sysdep.h. * sysdeps/powerpc/tst-set_ppr.c: Don't include dl-procinfo.h. * dlfcn/tst-dladdr.c: Don't include ldsodefs.h. Don't use DL_LOOKUP_ADDRESS. * math/test-misc.c: Instead of testing NO_LONG_DOUBLE, test whether LDBL_MANT_DIG is greater than DBL_MANT_DIG. * sysdeps/unix/sysv/linux/Makefile (CFLAGS-tst-writev.c): Use sysconf (_SC_PAGESIZE) instead of __getpagesize in definition of ARTIFICIAL_LIMIT. * sysdeps/unix/sysv/linux/tst-clone.c [__ia64__]: Add extern declaration of __clone2. --- dlfcn/tst-dladdr.c | 4 ---- math/test-misc.c | 23 +++++++++++------------ nptl/tst-join7mod.c | 1 + nss/tst-cancel-getpwuid_r.c | 1 + string/strcasestr.c | 4 ---- sysdeps/powerpc/fpu/tst-setcontext-fpscr.c | 2 +- sysdeps/powerpc/tst-set_ppr.c | 1 - sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/tst-clone.c | 5 +++++ 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/dlfcn/tst-dladdr.c b/dlfcn/tst-dladdr.c index 3610123fc2..b53fe36504 100644 --- a/dlfcn/tst-dladdr.c +++ b/dlfcn/tst-dladdr.c @@ -24,8 +24,6 @@ #include #include -#include - #define TEST_FUNCTION do_test () extern int do_test (void); @@ -53,8 +51,6 @@ do_test (void) if (ret == 0) error (EXIT_FAILURE, 0, "dladdr failed"); - printf ("address of ref1 = %lx\n", - (unsigned long int) DL_LOOKUP_ADDRESS (sym)); printf ("ret = %d\n", ret); printf ("info.dli_fname = %p (\"%s\")\n", info.dli_fname, info.dli_fname); printf ("info.dli_fbase = %p\n", info.dli_fbase); diff --git a/math/test-misc.c b/math/test-misc.c index 8968b80662..09812a3ccf 100644 --- a/math/test-misc.c +++ b/math/test-misc.c @@ -30,7 +30,7 @@ do_test (void) { int result = 0; -#ifndef NO_LONG_DOUBLE +#if LDBL_MANT_DIG > DBL_MANT_DIG { long double x = 0x100000001ll + (long double) 0.5; long double q; @@ -60,7 +60,7 @@ do_test (void) # elif LDBL_MANT_DIG == 113 m = 0x1.ffffffffffffffffffffffffffffp-1L; # else -# error "Please adjust" +# error "Unsupported LDBL_MANT_DIG, please adjust" # endif for (i = LDBL_MAX_EXP, x = LDBL_MAX; i >= LDBL_MIN_EXP; --i, x /= 2.0L) @@ -720,7 +720,7 @@ do_test (void) } } -#ifndef NO_LONG_DOUBLE +#if LDBL_MANT_DIG > DBL_MANT_DIG { long double v1, v2; @@ -910,7 +910,7 @@ do_test (void) puts ("isnormal (DBL_MIN) failed"); result = 1; } -#ifndef NO_LONG_DOUBLE +#if LDBL_MANT_DIG > DBL_MANT_DIG if (! isnormal (LDBL_MIN)) { puts ("isnormal (LDBL_MIN) failed"); @@ -960,7 +960,7 @@ do_test (void) } #endif -#ifndef NO_LONG_DOUBLE +#if LDBL_MANT_DIG > DBL_MANT_DIG { long double r; @@ -1027,7 +1027,7 @@ do_test (void) puts ("nextafter -DBL_MIN test failed"); result = 1; } -#ifndef NO_LONG_DOUBLE +#if LDBL_MANT_DIG > DBL_MANT_DIG if (nextafterl (nextafterl (LDBL_MIN, LDBL_MIN / 2.0), LDBL_MIN) != LDBL_MIN) { @@ -1072,7 +1072,7 @@ do_test (void) } #endif -#ifndef NO_LONG_DOUBLE +#if LDBL_MANT_DIG > DBL_MANT_DIG volatile long double ld1 = LDBL_MAX; volatile long double ld2 = LDBL_MAX / 2; (void) &ld1; @@ -1087,9 +1087,8 @@ do_test (void) result = 1; } # endif -#endif -#if !defined NO_LONG_DOUBLE && LDBL_MANT_DIG == 113 +# if LDBL_MANT_DIG == 113 volatile long double ld3 = 0x1.0000000000010000000100000001p+1; volatile long double ld4 = 0x1.0000000000000000000000000001p+1; (void) &ld3; @@ -1100,14 +1099,13 @@ do_test (void) printf ("long double subtraction test failed %.28La\n", ld3); result = 1; } -#endif +# endif /* Skip testing IBM long double format, for 2 reasons: 1) it only supports FE_TONEAREST 2) nextafter (0.0, 1.0) == nextafterl (0.0L, 1.0L), so nextafter (0.0, 1.0) / 16.0L will be 0.0L. */ -#if !defined NO_LONG_DOUBLE && LDBL_MANT_DIG >= DBL_MANT_DIG + 4 \ - && LDBL_MANT_DIG != 106 +# if LDBL_MANT_DIG >= DBL_MANT_DIG + 4 && LDBL_MANT_DIG != 106 int oldmode = fegetround (); int j; for (j = 0; j < 4; j++) @@ -1197,6 +1195,7 @@ do_test (void) else puts ("ignoring this failure"); } +# endif #endif return result; diff --git a/nptl/tst-join7mod.c b/nptl/tst-join7mod.c index 1d9c95d418..7b94af6d54 100644 --- a/nptl/tst-join7mod.c +++ b/nptl/tst-join7mod.c @@ -18,6 +18,7 @@ . */ #include +#include #include #include #include diff --git a/nss/tst-cancel-getpwuid_r.c b/nss/tst-cancel-getpwuid_r.c index d4fbb861c0..53de82985c 100644 --- a/nss/tst-cancel-getpwuid_r.c +++ b/nss/tst-cancel-getpwuid_r.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include diff --git a/string/strcasestr.c b/string/strcasestr.c index a9ff18c7f5..2acf003155 100644 --- a/string/strcasestr.c +++ b/string/strcasestr.c @@ -25,10 +25,6 @@ * * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */ -#if HAVE_CONFIG_H -# include -#endif - /* Specification. */ #include diff --git a/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c b/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c index 3a8d699b9a..4e3f90d4d3 100644 --- a/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c +++ b/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c @@ -26,8 +26,8 @@ #include #include #include -#include #include +#include static ucontext_t ctx[3]; diff --git a/sysdeps/powerpc/tst-set_ppr.c b/sysdeps/powerpc/tst-set_ppr.c index 77901b58fb..df8dda78e8 100644 --- a/sysdeps/powerpc/tst-set_ppr.c +++ b/sysdeps/powerpc/tst-set_ppr.c @@ -16,7 +16,6 @@ License along with the GNU C Library; if not, see . */ -#include #include #include #include diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index b3d68665f9..fc29c54c86 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -20,7 +20,7 @@ sysdep_routines += clone umount umount2 readahead \ personality CFLAGS-gethostid.c = -fexceptions -CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=0x80000000-__getpagesize()" +CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))" # Note that bits/mman-linux.h is listed here though the file lives in the # top-level bits/ subdirectory instead of here in sysdeps/.../linux/bits/. diff --git a/sysdeps/unix/sysv/linux/tst-clone.c b/sysdeps/unix/sysv/linux/tst-clone.c index c4e6fbe48b..1da749db8d 100644 --- a/sysdeps/unix/sysv/linux/tst-clone.c +++ b/sysdeps/unix/sysv/linux/tst-clone.c @@ -23,6 +23,11 @@ #include #include +#ifdef __ia64__ +extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base, + size_t __child_stack_size, int __flags, void *__arg, ...); +#endif + int child_fn(void *arg) { puts ("FAIL: in child_fn(); should not be here");