libc/quad: Switch to per-arch lists of symbols

This more closely mirrors libc/quad/Makefile.inc and is easier to
read.

Reviewed by:	brooks
Differential Revision:	https://reviews.freebsd.org/D55658

1 files changed, 19 insertions, 24 deletions

diff --git a/lib/libc/quad/Symbol.map b/lib/libc/quad/Symbol.map
index 7c60d8183b75..c28f9a180704 100644
--- a/lib/libc/quad/Symbol.map
+++ b/lib/libc/quad/Symbol.map
@@ -5,54 +5,49 @@ FBSD_1.0 {
 	 * broken and they expect to see them in libc.  glibc exports
 	 * them, but they do not appear to be exported in Solaris.
 	 */
-#ifndef __i386__
+#ifdef __i386__
+	__cmpdi2;
+	__divdi3;
+	__moddi3;
+	__qdivrem;
+	__ucmpdi2;
+	__udivdi3;
+	__umoddi3;
+#elif defined(__arm__)
+	__adddi3;
+	__anddi3;
+	__floatunsdidf;
+	__iordi3;
+	__lshldi3;
+	__one_cmpldi2;
+	__qdivrem;
+	__subdi3;
+	__xordi3;
+#else
 	__adddi3;
 	__anddi3;
-#ifndef __arm__
 	__ashldi3;
 	__ashrdi3;
-#endif
-#endif
-#ifndef __arm__
 	__cmpdi2;
 	__divdi3;
-#endif
-#ifndef __i386__
-#ifndef __arm__
 	__fixdfdi;
 	__fixsfdi;
 	__fixunsdfdi;
 	__fixunssfdi;
 	__floatdidf;
 	__floatdisf;
-#endif
 	__floatunsdidf;
 	__iordi3;
 	__lshldi3;
-#ifndef __arm__
 	__lshrdi3;
-#endif
-#endif
-#ifndef __arm__
 	__moddi3;
-#endif
-#ifndef __i386__
-#ifndef __arm__
 	__muldi3;
 	__negdi2;
-#endif
 	__one_cmpldi2;
-#endif
 	__qdivrem;
-#ifndef __i386__
 	__subdi3;
-#endif
-#ifndef __arm__
 	__ucmpdi2;
 	__udivdi3;
 	__umoddi3;
-#endif
-#ifndef __i386__
 	__xordi3;
-#endif
 };