4 files changed, 5 insertions, 90 deletions
diff --git a/lib/libc/arm/aeabi/Symbol.map b/lib/libc/arm/aeabi/Symbol.map
index 175884c82881..515794004ba7 100644
--- a/lib/libc/arm/aeabi/Symbol.map
+++ b/lib/libc/arm/aeabi/Symbol.map
@@ -6,50 +6,6 @@
 FBSDprivate_1.0 {
 	__aeabi_atexit;
 
-	__aeabi_dcmpeq;
-	__aeabi_dcmplt;
-	__aeabi_dcmple;
-	__aeabi_dcmpge;
-	__aeabi_dcmpgt;
-	__aeabi_dcmpun;
-
-	__aeabi_cdcmpeq;
-	__aeabi_cdcmple;
-	__aeabi_cdrcmple;
-
-	__aeabi_d2iz;
-	__aeabi_d2f;
-
-	__aeabi_dadd;
-	__aeabi_ddiv;
-	__aeabi_dmul;
-	__aeabi_dsub;
-
-
-	__aeabi_fcmpeq;
-	__aeabi_fcmplt;
-	__aeabi_fcmple;
-	__aeabi_fcmpge;
-	__aeabi_fcmpgt;
-	__aeabi_fcmpun;
-
-	__aeabi_cfcmpeq;
-	__aeabi_cfcmple;
-	__aeabi_cfrcmple;
-
-	__aeabi_f2iz;
-	__aeabi_f2d;
-
-	__aeabi_fadd;
-	__aeabi_fdiv;
-	__aeabi_fmul;
-	__aeabi_fsub;
-
-
-	__aeabi_i2d;
-	__aeabi_i2f;
-
-
 	__aeabi_memclr;
 	__aeabi_memclr4;
 	__aeabi_memclr8;
diff --git a/lib/libc/arm/aeabi/aeabi_int_div.S b/lib/libc/arm/aeabi/aeabi_int_div.S
index 708b478b3881..bb002c2716f7 100644
--- a/lib/libc/arm/aeabi/aeabi_int_div.S
+++ b/lib/libc/arm/aeabi/aeabi_int_div.S
@@ -37,11 +37,13 @@
  */
 
 ENTRY(__aeabi_uidiv_compat)
+	.hidden __aeabi_uidiv_compat
 	.symver __aeabi_uidiv_compat, __aeabi_uidiv@
 	b __udivsi3
 END(__aeabi_uidiv_compat)
 
 ENTRY(__aeabi_idiv_compat)
+	.hidden __aeabi_idiv_compat
 	.symver __aeabi_idiv_compat, __aeabi_idiv@
 	b __divsi3
 END(__aeabi_idiv_compat)
diff --git a/lib/libc/arm/aeabi/aeabi_vfp.h b/lib/libc/arm/aeabi/aeabi_vfp.h
index 3b70fe06fab3..4f3bb2ef969b 100644
--- a/lib/libc/arm/aeabi/aeabi_vfp.h
+++ b/lib/libc/arm/aeabi/aeabi_vfp.h
@@ -40,7 +40,9 @@
 #define	AEABI_ENTRY(x)	ENTRY(__aeabi_ ## x ## _vfp)
 #define	AEABI_END(x)	END(__aeabi_ ## x ## _vfp)
 #else
-#define	AEABI_ENTRY(x)	ENTRY(__aeabi_ ## x)
+#define	AEABI_ENTRY(x)						\
+	ENTRY(__aeabi_ ## x)					\
+	.symver __aeabi_##x, __aeabi_##x##@FBSDprivate_1.0;
 #define	AEABI_END(x)	END(__aeabi_ ## x)
 #endif
 
diff --git a/lib/libc/arm/static_tls.h b/lib/libc/arm/static_tls.h
deleted file mode 100644
index 557748d75347..000000000000
--- a/lib/libc/arm/static_tls.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2019 The FreeBSD Foundation
- *
- * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
- * 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.
- */
-
-#ifndef _LIBC_ARM_STATIC_TLS_H
-#define _LIBC_ARM_STATIC_TLS_H
-
-static __inline uintptr_t
-_libc_get_static_tls_base(size_t offset)
-{
-	uintptr_t tlsbase;
-
-	__asm __volatile("mrc  p15, 0, %0, c13, c0, 3" : "=r" (tlsbase));
-
-	tlsbase += offset;
-	return (tlsbase);
-}
-
-#endif