Index: head/lib/libc/aarch64/sys/brk.S =================================================================== --- head/lib/libc/aarch64/sys/brk.S (revision 297972) +++ head/lib/libc/aarch64/sys/brk.S (revision 297973) @@ -1,76 +1,77 @@ /*- * 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 __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: head/lib/libc/aarch64/sys/cerror.S =================================================================== --- head/lib/libc/aarch64/sys/cerror.S (revision 297972) +++ head/lib/libc/aarch64/sys/cerror.S (revision 297973) @@ -1,41 +1,42 @@ /*- * Copyright (c) 2014 Andrew Turner * All rights reserved. * * 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 __FBSDID("$FreeBSD$"); ENTRY(cerror) + .hidden cerror sub sp, sp, #16 stp x0, lr, [sp] bl _C_LABEL(__error) ldp x1, lr, [sp] str x1, [x0] movn x0, #0 movn x1, #0 add sp, sp, #16 ret END(cerror) Index: head/lib/libc/aarch64/sys/sbrk.S =================================================================== --- head/lib/libc/aarch64/sys/sbrk.S (revision 297972) +++ head/lib/libc/aarch64/sys/sbrk.S (revision 297973) @@ -1,72 +1,73 @@ /*- * 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 __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)