Page MenuHomeFreeBSD
Files F156565343

D6464.id16583.diff
No OneTemporary
Actions

D6464.id16583.diff
View Options

Index: lib/libc/aarch64/Symbol.map
===================================================================
--- lib/libc/aarch64/Symbol.map
+++ lib/libc/aarch64/Symbol.map
@@ -28,8 +28,6 @@
ntohl;
ntohs;
vfork;
- brk;
- sbrk;
makecontext;
};
Index: lib/libc/aarch64/sys/Makefile.inc
===================================================================
--- lib/libc/aarch64/sys/Makefile.inc
+++ lib/libc/aarch64/sys/Makefile.inc
@@ -5,10 +5,8 @@
SRCS+= __vdso_gettc.c
#MDASM= ptrace.S
-MDASM= brk.S \
- cerror.S \
+MDASM= cerror.S \
pipe.S \
- sbrk.S \
shmat.S \
sigreturn.S \
syscall.S \
@@ -19,6 +17,7 @@
exit.o \
getlogin.o \
openbsd_poll.o \
+ sbrk.o \
sstk.o \
vfork.o \
yield.o
Index: lib/libc/aarch64/sys/brk.S
===================================================================
--- lib/libc/aarch64/sys/brk.S
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2014 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Andrew Turner under
- * sponsorship from the FreeBSD Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
- .globl _C_LABEL(_end)
-
- .data
- .align 3
- .globl _C_LABEL(minbrk)
- .hidden _C_LABEL(minbrk)
- .type _C_LABEL(minbrk),#object
-_C_LABEL(minbrk):
- .quad _C_LABEL(_end)
-
- .text
-/*
- * int brk(const void *addr);
- */
-ENTRY(_brk)
- WEAK_REFERENCE(_brk, brk)
-
- /* Load the address of minbrk */
- adrp x3, minbrk
- ldr x2, [x3, :lo12:minbrk]
-
- /* Validate the address */
- cmp x0, x2
- b.ge 1f
- /* Invalid, set it to the minimum */
- mov x0, x2
-
- /* Backup the new address */
-1: mov x4, x0
-
- /* Update for this value, will overwrite x0 and x1 */
- _SYSCALL(break)
- b.cs cerror
-
- /* Store the new curbrk value */
- adrp x2, curbrk
- str x4, [x2, :lo12:curbrk]
-
- /* Return success */
- mov x0, #0
- ret
-
-END(_brk)
Index: lib/libc/aarch64/sys/sbrk.S
===================================================================
--- lib/libc/aarch64/sys/sbrk.S
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 2014 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Andrew Turner under
- * sponsorship from the FreeBSD Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
- .globl _C_LABEL(_end)
-
- .data
- .align 3
- .global _C_LABEL(curbrk)
- .hidden _C_LABEL(curbrk)
- .type _C_LABEL(curbrk),#object
-_C_LABEL(curbrk):
- .quad _C_LABEL(_end)
-
- .text
-/*
- * void *sbrk(intptr_t incr);
- */
-ENTRY(_sbrk)
- WEAK_REFERENCE(_sbrk, sbrk)
-
- /* Load the address of curbrk */
- adrp x3, curbrk
-
- /* Get the current brk address */
- ldr x2, [x3, :lo12:curbrk]
-
- /* Calculate the new value */
- add x0, x2, x0
- mov x4, x0
-
- /* Update for this value, will overwrite x0 and x1 */
- _SYSCALL(break)
- b.cs cerror
-
- /* Load the old value to return */
- ldr x0, [x3, :lo12:curbrk]
-
- /* Store the new curbrk value */
- str x4, [x3, :lo12:curbrk]
-
- ret
-END(_sbrk)
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

File Metadata

Mime Type
text/plain
Expires
Fri, May 15, 5:22 PM (20 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33091674
Default Alt Text
D6464.id16583.diff (6 KB)

Event Timeline