Skip to content

Commit 020abbb

Browse files
bhaiblebhaible
committed
testdir40: try 5.
1 parent 90bcbd6 commit 020abbb

7 files changed

Lines changed: 37 additions & 19 deletions

File tree

‎testdir40/config.h.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,10 @@
648648
whether the gnulib module mbrtoc32-regular shall be considered present. */
649649
#undef GNULIB_MBRTOC32_REGULAR
650650

651+
/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
652+
whether the gnulib module mcel-prefer shall be considered present. */
653+
#undef GNULIB_MCEL_PREFER
654+
651655
/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
652656
whether the gnulib module mkostemp shall be considered present. */
653657
#undef GNULIB_MKOSTEMP

‎testdir40/configure‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12221,6 +12221,9 @@ esac
1222112221
fi
1222212222

1222312223
fi
12224+
# Prefer mcel by default. This can be overridden via
12225+
# './configure GNULIB_MCEL_PREFER=no'.
12226+
: ${GNULIB_MCEL_PREFER=yes}
1222412227

1222512228

1222612229
if test -z "$gl_anythreadlib_early_done"; then
@@ -24905,8 +24908,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
2490524908
LIBS="$saved_LIBS"
2490624909
test $gl_pthread_api = yes && break
2490724910
done
24908-
echo "$as_me:24908: gl_pthread_api=$gl_pthread_api" >&5
24909-
echo "$as_me:24909: LIBPTHREAD=$LIBPTHREAD" >&5
24911+
echo "$as_me:24911: gl_pthread_api=$gl_pthread_api" >&5
24912+
echo "$as_me:24912: LIBPTHREAD=$LIBPTHREAD" >&5
2491024913

2491124914
gl_pthread_in_glibc=no
2491224915
# On Linux with glibc >= 2.34, libc contains the fully functional
@@ -24935,7 +24938,7 @@ rm -rf conftest*
2493524938
*) :
2493624939
;;
2493724940
esac
24938-
echo "$as_me:24938: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
24941+
echo "$as_me:24941: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
2493924942

2494024943
# Test for libpthread by looking for pthread_kill.
2494124944
if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"
@@ -25187,7 +25190,7 @@ fi
2518725190
fi
2518825191

2518925192
fi
25190-
echo "$as_me:25190: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
25193+
echo "$as_me:25193: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
2519125194

2519225195
fi
2519325196
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
@@ -27902,8 +27905,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
2790227905
LIBS="$saved_LIBS"
2790327906
test $gl_pthread_api = yes && break
2790427907
done
27905-
echo "$as_me:27905: gl_pthread_api=$gl_pthread_api" >&5
27906-
echo "$as_me:27906: LIBPTHREAD=$LIBPTHREAD" >&5
27908+
echo "$as_me:27908: gl_pthread_api=$gl_pthread_api" >&5
27909+
echo "$as_me:27909: LIBPTHREAD=$LIBPTHREAD" >&5
2790727910

2790827911
gl_pthread_in_glibc=no
2790927912
# On Linux with glibc >= 2.34, libc contains the fully functional
@@ -27932,7 +27935,7 @@ rm -rf conftest*
2793227935
*) :
2793327936
;;
2793427937
esac
27935-
echo "$as_me:27935: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
27938+
echo "$as_me:27938: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
2793627939

2793727940
# Test for libpthread by looking for pthread_kill.
2793827941
if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"
@@ -28184,7 +28187,7 @@ fi
2818428187
fi
2818528188

2818628189
fi
28187-
echo "$as_me:28187: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
28190+
echo "$as_me:28190: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
2818828191

2818928192
fi
2819028193
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
@@ -28474,8 +28477,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
2847428477
LIBS="$saved_LIBS"
2847528478
test $gl_pthread_api = yes && break
2847628479
done
28477-
echo "$as_me:28477: gl_pthread_api=$gl_pthread_api" >&5
28478-
echo "$as_me:28478: LIBPTHREAD=$LIBPTHREAD" >&5
28480+
echo "$as_me:28480: gl_pthread_api=$gl_pthread_api" >&5
28481+
echo "$as_me:28481: LIBPTHREAD=$LIBPTHREAD" >&5
2847928482

2848028483
gl_pthread_in_glibc=no
2848128484
# On Linux with glibc >= 2.34, libc contains the fully functional
@@ -28504,7 +28507,7 @@ rm -rf conftest*
2850428507
*) :
2850528508
;;
2850628509
esac
28507-
echo "$as_me:28507: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
28510+
echo "$as_me:28510: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
2850828511

