svn commit: r231065 - in projects/arm_eabi/lib/libc/arm: . gen

[Andrew Turner]

Author: andrew
Date: Mon Feb  6 08:46:00 2012
New Revision: 231065
URL: http://svn.freebsd.org/changeset/base/231065

Log:
  * Move the old symbols moved to compiler-rt out of the ARM Symbol.map to an
    OABI map file.
  * Stop compiling divsi3.S as it provides symbols we have in compiler-rt

Added:
  projects/arm_eabi/lib/libc/arm/Symbol_oabi.map
Modified:
  projects/arm_eabi/lib/libc/arm/Makefile.inc
  projects/arm_eabi/lib/libc/arm/Symbol.map
  projects/arm_eabi/lib/libc/arm/gen/Makefile.inc

Modified: projects/arm_eabi/lib/libc/arm/Makefile.inc
==============================================================================
--- projects/arm_eabi/lib/libc/arm/Makefile.inc	Mon Feb  6 08:40:34 2012	(r231064)
+++ projects/arm_eabi/lib/libc/arm/Makefile.inc	Mon Feb  6 08:46:00 2012	(r231065)
@@ -8,3 +8,6 @@ SOFTFLOAT_BITS=32
 # Long double is just double precision.
 MDSRCS+=machdep_ldisd.c
 SYM_MAPS+=${.CURDIR}/arm/Symbol.map
+
+# This contains the symbols that were removed when moving to the ARM EABI
+#SYM_MAPS+=${.CURDIR}/arm/Symbol_oabi.map

Modified: projects/arm_eabi/lib/libc/arm/Symbol.map
==============================================================================
--- projects/arm_eabi/lib/libc/arm/Symbol.map	Mon Feb  6 08:40:34 2012	(r231064)
+++ projects/arm_eabi/lib/libc/arm/Symbol.map	Mon Feb  6 08:46:00 2012	(r231065)
@@ -41,10 +41,6 @@ FBSDprivate_1.0 {
 
 	_set_tp;
 	___longjmp;
-	__umodsi3;
-	__modsi3;
-	__udivsi3;
-	__divsi3;
 	__makecontext;
 	__longjmp;
 	signalcontext;
@@ -57,22 +53,4 @@ FBSDprivate_1.0 {
 	curbrk;
 	minbrk;
 	_sbrk;
-
-	/* softfloat */
-	__addsf3;
-	__adddf3;
-	__subsf3;
-	__subdf3;
-	__mulsf3;
-	__muldf3;
-	__divsf3;
-	__divdf3;
-	__floatsisf;
-	__floatsidf;
-	__fixsfsi;
-	__fixdfsi;
-	__fixunssfsi;
-	__fixunsdfsi;
-	__extendsfdf2;
-	__truncdfsf2;
 };

Added: projects/arm_eabi/lib/libc/arm/Symbol_oabi.map
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arm_eabi/lib/libc/arm/Symbol_oabi.map	Mon Feb  6 08:46:00 2012	(r231065)
@@ -0,0 +1,34 @@
+/*
+ * $FreeBSD: projects/arm_eabi/lib/libc/arm/Symbol.map 228591 2011-12-16 19:38:31Z andrew $
+ */
+
+/*
+ * This only needs to contain symbols that are not listed in
+ * symbol maps from other parts of libc (i.e., not found in
+ * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...)
+ * and are not used in the ARM EABI.
+ */
+FBSDprivate_1.0 {
+	__umodsi3;
+	__modsi3;
+	__udivsi3;
+	__divsi3;
+
+	/* softfloat */
+	__addsf3;
+	__adddf3;
+	__subsf3;
+	__subdf3;
+	__mulsf3;
+	__muldf3;
+	__divsf3;
+	__divdf3;
+	__floatsisf;
+	__floatsidf;
+	__fixsfsi;
+	__fixdfsi;
+	__fixunssfsi;
+	__fixunsdfsi;
+	__extendsfdf2;
+	__truncdfsf2;
+};

Modified: projects/arm_eabi/lib/libc/arm/gen/Makefile.inc
==============================================================================
--- projects/arm_eabi/lib/libc/arm/gen/Makefile.inc	Mon Feb  6 08:40:34 2012	(r231064)
+++ projects/arm_eabi/lib/libc/arm/gen/Makefile.inc	Mon Feb  6 08:46:00 2012	(r231065)
@@ -3,4 +3,7 @@
 
 SRCS+=	_ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \
 	infinity.c ldexp.c makecontext.c \
-	setjmp.S signalcontext.c sigsetjmp.S divsi3.S
+	setjmp.S signalcontext.c sigsetjmp.S
+
+#SRCS+=	divsi3.S
+