Skip to content

Commit 7dfe24e

Browse files
behlendorfbehlendorf
committed
Merge commit 'refs/top-bases/top' into top
2 parents 12e83b7 + 641f300 commit 7dfe24e

File tree

30 files changed

+254
-0
lines changed

30 files changed

+254
-0
lines changed

‎Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ am__aclocal_m4_deps = \
7474
$(top_srcdir)/config/user-libblkid.m4 \
7575
$(top_srcdir)/config/user-libshare.m4 \
7676
$(top_srcdir)/config/user-libuuid.m4 \
77+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
7778
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
7879
$(top_srcdir)/config/zfs-build.m4 \
7980
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎cmd/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = \
6262
$(top_srcdir)/config/user-libblkid.m4 \
6363
$(top_srcdir)/config/user-libshare.m4 \
6464
$(top_srcdir)/config/user-libuuid.m4 \
65+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6566
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6667
$(top_srcdir)/config/zfs-build.m4 \
6768
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎cmd/zdb/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ am__aclocal_m4_deps = \
6565
$(top_srcdir)/config/user-libblkid.m4 \
6666
$(top_srcdir)/config/user-libshare.m4 \
6767
$(top_srcdir)/config/user-libuuid.m4 \
68+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6869
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6970
$(top_srcdir)/config/zfs-build.m4 \
7071
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎cmd/zfs/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ am__aclocal_m4_deps = \
6565
$(top_srcdir)/config/user-libblkid.m4 \
6666
$(top_srcdir)/config/user-libshare.m4 \
6767
$(top_srcdir)/config/user-libuuid.m4 \
68+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6869
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6970
$(top_srcdir)/config/zfs-build.m4 \
7071
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎cmd/zinject/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ am__aclocal_m4_deps = \
6565
$(top_srcdir)/config/user-libblkid.m4 \
6666
$(top_srcdir)/config/user-libshare.m4 \
6767
$(top_srcdir)/config/user-libuuid.m4 \
68+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6869
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6970
$(top_srcdir)/config/zfs-build.m4 \
7071
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎cmd/zpios/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ am__aclocal_m4_deps = \
6565
$(top_srcdir)/config/user-libblkid.m4 \
6666
$(top_srcdir)/config/user-libshare.m4 \
6767
$(top_srcdir)/config/user-libuuid.m4 \
68+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6869
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6970
$(top_srcdir)/config/zfs-build.m4 \
7071
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎cmd/zpool/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ am__aclocal_m4_deps = \
6565
$(top_srcdir)/config/user-libblkid.m4 \
6666
$(top_srcdir)/config/user-libshare.m4 \
6767
$(top_srcdir)/config/user-libuuid.m4 \
68+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6869
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6970
$(top_srcdir)/config/zfs-build.m4 \
7071
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎cmd/zpool_id/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = \
6464
$(top_srcdir)/config/user-libblkid.m4 \
6565
$(top_srcdir)/config/user-libshare.m4 \
6666
$(top_srcdir)/config/user-libuuid.m4 \
67+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6768
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6869
$(top_srcdir)/config/zfs-build.m4 \
6970
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎cmd/ztest/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ am__aclocal_m4_deps = \
6565
$(top_srcdir)/config/user-libblkid.m4 \
6666
$(top_srcdir)/config/user-libshare.m4 \
6767
$(top_srcdir)/config/user-libuuid.m4 \
68+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6869
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6970
$(top_srcdir)/config/zfs-build.m4 \
7071
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎config/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = \
6363
$(top_srcdir)/config/user-libblkid.m4 \
6464
$(top_srcdir)/config/user-libshare.m4 \
6565
$(top_srcdir)/config/user-libuuid.m4 \
66+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6667
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6768
$(top_srcdir)/config/zfs-build.m4 \
6869
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎configure

Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14500,6 +14500,117 @@ fi
1450014500
CFLAGS="$saved_flags"
1450114501

