Module Name: src
Committed By: matt
Date: Tue Apr 16 10:54:53 UTC 2013
Modified Files:
src/lib/libc/softfloat: Makefile.inc softfloat-for-gcc.h
Log Message:
ARM EABI needs different floating point comparision functions.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/softfloat/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/softfloat/softfloat-for-gcc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.12 src/lib/libc/softfloat/Makefile.inc:1.13
--- src/lib/libc/softfloat/Makefile.inc:1.12 Fri Nov 16 12:38:09 2012
+++ src/lib/libc/softfloat/Makefile.inc Tue Apr 16 10:54:53 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2012/11/16 12:38:09 he Exp $
+# $NetBSD: Makefile.inc,v 1.13 2013/04/16 10:54:53 matt Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@@ -12,10 +12,19 @@ SRCS.softfloat= softfloat.c
SRCS.softfloat+=fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c \
fpgetsticky.c fpsetsticky.c
+.if ${MACHINE:Mearm*} != ""
+SRCS.softfloat+=__aeabi_dcmpeq.c __aeabi_fcmpeq.c
+SRCS.softfloat+=__aeabi_dcmpge.c __aeabi_fcmpge.c
+SRCS.softfloat+=__aeabi_dcmpgt.c __aeabi_fcmpgt.c
+SRCS.softfloat+=__aeabi_dcmple.c __aeabi_fcmple.c
+SRCS.softfloat+=__aeabi_dcmplt.c __aeabi_fcmplt.c
+SRCS.softfloat+=__aeabi_dcmpun.c __aeabi_fcmpun.c
+.else
SRCS.softfloat+=eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \
eqdf2.c nedf2.c gtdf2.c gedf2.c ltdf2.c ledf2.c negdf2.c \
eqtf2.c netf2.c gttf2.c getf2.c lttf2.c letf2.c negtf2.c \
nexf2.c gtxf2.c gexf2.c negxf2.c unordsf2.c unorddf2.c
+.endif
SRCS+= ${SRCS.softfloat}
Index: src/lib/libc/softfloat/softfloat-for-gcc.h
diff -u src/lib/libc/softfloat/softfloat-for-gcc.h:1.9 src/lib/libc/softfloat/softfloat-for-gcc.h:1.10
--- src/lib/libc/softfloat/softfloat-for-gcc.h:1.9 Sun Aug 5 04:27:42 2012
+++ src/lib/libc/softfloat/softfloat-for-gcc.h Tue Apr 16 10:54:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: softfloat-for-gcc.h,v 1.9 2012/08/05 04:27:42 matt Exp $ */
+/* $NetBSD: softfloat-for-gcc.h,v 1.10 2013/04/16 10:54:53 matt Exp $ */
/*
* Move private identifiers with external linkage into implementation
@@ -208,19 +208,4 @@
#define __extendsfdf2 __aeabi_f2d
#define __truncdfsf2 __aeabi_d2f
-#define __eqsf2 __aeabi_fcmpeq
-#define __eqdf2 __aeabi_dcmpeq
-
-#define __ltsf2 __aeabi_fcmplt
-#define __ltdf2 __aeabi_dcmplt
-
-#define __lesf2 __aeabi_fcmple
-#define __ledf2 __aeabi_dcmple
-
-#define __gtsf2 __aeabi_fcmpgt
-#define __gtdf2 __aeabi_dcmpgt
-
-#define __gesf2 __aeabi_fcmpge
-#define __gedf2 __aeabi_dcmpge
-
#endif /* __ARM_EABI__ */
