[1/3] Miscellaneous low-risk changes preparing for _ISOMAC testsuite.
Commit Message
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(-)
Comments
On 03/01/2017 09:02 AM, Zack Weinberg wrote:
> 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.
> * 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.
Looks good to me.
@@ -24,8 +24,6 @@
#include <stdlib.h>
#include <string.h>
-#include <ldsodefs.h>
-
#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);
@@ -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;
@@ -18,6 +18,7 @@
<http://www.gnu.org/licenses/>. */
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include <atomic.h>
@@ -35,6 +35,7 @@
#include <stdlib.h>
#include <pthread.h>
#include <pwd.h>
+#include <nss.h>
#include <sys/types.h>
#include <unistd.h>
#include <semaphore.h>
@@ -25,10 +25,6 @@
*
* Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
/* Specification. */
#include <string.h>
@@ -26,8 +26,8 @@
#include <malloc.h>
#include <link.h>
#include <elf.h>
-#include <sysdep.h>
#include <fpu_control.h>
+#include <sys/auxv.h>
static ucontext_t ctx[3];
@@ -16,7 +16,6 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <dl-procinfo.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdint.h>
@@ -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/.
@@ -23,6 +23,11 @@
#include <unistd.h>
#include <sched.h>
+#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");