Sun Jan 27 02:42:32 2019 UTC ()
fix another mergeo


(dholland)
diff -r1.13 -r1.14 src/lib/libc/arch/m68k/gen/fabs.S
cvs diff -r1.13 -r1.14 src/lib/libc/arch/m68k/gen/fabs.S (expand / switch to unified diff)

--- src/lib/libc/arch/m68k/gen/fabs.S 2019/01/27 02:08:35 1.13
+++ src/lib/libc/arch/m68k/gen/fabs.S 2019/01/27 02:42:32 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: fabs.S,v 1.13 2019/01/27 02:08:35 pgoyette Exp $ */ 1/* $NetBSD: fabs.S,v 1.14 2019/01/27 02:42:32 dholland Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1996 The NetBSD Foundation, Inc. 4 * Copyright (c) 1996 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by  8 * by
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -22,31 +22,27 @@ @@ -22,31 +22,27 @@
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS  22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <machine/asm.h> 32#include <machine/asm.h>
33#include <machine/math.h> 33#include <machine/math.h>
34 34
35RCSID("$NetBSD: fabs.S,v 1.13 2019/01/27 02:08:35 pgoyette Exp $") 35RCSID("$NetBSD: fabs.S,v 1.14 2019/01/27 02:42:32 dholland Exp $")
36 
37#ifndef __HAVE_LONG_DOUBLE 
38STRONG_ALIAS(fabsl, fabs) 
39#endif 
40 36
41#ifndef __HAVE_LONG_DOUBLE 37#ifndef __HAVE_LONG_DOUBLE
42STRONG_ALIAS(fabsl, fabs) 38STRONG_ALIAS(fabsl, fabs)
43#endif 39#endif
44 40
45ENTRY(fabs) 41ENTRY(fabs)
46#if defined(__SVR4_ABI__) && defined(__HAVE_FPU__) 42#if defined(__SVR4_ABI__) && defined(__HAVE_FPU__)
47 bclr #31,4(%sp) 43 bclr #31,4(%sp)
48 fmoved 4(%sp),%fp0 44 fmoved 4(%sp),%fp0
49#else 45#else
50 movl 4(%sp),%d0 46 movl 4(%sp),%d0
51 movl 8(%sp),%d1 47 movl 8(%sp),%d1
52 bclr #31,%d0 48 bclr #31,%d0