2850928512
# Test for libpthread by looking for pthread_kill.
2851028513
if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"
@@ -28756,7 +28759,7 @@ fi
2875628759
fi
2875728760

2875828761
fi
28759-
echo "$as_me:28759: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
28762+
echo "$as_me:28762: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
2876028763

2876128764
fi
2876228765
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
@@ -31514,8 +31517,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
3151431517
LIBS="$saved_LIBS"
3151531518
test $gl_pthread_api = yes && break
3151631519
done
31517-
echo "$as_me:31517: gl_pthread_api=$gl_pthread_api" >&5
31518-
echo "$as_me:31518: LIBPTHREAD=$LIBPTHREAD" >&5
31520+
echo "$as_me:31520: gl_pthread_api=$gl_pthread_api" >&5
31521+
echo "$as_me:31521: LIBPTHREAD=$LIBPTHREAD" >&5
3151931522

3152031523
gl_pthread_in_glibc=no
3152131524
# On Linux with glibc >= 2.34, libc contains the fully functional
@@ -31544,7 +31547,7 @@ rm -rf conftest*
3154431547
*) :
3154531548
;;
3154631549
esac
31547-
echo "$as_me:31547: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
31550+
echo "$as_me:31550: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5
3154831551

3154931552
# Test for libpthread by looking for pthread_kill.
3155031553
if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"
@@ -31796,7 +31799,7 @@ fi
3179631799
fi
3179731800

3179831801
fi
31799-
echo "$as_me:31799: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
31802+
echo "$as_me:31802: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5
3180031803

3180131804
fi
3180231805
{ printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5
@@ -129624,6 +129627,11 @@ printf '%s\n' "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
129624129627

129625129628

129626129629

129630+
printf '%s\n' "#define GNULIB_MCEL_PREFER 1" >>confdefs.h
129631+
129632+
129633+
129634+
129627129635

129628129636

129629129637
if test $ac_cv_func_memalign = yes; then

‎testdir40/configure.ac‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ gl_FP_IEEE
3232
gl_SET_LARGEFILE_SOURCE
3333
gl_SET_LARGEFILE_SOURCE
3434
AC_SYS_LARGEFILE
35+
# Prefer mcel by default. This can be overridden via
36+
# './configure GNULIB_MCEL_PREFER=no'.
37+
: ${GNULIB_MCEL_PREFER=yes}
3538
gl_ANYTHREADLIB_EARLY
3639
AC_SYS_LARGEFILE
3740
gl_SPARC_V8PLUS
@@ -1916,6 +1919,7 @@ AM_GNU_GETTEXT_VERSION([0.22])
19161919
gl_STDLIB_MODULE_INDICATOR([mbtowc])
19171920
gl_MBITER
19181921
gl_MBITER
1922+
gl_MODULE_INDICATOR([mcel-prefer])
19191923
gl_FUNC_MEMALIGN
19201924
gl_CONDITIONAL([GL_COND_OBJ_MEMALIGN], [test $REPLACE_MEMALIGN = 1])
19211925
gl_MALLOC_MODULE_INDICATOR([memalign])

‎testdir40/gllib/cosl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ cosl (long double x)
102102
/* argument reduction needed */
103103
else
104104
{
105-
long double y[2],
105+
long double y[2];
106106
int n = ieee754_rem_pio2l (x, y);
107107
switch (n & 3)
108108
{

‎testdir40/gllib/file-remote.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
# include <sys/mount.h>
3131
#elif defined __FreeBSD__ || defined __DragonFly__ || defined __FreeBSD_kernel__
3232
/* FreeBSD, GNU/kFreeBSD */
33+
# include <sys/types.h>
34+
# include <sys/param.h>
3335
# include <sys/mount.h>
3436
#elif defined __NetBSD__ /* NetBSD */
3537
# include <sys/statvfs.h>

‎testdir40/gllib/stackvma.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ vma_iterate (struct callback_locals *locals)
16491649
/* Read the contents of /proc/<pid>/map in a single system call.
16501650
This guarantees a consistent result (no duplicated or omitted
16511651
entries). */
1652-
retry:
1652+
retry: ;
16531653
ssize_t nbytes;
16541654
do
16551655
nbytes = read (fd, auxmap, memneed);

‎testdir40/gllib/vma-iter.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ vma_iterate (vma_iterate_callback_fn callback, void *data)
10301030
/* Read the contents of /proc/<pid>/map in a single system call.
10311031
This guarantees a consistent result (no duplicated or omitted
10321032
entries). */
1033-
retry:
1033+
retry: ;
10341034
ssize_t nbytes;
10351035
do
10361036
nbytes = read (fd, auxmap, memneed);

0 commit comments

Comments
 (0)