1450214502

14503+
14504+
14505+
{ $as_echo "$as_me:$LINENO: checking whether pthread stack includes guard" >&5
14506+
$as_echo_n "checking whether pthread stack includes guard... " >&6; }
14507+
14508+
saved_CFLAGS="$CFLAGS"
14509+
CFLAGS="-fstack-check"
14510+
saved_LDFLAGS="$LDFLAGS"
14511+
LDFLAGS="-lpthread"
14512+
14513+
if test "$cross_compiling" = yes; then
14514+
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
14515+
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14516+
{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
14517+
See \`config.log' for more details." >&5
14518+
$as_echo "$as_me: error: cannot run test program while cross compiling
14519+
See \`config.log' for more details." >&2;}
14520+
{ (exit 1); exit 1; }; }; }
14521+
else
14522+
cat >conftest.$ac_ext <<_ACEOF
14523+
/* confdefs.h. */
14524+
_ACEOF
14525+
cat confdefs.h >>conftest.$ac_ext
14526+
cat >>conftest.$ac_ext <<_ACEOF
14527+
/* end confdefs.h. */
14528+
14529+
#include <pthread.h>
14530+
#include <sys/resource.h>
14531+
#include <unistd.h>
14532+
#include <bits/local_lim.h>
14533+
14534+
#define PAGESIZE (sysconf(_SC_PAGESIZE))
14535+
#define STACK_SIZE 8192
14536+
#define BUFSIZE 4096
14537+
14538+
void * func(void *arg)
14539+
{
14540+
char buf[BUFSIZE];
14541+
}
14542+
14543+
int
14544+
main ()
14545+
{
14546+
14547+
pthread_t tid;
14548+
pthread_attr_t attr;
14549+
struct rlimit l;
14550+
14551+
l.rlim_cur = 0;
14552+
l.rlim_max = 0;
14553+
setrlimit(RLIMIT_CORE, &l);
14554+
pthread_attr_init(&attr);
14555+
pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN + STACK_SIZE);
14556+
pthread_attr_setguardsize(&attr, PAGESIZE);
14557+
pthread_create(&tid, &attr, func, NULL);
14558+
pthread_join(tid, NULL);
14559+
14560+
;
14561+
return 0;
14562+
}
14563+
_ACEOF
14564+
rm -f conftest$ac_exeext
14565+
if { (ac_try="$ac_link"
14566+
case "(($ac_try" in
14567+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14568+
*) ac_try_echo=$ac_try;;
14569+
esac
14570+
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14571+
$as_echo "$ac_try_echo") >&5
14572+
(eval "$ac_link") 2>&5
14573+
ac_status=$?
14574+
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14575+
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
14576+
{ (case "(($ac_try" in
14577+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14578+
*) ac_try_echo=$ac_try;;
14579+
esac
14580+
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
14581+
$as_echo "$ac_try_echo") >&5
14582+
(eval "$ac_try") 2>&5
14583+
ac_status=$?
14584+
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
14585+
(exit $ac_status); }; }; then
14586+
14587+
{ $as_echo "$as_me:$LINENO: result: no" >&5
14588+
$as_echo "no" >&6; }
14589+
14590+
else
14591+
$as_echo "$as_me: program exited with status $ac_status" >&5
14592+
$as_echo "$as_me: failed program was:" >&5
14593+
sed 's/^/| /' conftest.$ac_ext >&5
14594+
14595+
( exit $ac_status )
14596+
14597+
14598+
cat >>confdefs.h <<\_ACEOF
14599+
#define NPTL_GUARD_WITHIN_STACK 1
14600+
_ACEOF
14601+
14602+
{ $as_echo "$as_me:$LINENO: result: yes" >&5
14603+
$as_echo "yes" >&6; }
14604+
14605+
fi
14606+
rm -rf conftest.dSYM
14607+
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
14608+
fi
14609+
14610+
14611+
CFLAGS="$saved_CFLAGS"
14612+
LDFLAGS="$saved_LDFLAGS"
14613+
1450314614
;;
1450414615
all)
1450514616

@@ -17329,6 +17440,117 @@ fi
1732917440
CFLAGS="$saved_flags"
1733017441

1733117442

17443+
17444+
17445+
{ $as_echo "$as_me:$LINENO: checking whether pthread stack includes guard" >&5
17446+
$as_echo_n "checking whether pthread stack includes guard... " >&6; }
17447+
17448+
saved_CFLAGS="$CFLAGS"
17449+
CFLAGS="-fstack-check"
17450+
saved_LDFLAGS="$LDFLAGS"
17451+
LDFLAGS="-lpthread"
17452+
17453+
if test "$cross_compiling" = yes; then
17454+
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
17455+
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
17456+
{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
17457+
See \`config.log' for more details." >&5
17458+
$as_echo "$as_me: error: cannot run test program while cross compiling
17459+
See \`config.log' for more details." >&2;}
17460+
{ (exit 1); exit 1; }; }; }
17461+
else
17462+
cat >conftest.$ac_ext <<_ACEOF
17463+
/* confdefs.h. */
17464+
_ACEOF
17465+
cat confdefs.h >>conftest.$ac_ext
17466+
cat >>conftest.$ac_ext <<_ACEOF
17467+
/* end confdefs.h. */
17468+
17469+
#include <pthread.h>
17470+
#include <sys/resource.h>
17471+
#include <unistd.h>
17472+
#include <bits/local_lim.h>
17473+
17474+
#define PAGESIZE (sysconf(_SC_PAGESIZE))
17475+
#define STACK_SIZE 8192
17476+
#define BUFSIZE 4096
17477+
17478+
void * func(void *arg)
17479+
{
17480+
char buf[BUFSIZE];
17481+
}
17482+
17483+
int
17484+
main ()
17485+
{
17486+
17487+
pthread_t tid;
17488+
pthread_attr_t attr;
17489+
struct rlimit l;
17490+
17491+
l.rlim_cur = 0;
17492+
l.rlim_max = 0;
17493+
setrlimit(RLIMIT_CORE, &l);
17494+
pthread_attr_init(&attr);
17495+
pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN + STACK_SIZE);
17496+
pthread_attr_setguardsize(&attr, PAGESIZE);
17497+
pthread_create(&tid, &attr, func, NULL);
17498+
pthread_join(tid, NULL);
17499+
17500+
;
17501+
return 0;
17502+
}
17503+
_ACEOF
17504+
rm -f conftest$ac_exeext
17505+
if { (ac_try="$ac_link"
17506+
case "(($ac_try" in
17507+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17508+
*) ac_try_echo=$ac_try;;
17509+
esac
17510+
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17511+
$as_echo "$ac_try_echo") >&5
17512+
(eval "$ac_link") 2>&5
17513+
ac_status=$?
17514+
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17515+
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
17516+
{ (case "(($ac_try" in
17517+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17518+
*) ac_try_echo=$ac_try;;
17519+
esac
17520+
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
17521+
$as_echo "$ac_try_echo") >&5
17522+
(eval "$ac_try") 2>&5
17523+
ac_status=$?
17524+
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
17525+
(exit $ac_status); }; }; then
17526+
17527+
{ $as_echo "$as_me:$LINENO: result: no" >&5
17528+
$as_echo "no" >&6; }
17529+
17530+
else
17531+
$as_echo "$as_me: program exited with status $ac_status" >&5
17532+
$as_echo "$as_me: failed program was:" >&5
17533+
sed 's/^/| /' conftest.$ac_ext >&5
17534+
17535+
( exit $ac_status )
17536+
17537+
17538+
cat >>confdefs.h <<\_ACEOF
17539+
#define NPTL_GUARD_WITHIN_STACK 1
17540+
_ACEOF
17541+
17542+
{ $as_echo "$as_me:$LINENO: result: yes" >&5
17543+
$as_echo "yes" >&6; }
17544+
17545+
fi
17546+
rm -rf conftest.dSYM
17547+
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
17548+
fi
17549+
17550+
17551+
CFLAGS="$saved_CFLAGS"
17552+
LDFLAGS="$saved_LDFLAGS"
17553+
1733217554
;;
1733317555
srpm) ;;
1733417556
*)

‎etc/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = \
6464
$(top_srcdir)/config/user-libblkid.m4 \
6565
$(top_srcdir)/config/user-libshare.m4 \
6666
$(top_srcdir)/config/user-libuuid.m4 \
67+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6768
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6869
$(top_srcdir)/config/zfs-build.m4 \
6970
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎lib/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = \
6262
$(top_srcdir)/config/user-libblkid.m4 \
6363
$(top_srcdir)/config/user-libshare.m4 \
6464
$(top_srcdir)/config/user-libuuid.m4 \
65+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6566
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6667
$(top_srcdir)/config/zfs-build.m4 \
6768
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎lib/libavl/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = \
6464
$(top_srcdir)/config/user-libblkid.m4 \
6565
$(top_srcdir)/config/user-libshare.m4 \
6666
$(top_srcdir)/config/user-libuuid.m4 \
67+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6768
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6869
$(top_srcdir)/config/zfs-build.m4 \
6970
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎lib/libefi/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = \
6464
$(top_srcdir)/config/user-libblkid.m4 \
6565
$(top_srcdir)/config/user-libshare.m4 \
6666
$(top_srcdir)/config/user-libuuid.m4 \
67+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6768
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6869
$(top_srcdir)/config/zfs-build.m4 \
6970
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎lib/libnvpair/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = \
6464
$(top_srcdir)/config/user-libblkid.m4 \
6565
$(top_srcdir)/config/user-libshare.m4 \
6666
$(top_srcdir)/config/user-libuuid.m4 \
67+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6768
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6869
$(top_srcdir)/config/zfs-build.m4 \
6970
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎lib/libspl/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = \
6464
$(top_srcdir)/config/user-libblkid.m4 \
6565
$(top_srcdir)/config/user-libshare.m4 \
6666
$(top_srcdir)/config/user-libuuid.m4 \
67+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6768
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6869
$(top_srcdir)/config/zfs-build.m4 \
6970
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎lib/libspl/asm-generic/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = \
6363
$(top_srcdir)/config/user-libblkid.m4 \
6464
$(top_srcdir)/config/user-libshare.m4 \
6565
$(top_srcdir)/config/user-libuuid.m4 \
66+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6667
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6768
$(top_srcdir)/config/zfs-build.m4 \
6869
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎lib/libspl/asm-i386/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = \
6464
$(top_srcdir)/config/user-libblkid.m4 \
6565
$(top_srcdir)/config/user-libshare.m4 \
6666
$(top_srcdir)/config/user-libuuid.m4 \
67+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6768
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6869
$(top_srcdir)/config/zfs-build.m4 \
6970
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎lib/libspl/asm-x86_64/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = \
6464
$(top_srcdir)/config/user-libblkid.m4 \
6565
$(top_srcdir)/config/user-libshare.m4 \
6666
$(top_srcdir)/config/user-libuuid.m4 \
67+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6768
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6869
$(top_srcdir)/config/zfs-build.m4 \
6970
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

‎lib/libspl/include/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = \
6464
$(top_srcdir)/config/user-libblkid.m4 \
6565
$(top_srcdir)/config/user-libshare.m4 \
6666
$(top_srcdir)/config/user-libuuid.m4 \
67+
$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
6768
$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
6869
$(top_srcdir)/config/zfs-build.m4 \
6970
$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac

0 commit comments

Comments
 (0)