Author: br
Date: Wed May 25 14:08:21 2016
New Revision: 300680
URL: https://svnweb.freebsd.org/changeset/base/300680
Log:
Remove legacy brk and sbrk from RISC-V.
Discussed with: andrew
Sponsored by: DARPA, AFRL
Sponsored by: HEIF5
Deleted:
head/lib/libc/riscv/sys/brk.S
head/lib/libc/riscv/sys/sbrk.S
Modified:
head/contrib/netbsd-tests/lib/libc/gen/t_dir.c
head/contrib/netbsd-tests/lib/libc/sys/t_mlock.c
head/lib/libc/riscv/Symbol.map
head/lib/libc/riscv/sys/Makefile.inc
Modified: head/contrib/netbsd-tests/lib/libc/gen/t_dir.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/gen/t_dir.c Wed May 25 13:48:26
2016 (r300679)
+++ head/contrib/netbsd-tests/lib/libc/gen/t_dir.c Wed May 25 14:08:21
2016 (r300680)
@@ -111,7 +111,8 @@ ATF_TC_BODY(seekdir_basic, tc)
closedir(dp);
}
-#ifndef __aarch64__ /* There is no sbrk on AArch64 */
+/* There is no sbrk on AArch64 and RISC-V */
+#if !defined(__aarch64__) && !defined(__riscv__)
ATF_TC(telldir_leak);
ATF_TC_HEAD(telldir_leak, tc)
{
@@ -161,7 +162,7 @@ ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, seekdir_basic);
-#ifndef __aarch64__
+#if !defined(__aarch64__) && !defined(__riscv__)
ATF_TP_ADD_TC(tp, telldir_leak);
#endif
Modified: head/contrib/netbsd-tests/lib/libc/sys/t_mlock.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/sys/t_mlock.c Wed May 25 13:48:26
2016 (r300679)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_mlock.c Wed May 25 14:08:21
2016 (r300680)
@@ -176,7 +176,7 @@ ATF_TC_BODY(mlock_err, tc)
unsigned long vmin = 0;
size_t len = sizeof(vmin);
#endif
-#ifndef __aarch64__
+#if !defined(__aarch64__) && !defined(__riscv__)
void *invalid_ptr;
#endif
int null_errno = ENOMEM; /* error expected for NULL */
@@ -214,7 +214,8 @@ ATF_TC_BODY(mlock_err, tc)
errno = 0;
ATF_REQUIRE_ERRNO(EINVAL, munlock((char *)-1, page) == -1);
-#ifndef __aarch64__ /* There is no sbrk on AArch64 */
+/* There is no sbrk on AArch64 and RISC-V */
+#if !defined(__aarch64__) && !defined(__riscv__)
/*
* Try to create a pointer to an unmapped page - first after current
* brk will likely do.
Modified: head/lib/libc/riscv/Symbol.map
==============================================================================
--- head/lib/libc/riscv/Symbol.map Wed May 25 13:48:26 2016
(r300679)
+++ head/lib/libc/riscv/Symbol.map Wed May 25 14:08:21 2016
(r300680)
@@ -28,8 +28,6 @@ FBSD_1.0 {
ntohl;
ntohs;
vfork;
- brk;
- sbrk;
makecontext;
};
Modified: head/lib/libc/riscv/sys/Makefile.inc
==============================================================================
--- head/lib/libc/riscv/sys/Makefile.inc Wed May 25 13:48:26 2016
(r300679)
+++ head/lib/libc/riscv/sys/Makefile.inc Wed May 25 14:08:21 2016
(r300680)
@@ -3,10 +3,8 @@
SRCS+= trivial-vdso_tc.c
#MDASM= ptrace.S
-MDASM= brk.S \
- cerror.S \
+MDASM= cerror.S \
pipe.S \
- sbrk.S \
shmat.S \
sigreturn.S \
syscall.S \
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
