diff options
| author | Richard Henderson <rth@twiddle.net> | 2014-11-17 09:20:02 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2014-11-17 09:20:02 -0800 |
| commit | 4886f3417970e84d491d134d9c5983582ed7ed18 (patch) | |
| tree | a82f32dbc63a2df215a982a972aab7a00ffc54f7 /sysdeps/alpha/soft-fp/ots_sub.c | |
| parent | 0781a7772ae1385fe8d7a734fdb35df81b1e6590 (diff) | |
| download | glibc-4886f3417970e84d491d134d9c5983582ed7ed18.zip glibc-4886f3417970e84d491d134d9c5983582ed7ed18.tar.gz glibc-4886f3417970e84d491d134d9c5983582ed7ed18.tar.bz2 | |
alpha: Fix soft-fp breakage
Commit 5c0508a318af0a6c8be2a4cb2e3b76896218bf35 broke the Alpha
port, as the extra parenthesis got in the way of some token pasting
that we were doing in a redefined raw unpack macro.
Avoid this situation in the future by not attempting to redefine a
basic macro, but rather work from the outermost public interface.
The compiler does in fact see through the added indirection.
* sysdeps/alpha/soft-fp/local-soft-fp.h (_FP_UNPACK_RAW_2): Remove.
(_FP_PACK_RAW_2): Remove.
(AXP_DECL_RETURN_Q): Rename from FP_DECL_RETURN, use _FP_UNION_Q.
(AXP_RETURN_Q): Rename from FP_RETURN, use _FP_UNION_Q.
(AXP_UNPACK_RAW_Q, AXP_UNPACK_SEMIRAW_Q, AXP_UNPACK_Q): New.
(AXP_PACK_RAW_Q, AXP_PACK_SEMIRAW_Q, AXP_PACK_Q): New.
* sysdeps/alpha/soft-fp/ots_add.c (_OtsAddX): Update to match.
* sysdeps/alpha/soft-fp/ots_cmp.c (internal_equality): Likewise.
* sysdeps/alpha/soft-fp/ots_cmpe.c (internal_compare): Likewise.
* sysdeps/alpha/soft-fp/ots_cvtqux.c (_OtsCvtQUX): Likewise.
* sysdeps/alpha/soft-fp/ots_cvtqx.c (_OtsCvtQX): Likewise.
* sysdeps/alpha/soft-fp/ots_cvttx.c (_OtsConvertFloatTX): Likewise.
* sysdeps/alpha/soft-fp/ots_cvtxq.c (_OtsCvtXQ): Likewise.
* sysdeps/alpha/soft-fp/ots_cvtxt.c (_OtsConvertFloatXT): Likewise.
* sysdeps/alpha/soft-fp/ots_div.c (_OtsDivX): Likewise.
* sysdeps/alpha/soft-fp/ots_mul.c (_OtsMulX): Likewise.
* sysdeps/alpha/soft-fp/ots_nintxq.c (_OtsNintXQ): Likewise.
* sysdeps/alpha/soft-fp/ots_sub.c (_OtsSubX): Likewise.
Diffstat (limited to 'sysdeps/alpha/soft-fp/ots_sub.c')
| -rw-r--r-- | sysdeps/alpha/soft-fp/ots_sub.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/alpha/soft-fp/ots_sub.c b/sysdeps/alpha/soft-fp/ots_sub.c index 6deb9d9..41938cf 100644 --- a/sysdeps/alpha/soft-fp/ots_sub.c +++ b/sysdeps/alpha/soft-fp/ots_sub.c @@ -25,14 +25,14 @@ _OtsSubX(long al, long ah, long bl, long bh, long _round) { FP_DECL_EX; FP_DECL_Q(A); FP_DECL_Q(B); FP_DECL_Q(C); - FP_DECL_RETURN(c); + AXP_DECL_RETURN_Q(c); FP_INIT_ROUNDMODE; - FP_UNPACK_SEMIRAW_Q(A, a); - FP_UNPACK_SEMIRAW_Q(B, b); + AXP_UNPACK_SEMIRAW_Q(A, a); + AXP_UNPACK_SEMIRAW_Q(B, b); FP_SUB_Q(C, A, B); - FP_PACK_SEMIRAW_Q(c, C); + AXP_PACK_SEMIRAW_Q(c, C); FP_HANDLE_EXCEPTIONS; - FP_RETURN(c); + AXP_RETURN_Q(c); } |