libc: centralize {_,sig,}{set,long}jmp symbols

These symbols are universally exposed and documented so declare them
centrally.  Double- and triple-underscore versions exist on some
platforms, but leave those alone for now.

Reviewed by:	imp, kib
Differential Revision:	https://reviews.freebsd.org/D42616

(cherry picked from commit 1c656143be734de4b1e1bac27c0c48ef4d974510)

8 files changed, 6 insertions, 42 deletions

diff --git a/lib/libc/aarch64/Symbol.map b/lib/libc/aarch64/Symbol.map
index 691c77f345b9..a02c71c82b7d 100644
--- a/lib/libc/aarch64/Symbol.map
+++ b/lib/libc/aarch64/Symbol.map
@@ -5,18 +5,12 @@
  */
 FBSD_1.0 {
 	.mcount;
-	_setjmp;
-	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
 	fpsetmask;
 	__infinity;
 	__nan;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
 	makecontext;
 };
 
diff --git a/lib/libc/amd64/Symbol.map b/lib/libc/amd64/Symbol.map
index 3ceb1cd9682a..ea3b7866b718 100644
--- a/lib/libc/amd64/Symbol.map
+++ b/lib/libc/amd64/Symbol.map
@@ -5,8 +5,6 @@
  */
 FBSD_1.0 {
 	.mcount;
-	_setjmp;
-	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
@@ -20,10 +18,6 @@ FBSD_1.0 {
 	__nan;
 	makecontext;
 	rfork_thread;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
 	amd64_get_fsbase;
 	amd64_get_gsbase;
 	amd64_set_fsbase;
diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map
index 5a7aec7c4089..4be0a7b02964 100644
--- a/lib/libc/arm/Symbol.map
+++ b/lib/libc/arm/Symbol.map
@@ -5,17 +5,11 @@
  */
 FBSD_1.0 {
 	__mcount;
-	_setjmp;
-	_longjmp;
 	alloca;
 	fabs;
 	__infinity;
 	__nan;
 	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
 	brk;
 	sbrk;
 };
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index 1fa5478b7918..2b8195244734 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -217,6 +217,12 @@ FBSD_1.0 {
 	group_from_gid;
 	setdomainname;
 	sethostname;
+	_setjmp;
+	_longjmp;
+	setjmp;
+	longjmp;
+	sigsetjmp;
+	siglongjmp;
 	longjmperror;
 	getmode;
 	setmode;
diff --git a/lib/libc/i386/Symbol.map b/lib/libc/i386/Symbol.map
index f2424a9b64c4..3b3df6b37202 100644
--- a/lib/libc/i386/Symbol.map
+++ b/lib/libc/i386/Symbol.map
@@ -5,8 +5,6 @@
  */
 FBSD_1.0 {
 	.mcount;
-	_setjmp;
-	_longjmp;
 	alloca;
 	fabs;
 	__flt_rounds;
@@ -14,10 +12,6 @@ FBSD_1.0 {
 	__infinity;
 	makecontext;
 	rfork_thread;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
 	brk;
 	i386_clr_watch;
 	i386_get_fsbase;
diff --git a/lib/libc/powerpc/Symbol.map b/lib/libc/powerpc/Symbol.map
index ed5dd5884736..93e79fe96733 100644
--- a/lib/libc/powerpc/Symbol.map
+++ b/lib/libc/powerpc/Symbol.map
@@ -5,8 +5,6 @@
  */
 FBSD_1.0 {
 	_mcount;
-	_setjmp;
-	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
@@ -17,10 +15,6 @@ FBSD_1.0 {
 	__infinity;
 	__nan;
 	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
 	brk;
 	sbrk;
 };
diff --git a/lib/libc/powerpc64/Symbol.map b/lib/libc/powerpc64/Symbol.map
index dabf6f4434c5..6af9a0103816 100644
--- a/lib/libc/powerpc64/Symbol.map
+++ b/lib/libc/powerpc64/Symbol.map
@@ -5,8 +5,6 @@
  */
 FBSD_1.0 {
 	_mcount;
-	_setjmp;
-	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
@@ -17,10 +15,6 @@ FBSD_1.0 {
 	__infinity;
 	__nan;
 	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
 	brk;
 	sbrk;
 };
diff --git a/lib/libc/riscv/Symbol.map b/lib/libc/riscv/Symbol.map
index 8067ddca10cd..2e0467744778 100644
--- a/lib/libc/riscv/Symbol.map
+++ b/lib/libc/riscv/Symbol.map
@@ -4,18 +4,12 @@
  * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
  */
 FBSD_1.0 {
-	_setjmp;
-	_longjmp;
 	fabs;
 	__flt_rounds;
 	fpgetmask;
 	fpsetmask;
 	__infinity;
 	__nan;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
 	makecontext;
 };