Pull up following revision(s) (requested by joerg in ticket #808): lib/libm/arch/alpha/s_copysign.S: revision 1.6 lib/libm/arch/alpha/s_copysign.S: revision 1.7 lib/libm/arch/m68k/s_copysign.S: revision 1.8 lib/libm/arch/m68k/s_copysign.S: revision 1.9 - Add copysignl aliases. - It's copysign, not _copysign.diff -r1.5 -r1.5.40.1 src/lib/libm/arch/alpha/s_copysign.S
(msaitoh)
--- src/lib/libm/arch/alpha/s_copysign.S 2008/04/28 20:23:01 1.5
+++ src/lib/libm/arch/alpha/s_copysign.S 2015/05/27 09:22:56 1.5.40.1
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: s_copysign.S,v 1.5 2008/04/28 20:23:01 martin Exp $ */ | 1 | /* $NetBSD: s_copysign.S,v 1.5.40.1 2015/05/27 09:22:56 msaitoh 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 J.T. Conklin. | 8 | * by J.T. Conklin. | |
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. | |
@@ -21,17 +21,20 @@ | @@ -21,17 +21,20 @@ | |||
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
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 | 33 | |||
34 | STRONG_ALIAS(_copysignl, copysign) | |||
35 | WEAK_ALIAS(copysignl, _copysignl) | |||
36 | ||||
34 | LEAF(copysign, 2) | 37 | LEAF(copysign, 2) | |
35 | cpys fa1, fa0, fv0 | 38 | cpys fa1, fa0, fv0 | |
36 | RET | 39 | RET | |
37 | END(copysign) | 40 | END(copysign) |
--- src/lib/libm/arch/m68k/s_copysign.S 2003/08/07 16:44:41 1.7
+++ src/lib/libm/arch/m68k/s_copysign.S 2015/05/27 09:22:56 1.7.74.1
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: s_copysign.S,v 1.7 2003/08/07 16:44:41 agc Exp $ */ | 1 | /* $NetBSD: s_copysign.S,v 1.7.74.1 2015/05/27 09:22:56 msaitoh Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 1990 The Regents of the University of California. | 4 | * Copyright (c) 1990 The Regents of the University of California. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to Berkeley by | 7 | * This code is derived from software contributed to Berkeley by | |
8 | * the Systems Programming Group of the University of Utah Computer | 8 | * the Systems Programming Group of the University of Utah Computer | |
9 | * Science Department. | 9 | * Science Department. | |
10 | * | 10 | * | |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without | |
12 | * modification, are permitted provided that the following conditions | 12 | * modification, are permitted provided that the following conditions | |
13 | * are met: | 13 | * are met: | |
14 | * 1. Redistributions of source code must retain the above copyright | 14 | * 1. Redistributions of source code must retain the above copyright | |
@@ -28,27 +28,30 @@ | @@ -28,27 +28,30 @@ | |||
28 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | 28 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
29 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 29 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
30 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 30 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
31 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 31 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
32 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 32 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
33 | * SUCH DAMAGE. | 33 | * SUCH DAMAGE. | |
34 | */ | 34 | */ | |
35 | 35 | |||
36 | #include <machine/asm.h> | 36 | #include <machine/asm.h> | |
37 | 37 | |||
38 | ;_sccsid: | 38 | ;_sccsid: | |
39 | ;.asciz "from: @(#)support.s 5.2 (Berkeley) 5/17/90" | 39 | ;.asciz "from: @(#)support.s 5.2 (Berkeley) 5/17/90" | |
40 | 40 | |||
41 | RCSID("$NetBSD: s_copysign.S,v 1.7 2003/08/07 16:44:41 agc Exp $") | 41 | RCSID("$NetBSD: s_copysign.S,v 1.7.74.1 2015/05/27 09:22:56 msaitoh Exp $") | |
42 | ||||
43 | STRONG_ALIAS(_copysignl, copysign) | |||
44 | WEAK_ALIAS(copysignl, _copysignl) | |||
42 | 45 | |||
43 | | copysign(x,y) | 46 | | copysign(x,y) | |
44 | | returns x with the sign of y. | 47 | | returns x with the sign of y. | |
45 | ENTRY(copysign) | 48 | ENTRY(copysign) | |
46 | #ifdef __SVR4_ABI__ | 49 | #ifdef __SVR4_ABI__ | |
47 | tstw %sp@(12) | 50 | tstw %sp@(12) | |
48 | jmi Lneg | 51 | jmi Lneg | |
49 | bclr #31,%sp@(4) | 52 | bclr #31,%sp@(4) | |
50 | fmoved %sp@(4),%fp0 | 53 | fmoved %sp@(4),%fp0 | |
51 | rts | 54 | rts | |
52 | Lneg: | 55 | Lneg: | |
53 | bset #31,%sp@(4) | 56 | bset #31,%sp@(4) | |
54 | fmoved %sp@(4),%fp0 | 57 | fmoved %sp@(4),%fp0 |