[src/trunk]: src/lib/libc/quad Adapt to earm hard float by including softfloa...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fd6c51810d15
branches:  trunk
changeset: 784588:fd6c51810d15
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Feb 03 01:48:53 2013 +0000

description:
Adapt to earm hard float by including softfloat-for-gcc.h even if __ARM_EABI__
so we can get the __aeabi aliases.

diffstat:

 lib/libc/quad/Makefile.inc  |  18 ++++++++++++------
 lib/libc/quad/fixdfdi.c     |   6 +++---
 lib/libc/quad/fixsfdi.c     |   6 +++---
 lib/libc/quad/fixunsdfdi.c  |   6 +++---
 lib/libc/quad/fixunssfdi.c  |   6 +++---
 lib/libc/quad/floatdidf.c   |   6 +++---
 lib/libc/quad/floatdisf.c   |   6 +++---
 lib/libc/quad/floatundidf.c |   6 +++---
 lib/libc/quad/floatundisf.c |   6 +++---
 9 files changed, 36 insertions(+), 30 deletions(-)

diffs (217 lines):

diff -r 87dd17269196 -r fd6c51810d15 lib/libc/quad/Makefile.inc
--- a/lib/libc/quad/Makefile.inc        Sun Feb 03 00:43:14 2013 +0000
+++ b/lib/libc/quad/Makefile.inc        Sun Feb 03 01:48:53 2013 +0000
@@ -1,17 +1,23 @@
-#      $NetBSD: Makefile.inc,v 1.14 2012/08/06 08:17:58 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.15 2013/02/03 01:48:53 matt Exp $
 #      @(#)Makefile.inc        8.1 (Berkeley) 6/4/93
 
 # Quad support
-SRCS.quad=     cmpdi2.c divdi3.c fixdfdi.c fixsfdi.c fixunsdfdi.c \
-       fixunssfdi.c floatdidf.c floatdisf.c floatundisf.c floatundidf.c \
-       moddi3.c muldi3.c negdi2.c qdivrem.c \
-       ucmpdi2.c udivdi3.c umoddi3.c 
+SRCS.quad=     cmpdi2.c ucmpdi2.c 
+SRCS.quad+=    divdi3.c moddi3.c 
+SRCS.quad+=    fixdfdi.c fixsfdi.c
+SRCS.quad+=    fixunsdfdi.c fixunssfdi.c
+SRCS.quad+=    floatdidf.c floatdisf.c
+SRCS.quad+=    floatundisf.c floatundidf.c
+SRCS.quad+=    muldi3.c
+SRCS.quad+=    negdi2.c
+SRCS.quad+=    qdivrem.c
+SRCS.quad+=    udivdi3.c umoddi3.c 
 
 .if   (${MACHINE_ARCH} == "m68k")
 SRCS.quad+=    ashldi3.S ashrdi3.S lshrdi3.S
 .elif (${MACHINE_ARCH} == "m68000")
 SRCS.quad+=    ashldi3.S lshrdi3.S
