The branch stable/14 has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=94671881419f0fb8014006266e5505feaf23daeb
commit 94671881419f0fb8014006266e5505feaf23daeb
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2024-01-02 16:22:13 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2024-01-02 16:22:13 +0000
libc: Centralize non-building of sbrk stubs
The actual implementation of sbrk(2) is on top of the undocumented
break(2) system call. On powerpc* this means we don't build _sbrk and
__sys_sbrk which were neither used nor exposed for linkage. Otherwise
it is a no-op.
The addition to lib/libc/sys/Makefile.inc is a direct commit to
stable/14 in lieu of merging the removal of the sbrk and sstk syscalls.
(cherry picked from commit 7893419d492c40ca82b68fca3dcc0f5f7047d39b)
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D43159
---
lib/libc/aarch64/sys/Makefile.inc | 3 +--
lib/libc/amd64/sys/Makefile.inc | 2 +-
lib/libc/arm/sys/Makefile.inc | 2 +-
lib/libc/i386/sys/Makefile.inc | 2 +-
lib/libc/riscv/sys/Makefile.inc | 2 +-
lib/libc/sys/Makefile.inc | 1 +
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/libc/aarch64/sys/Makefile.inc
b/lib/libc/aarch64/sys/Makefile.inc
index 7cb0544a2997..ae48fd739477 100644
--- a/lib/libc/aarch64/sys/Makefile.inc
+++ b/lib/libc/aarch64/sys/Makefile.inc
@@ -8,5 +8,4 @@ MDASM= cerror.S \
vfork.S
# Don't generate default code for these syscalls:
-NOASM+= sbrk.o \
- vfork.o
+NOASM+= vfork.o
diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/amd64/sys/Makefile.inc
index 32c03ccf2963..658fbd2add50 100644
--- a/lib/libc/amd64/sys/Makefile.inc
+++ b/lib/libc/amd64/sys/Makefile.inc
@@ -7,4 +7,4 @@ SRCS+= \
MDASM= vfork.S cerror.S getcontext.S
# Don't generate default code for these syscalls:
-NOASM+= sbrk.o vfork.o
+NOASM+= vfork.o
diff --git a/lib/libc/arm/sys/Makefile.inc b/lib/libc/arm/sys/Makefile.inc
index 398ac494f2bc..3a86936a7b23 100644
--- a/lib/libc/arm/sys/Makefile.inc
+++ b/lib/libc/arm/sys/Makefile.inc
@@ -4,4 +4,4 @@ SRCS+= __vdso_gettc.c \
MDASM= Ovfork.S cerror.S syscall.S
# Don't generate default code for these syscalls:
-NOASM+= sbrk.o vfork.o
+NOASM+= vfork.o
diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index accdc3367ac8..57a8af428aca 100644
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@@ -4,7 +4,7 @@ SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c
i386_get_ldt.c \
MDASM= Ovfork.S cerror.S getcontext.S syscall.S
-NOASM+= sbrk.o vfork.o
+NOASM+= vfork.o
MAN+= i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
MAN+= i386_set_watch.3
diff --git a/lib/libc/riscv/sys/Makefile.inc b/lib/libc/riscv/sys/Makefile.inc
index f1cc8d489553..cd8ba4f11557 100644
--- a/lib/libc/riscv/sys/Makefile.inc
+++ b/lib/libc/riscv/sys/Makefile.inc
@@ -6,4 +6,4 @@ MDASM= cerror.S \
vfork.S
# Don't generate default code for these syscalls:
-NOASM+= sbrk.o vfork.o
+NOASM+= vfork.o
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 480002f9875e..1acc66c5f726 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -18,6 +18,7 @@
#
NOASM= exit.o \
getlogin.o \
+ sbrk.o \
sstk.o \
yield.o
PSEUDO= _exit.o \
