Remove brk and sbrk from arm64. They were defined in The Single UNIX

Specification, Version 2, but marked as legacy, and have been removed from
later specifications. After 12 years it is time to remove them from new
architectures when the main use for sbrk is an invalid method to attempt
to find how much memory has been allocated from malloc.

There are a few places in the tree that still call sbrk, however they are
not used on arm64. They will need to be fixed to cross build from arm64,
but these will be fixed in a follow up commit.

Old copies of binutils from ports called into sbrk, however this has been
fixed around 6 weeks ago. It is advised to update binutils on arm64 before
installing a world that includes this change.

Reviewed by:	brooks, emaste
Obtained from:	brooks
Relnotes:	yes
Sponsored by:	ABT Systems Ltd
Differential Revision:	https://reviews.freebsd.org/D6464

4 files changed, 2 insertions, 155 deletions

diff --git a/lib/libc/aarch64/Symbol.map b/lib/libc/aarch64/Symbol.map
index 0c00ec2..669dad3 100644
--- a/lib/libc/aarch64/Symbol.map
+++ b/lib/libc/aarch64/Symbol.map
@@ -28,8 +28,6 @@ FBSD_1.0 {
 	ntohl;
 	ntohs;
 	vfork;
-	brk;
-	sbrk;
 	makecontext;
 };
 
diff --git a/lib/libc/aarch64/sys/Makefile.inc b/lib/libc/aarch64/sys/Makefile.inc
index 5a8c595..fb4ae71 100644
--- a/lib/libc/aarch64/sys/Makefile.inc
+++ b/lib/libc/aarch64/sys/Makefile.inc
@@ -5,10 +5,8 @@ MIASM:=	${MIASM:Nfreebsd[467]_*}
 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 @@ NOASM=	break.o \
 	exit.o \
 	getlogin.o \
 	openbsd_poll.o \
+	sbrk.o \
 	sstk.o \
 	vfork.o \
 	yield.o
diff --git a/lib/libc/aarch64/sys/brk.S b/lib/libc/aarch64/sys/brk.S
deleted file mode 100644
index c403b43..0000000
--- a/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)
diff --git a/lib/libc/aarch64/sys/sbrk.S b/lib/libc/aarch64/sys/sbrk.S
deleted file mode 100644
index 87b82d4..0000000
--- a/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)