alpha: Fix soft-fp breakage
commit4886f3417970e84d491d134d9c5983582ed7ed18
authorRichard Henderson <rth@twiddle.net>
Mon, 17 Nov 2014 17:20:02 +0000 (17 09:20 -0800)
committerRichard Henderson <rth@twiddle.net>
Mon, 17 Nov 2014 17:20:02 +0000 (17 09:20 -0800)
treea82f32dbc63a2df215a982a972aab7a00ffc54f7
parent0781a7772ae1385fe8d7a734fdb35df81b1e6590
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.
14 files changed:
ChangeLog
sysdeps/alpha/soft-fp/local-soft-fp.h
sysdeps/alpha/soft-fp/ots_add.c
sysdeps/alpha/soft-fp/ots_cmp.c
sysdeps/alpha/soft-fp/ots_cmpe.c
sysdeps/alpha/soft-fp/ots_cvtqux.c
sysdeps/alpha/soft-fp/ots_cvtqx.c
sysdeps/alpha/soft-fp/ots_cvttx.c
sysdeps/alpha/soft-fp/ots_cvtxq.c
sysdeps/alpha/soft-fp/ots_cvtxt.c
sysdeps/alpha/soft-fp/ots_div.c
sysdeps/alpha/soft-fp/ots_mul.c
sysdeps/alpha/soft-fp/ots_nintxq.c
sysdeps/alpha/soft-fp/ots_sub.c