Index: bin/csh/config.h =================================================================== --- bin/csh/config.h +++ bin/csh/config.h @@ -99,7 +99,7 @@ #define HAVE_PATHS_H 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define to 1 if you have the `setpgid' function. */ #define HAVE_SETPGID 1 Index: contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h =================================================================== --- contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h +++ contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h @@ -8,6 +8,8 @@ #define JEMALLOC_DEBUG #endif +#undef JEMALLOC_DSS + /* * The following are architecture-dependent, so conditionally define them for * each supported architecture. Index: gnu/usr.bin/binutils/as/config.h =================================================================== --- gnu/usr.bin/binutils/as/config.h +++ gnu/usr.bin/binutils/as/config.h @@ -69,7 +69,7 @@ /* #undef HAVE_REMOVE */ /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define to 1 if you have the header file. */ #define HAVE_STDARG_H 1 Index: gnu/usr.bin/binutils/ld/config.h =================================================================== --- gnu/usr.bin/binutils/ld/config.h +++ gnu/usr.bin/binutils/ld/config.h @@ -27,7 +27,7 @@ /* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't. */ -#define HAVE_DECL_SBRK 1 +#define HAVE_DECL_SBRK 0 /* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. */ @@ -65,7 +65,7 @@ #define HAVE_REALPATH 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 Index: gnu/usr.bin/binutils/libbinutils/config.h =================================================================== --- gnu/usr.bin/binutils/libbinutils/config.h +++ gnu/usr.bin/binutils/libbinutils/config.h @@ -49,7 +49,7 @@ /* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't. */ -#define HAVE_DECL_SBRK 1 +#define HAVE_DECL_SBRK 0 /* Define to 1 if you have the declaration of `snprintf', and to 0 if you don't. */ @@ -104,7 +104,7 @@ #define HAVE_MKSTEMP 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define to 1 if you have the `setmode' function. */ #define HAVE_SETMODE 1 Index: gnu/usr.bin/binutils/libiberty/config.h =================================================================== --- gnu/usr.bin/binutils/libiberty/config.h +++ gnu/usr.bin/binutils/libiberty/config.h @@ -73,7 +73,7 @@ /* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't. */ -#define HAVE_DECL_SBRK 1 +#define HAVE_DECL_SBRK 0 /* Define to 1 if you have the declaration of `snprintf', and to 0 if you don't. */ @@ -188,7 +188,7 @@ #define HAVE_RINDEX 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 Index: gnu/usr.bin/cc/libiberty/config.h =================================================================== --- gnu/usr.bin/cc/libiberty/config.h +++ gnu/usr.bin/cc/libiberty/config.h @@ -72,7 +72,7 @@ /* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't. */ -#define HAVE_DECL_SBRK 1 +#define HAVE_DECL_SBRK 0 /* Define to 1 if you have the declaration of `snprintf', and to 0 if you don't. */ @@ -187,7 +187,7 @@ #define HAVE_RINDEX 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 Index: gnu/usr.bin/gdb/arch/amd64/config.h =================================================================== --- gnu/usr.bin/gdb/arch/amd64/config.h +++ gnu/usr.bin/gdb/arch/amd64/config.h @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Index: gnu/usr.bin/gdb/arch/arm/config.h =================================================================== --- gnu/usr.bin/gdb/arch/arm/config.h +++ gnu/usr.bin/gdb/arch/arm/config.h @@ -239,7 +239,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Index: gnu/usr.bin/gdb/arch/i386/config.h =================================================================== --- gnu/usr.bin/gdb/arch/i386/config.h +++ gnu/usr.bin/gdb/arch/i386/config.h @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Index: gnu/usr.bin/gdb/arch/mips/config.h =================================================================== --- gnu/usr.bin/gdb/arch/mips/config.h +++ gnu/usr.bin/gdb/arch/mips/config.h @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Index: gnu/usr.bin/gdb/arch/powerpc/config.h =================================================================== --- gnu/usr.bin/gdb/arch/powerpc/config.h +++ gnu/usr.bin/gdb/arch/powerpc/config.h @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Index: gnu/usr.bin/gdb/arch/powerpc64/config.h =================================================================== --- gnu/usr.bin/gdb/arch/powerpc64/config.h +++ gnu/usr.bin/gdb/arch/powerpc64/config.h @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Index: gnu/usr.bin/gdb/arch/sparc64/config.h =================================================================== --- gnu/usr.bin/gdb/arch/sparc64/config.h +++ gnu/usr.bin/gdb/arch/sparc64/config.h @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Index: include/unistd.h =================================================================== --- include/unistd.h +++ include/unistd.h @@ -466,12 +466,10 @@ #endif /* __XSI_VISIBLE */ #if (__XSI_VISIBLE && __XSI_VISIBLE <= 500) || __BSD_VISIBLE -int brk(const void *); int chroot(const char *); int getdtablesize(void); int getpagesize(void) __pure2; char *getpass(const char *); -void *sbrk(intptr_t); #endif #if (__XSI_VISIBLE && __XSI_VISIBLE <= 600) || __BSD_VISIBLE Index: lib/clang/include/llvm/Config/config.h =================================================================== --- lib/clang/include/llvm/Config/config.h +++ lib/clang/include/llvm/Config/config.h @@ -250,7 +250,7 @@ #define HAVE_REALPATH 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +#undef HAVE_SBRK /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 Index: lib/libc/sys/Makefile.inc =================================================================== --- lib/libc/sys/Makefile.inc +++ lib/libc/sys/Makefile.inc @@ -7,6 +7,7 @@ # Include the generated makefile containing the *complete* list # of syscall names in MIASM. .include "${LIBC_SRCTOP}/../../sys/sys/syscall.mk" +MIASM:=${MIASM:Nbrk.o:Nsbrk.o} # Include machine dependent definitions. # @@ -14,6 +15,7 @@ # NOASM will prevent the default syscall code from being generated. # .sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/sys/Makefile.inc" +MDASM:=${MDASM:Nbrk.S:Nsbrk.S} SRCS+= clock_gettime.c gettimeofday.c __vdso_gettimeofday.c NOASM+= clock_gettime.o gettimeofday.o Index: lib/libc/tests/gen/Makefile =================================================================== --- lib/libc/tests/gen/Makefile +++ lib/libc/tests/gen/Makefile @@ -13,14 +13,13 @@ ATF_TESTS_C+= wordexp_test ATF_TESTS_C+= dlopen_empty_test -# TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid, t_sleep +# TODO: t_closefrom, t_cpuset, t_dir, t_fmtcheck, t_randomid, t_sleep # TODO: t_siginfo (fixes require further inspection) # TODO: t_sethostname_test (consistently screws up the hostname) NETBSD_ATF_TESTS_C= alarm_test NETBSD_ATF_TESTS_C+= assert_test NETBSD_ATF_TESTS_C+= basedirname_test -NETBSD_ATF_TESTS_C+= dir_test NETBSD_ATF_TESTS_C+= floatunditf_test NETBSD_ATF_TESTS_C+= fnmatch_test NETBSD_ATF_TESTS_C+= fpclassify_test Index: lib/libc/tests/sys/Makefile =================================================================== --- lib/libc/tests/sys/Makefile +++ lib/libc/tests/sys/Makefile @@ -4,7 +4,7 @@ ATF_TESTS_C+= queue_test -# TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg, +# TODO: clone, lwp_create, lwp_ctl, mlock, posix_fadvise, recvmmsg, # swapcontext NETBSD_ATF_TESTS_C+= access_test NETBSD_ATF_TESTS_C+= chroot_test @@ -29,7 +29,6 @@ NETBSD_ATF_TESTS_C+= mkdir_test NETBSD_ATF_TESTS_C+= mkfifo_test NETBSD_ATF_TESTS_C+= mknod_test -NETBSD_ATF_TESTS_C+= mlock_test NETBSD_ATF_TESTS_C+= mmap_test NETBSD_ATF_TESTS_C+= mprotect_test NETBSD_ATF_TESTS_C+= msgctl_test