diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc
--- a/lib/libcompiler_rt/Makefile.inc
+++ b/lib/libcompiler_rt/Makefile.inc
@@ -132,7 +132,6 @@
 #
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 SRCF+=		divxc3
-SRCF+=		extendxftf2
 SRCF+=		fixxfdi
 SRCF+=		fixxfti
 SRCF+=		fixunsxfdi
@@ -142,7 +141,6 @@
 SRCF+=		floatuntixf
 SRCF+=		mulxc3
 SRCF+=		powixf2
-SRCF+=		trunctfxf2
 
 # Avoid using SSE2 instructions on i386, if unsupported.
 .if ${MACHINE_CPUARCH} == "i386" && empty(MACHINE_CPU:Msse2)
diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map
--- a/lib/libgcc_s/Symbol.map
+++ b/lib/libgcc_s/Symbol.map
@@ -33,14 +33,14 @@
 #ifndef __arm__
 	__fixunssfsi;
 #endif
-#ifndef __powerpc__
+#if defined(__amd64__) || defined(__i386__)
 	__fixunsxfdi;
 	__fixunsxfsi;
 	__fixxfdi;
 #endif
 	__floatdidf;
 	__floatdisf;
-#ifndef __powerpc__
+#if defined(__amd64__) || defined(__i386__)
 	__floatdixf;
 #endif
 	__lshrdi3;
@@ -91,11 +91,8 @@
 	__fixsfti;
 	__fixunsdfti;
 	__fixunssfti;
-	__fixunsxfti;
-	__fixxfti;
 	__floattidf;
 	__floattisf;
-	__floattixf;
 	__lshrti3;
 	__modti3;
 	__multi3;
@@ -104,6 +101,11 @@
 	__udivmodti4;
 	__udivti3;
 	__umodti3;
+#ifdef __amd64__
+	__fixunsxfti;
+	__fixxfti;
+	__floattixf;
+#endif
 #endif
 };
 
@@ -152,17 +154,17 @@
 GCC_4.0.0 {
 	__divdc3;
 	__divsc3;
-#ifndef __powerpc__
+#if defined(__amd64__) && define(__i386__)
 	__divxc3;
 #endif
 	__muldc3;
 	__mulsc3;
-#ifndef __powerpc__
+#if defined(__amd64__) && define(__i386__)
 	__mulxc3;
 #endif
 	__powidf2;
 	__powisf2;
-#ifndef __powerpc__
+#if defined(__amd64__) && define(__i386__)
 	__powixf2;
 #endif
 };
@@ -170,7 +172,7 @@
 GCC_4.2.0 {
 	__floatundidf;
 	__floatundisf;
-#ifndef __powerpc__
+#if defined(__amd64__) && define(__i386__)
 	__floatundixf;
 #endif
 	_Unwind_GetIPInfo;
@@ -178,8 +180,10 @@
 #ifdef CRT_HAS_128BIT
 	__floatuntidf;
 	__floatuntisf;
+#ifdef __amd64__
 	__floatuntixf;
 #endif
+#endif
 };
 
 GCC_4.3.0 {
@@ -187,15 +191,14 @@
 	__bswapsi2;
 };
 
-#if defined(__aarch64__) || defined(__riscv)
 GCC_4.6.0 {
+#if defined(__aarch64__) || defined(__riscv)
 	__addtf3;
 	__cmptf2;
 	__divtf3;
 	__eqtf2;
 	__extenddftf2;
 	__extendsftf2;
-	__extendxftf2;
 	__fixtfdi;
 	__fixtfsi;
 	__fixtfti;
@@ -217,10 +220,9 @@
 	__subtf3;
 	__trunctfdf2;
 	__trunctfsf2;
-	__trunctfxf2;
 	__unordtf2;
-};
 #endif
+};
 
 GCC_7.0.0 {
 #ifdef __i386__