-.elif (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb")
+.elif (${MACHINE_ARCH:Mearm*} != "")
 SRCS.quad+=    ashrdi3.c lshldi3.c lshrdi3.c
 .else
 SRCS.quad+=    ashldi3.c ashrdi3.c lshrdi3.c
diff -r 87dd17269196 -r fd6c51810d15 lib/libc/quad/fixdfdi.c
--- a/lib/libc/quad/fixdfdi.c   Sun Feb 03 00:43:14 2013 +0000
+++ b/lib/libc/quad/fixdfdi.c   Sun Feb 03 01:48:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fixdfdi.c,v 1.6 2012/08/05 04:28:58 matt Exp $ */
+/*     $NetBSD: fixdfdi.c,v 1.7 2013/02/03 01:48:53 matt Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -38,11 +38,11 @@
 #if 0
 static char sccsid[] = "@(#)fixdfdi.c  8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: fixdfdi.c,v 1.6 2012/08/05 04:28:58 matt Exp $");
+__RCSID("$NetBSD: fixdfdi.c,v 1.7 2013/02/03 01:48:53 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef SOFTFLOAT
+#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
 #include "softfloat/softfloat-for-gcc.h"
 #endif
 
diff -r 87dd17269196 -r fd6c51810d15 lib/libc/quad/fixsfdi.c
--- a/lib/libc/quad/fixsfdi.c   Sun Feb 03 00:43:14 2013 +0000
+++ b/lib/libc/quad/fixsfdi.c   Sun Feb 03 01:48:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fixsfdi.c,v 1.5 2012/08/05 04:28:58 matt Exp $ */
+/*     $NetBSD: fixsfdi.c,v 1.6 2013/02/03 01:48:53 matt Exp $ */
 
 /*-
  * Copyright (c) 1992 The Regents of the University of California.
@@ -38,11 +38,11 @@
 #if 0
 static char sccsid[] = "@(#)fixsfdi.c  5.1 (Berkeley) 7/7/92";
 #else
-__RCSID("$NetBSD: fixsfdi.c,v 1.5 2012/08/05 04:28:58 matt Exp $");
+__RCSID("$NetBSD: fixsfdi.c,v 1.6 2013/02/03 01:48:53 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef SOFTFLOAT
+#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
 #include "softfloat/softfloat-for-gcc.h"
 #endif
 
diff -r 87dd17269196 -r fd6c51810d15 lib/libc/quad/fixunsdfdi.c
--- a/lib/libc/quad/fixunsdfdi.c        Sun Feb 03 00:43:14 2013 +0000
+++ b/lib/libc/quad/fixunsdfdi.c        Sun Feb 03 01:48:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fixunsdfdi.c,v 1.10 2012/08/05 04:28:58 matt Exp $     */
+/*     $NetBSD: fixunsdfdi.c,v 1.11 2013/02/03 01:48:53 matt Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -38,11 +38,11 @@
 #if 0
 static char sccsid[] = "@(#)fixunsdfdi.c       8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: fixunsdfdi.c,v 1.10 2012/08/05 04:28:58 matt Exp $");
+__RCSID("$NetBSD: fixunsdfdi.c,v 1.11 2013/02/03 01:48:53 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef SOFTFLOAT
+#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
 #include "softfloat/softfloat-for-gcc.h"
 #endif
 
diff -r 87dd17269196 -r fd6c51810d15 lib/libc/quad/fixunssfdi.c
--- a/lib/libc/quad/fixunssfdi.c        Sun Feb 03 00:43:14 2013 +0000
+++ b/lib/libc/quad/fixunssfdi.c        Sun Feb 03 01:48:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fixunssfdi.c,v 1.8 2012/08/05 04:28:58 matt Exp $      */
+/*     $NetBSD: fixunssfdi.c,v 1.9 2013/02/03 01:48:53 matt Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -38,11 +38,11 @@
 #if 0
 static char sccsid[] = "@(#)fixunssfdi.c       8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: fixunssfdi.c,v 1.8 2012/08/05 04:28:58 matt Exp $");
+__RCSID("$NetBSD: fixunssfdi.c,v 1.9 2013/02/03 01:48:53 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef SOFTFLOAT
+#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
 #include "softfloat/softfloat-for-gcc.h"
 #endif
 
diff -r 87dd17269196 -r fd6c51810d15 lib/libc/quad/floatdidf.c
--- a/lib/libc/quad/floatdidf.c Sun Feb 03 00:43:14 2013 +0000
+++ b/lib/libc/quad/floatdidf.c Sun Feb 03 01:48:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: floatdidf.c,v 1.9 2012/08/05 04:28:58 matt Exp $       */
+/*     $NetBSD: floatdidf.c,v 1.10 2013/02/03 01:48:53 matt Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -38,11 +38,11 @@
 #if 0
 static char sccsid[] = "@(#)floatdidf.c        8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: floatdidf.c,v 1.9 2012/08/05 04:28:58 matt Exp $");
+__RCSID("$NetBSD: floatdidf.c,v 1.10 2013/02/03 01:48:53 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef SOFTFLOAT
+#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
 #include "softfloat/softfloat-for-gcc.h"
 #endif
 
diff -r 87dd17269196 -r fd6c51810d15 lib/libc/quad/floatdisf.c
--- a/lib/libc/quad/floatdisf.c Sun Feb 03 00:43:14 2013 +0000
+++ b/lib/libc/quad/floatdisf.c Sun Feb 03 01:48:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: floatdisf.c,v 1.9 2012/08/05 04:28:58 matt Exp $       */
+/*     $NetBSD: floatdisf.c,v 1.10 2013/02/03 01:48:53 matt Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -38,11 +38,11 @@
 #if 0
 static char sccsid[] = "@(#)floatdisf.c        8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: floatdisf.c,v 1.9 2012/08/05 04:28:58 matt Exp $");
+__RCSID("$NetBSD: floatdisf.c,v 1.10 2013/02/03 01:48:53 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef SOFTFLOAT
+#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
 #include "softfloat/softfloat-for-gcc.h"
 #endif
 
diff -r 87dd17269196 -r fd6c51810d15 lib/libc/quad/floatundidf.c
--- a/lib/libc/quad/floatundidf.c       Sun Feb 03 00:43:14 2013 +0000
+++ b/lib/libc/quad/floatundidf.c       Sun Feb 03 01:48:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: floatundidf.c,v 1.3 2012/08/05 04:28:58 matt Exp $     */
+/*     $NetBSD: floatundidf.c,v 1.4 2013/02/03 01:48:53 matt Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -38,11 +38,11 @@
 #if 0
 static char sccsid[] = "@(#)floatunsdidf.c     8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: floatundidf.c,v 1.3 2012/08/05 04:28:58 matt Exp $");
+__RCSID("$NetBSD: floatundidf.c,v 1.4 2013/02/03 01:48:53 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef SOFTFLOAT
+#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
 #include "softfloat/softfloat-for-gcc.h"
 #endif
 
diff -r 87dd17269196 -r fd6c51810d15 lib/libc/quad/floatundisf.c
--- a/lib/libc/quad/floatundisf.c       Sun Feb 03 00:43:14 2013 +0000
+++ b/lib/libc/quad/floatundisf.c       Sun Feb 03 01:48:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: floatundisf.c,v 1.3 2012/08/05 04:28:58 matt Exp $     */
+/*     $NetBSD: floatundisf.c,v 1.4 2013/02/03 01:48:53 matt Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -38,11 +38,11 @@
 #if 0
 static char sccsid[] = "@(#)floatdisf.c        8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: floatundisf.c,v 1.3 2012/08/05 04:28:58 matt Exp $");
+__RCSID("$NetBSD: floatundisf.c,v 1.4 2013/02/03 01:48:53 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef SOFTFLOAT
+#if defined(SOFTFLOAT) || defined(__ARM_EABI__)
 #include "softfloat/softfloat-for-gcc.h"
 #endif