From 4886f3417970e84d491d134d9c5983582ed7ed18 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 17 Nov 2014 09:20:02 -0800 Subject: 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. --- sysdeps/alpha/soft-fp/ots_cmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sysdeps/alpha/soft-fp/ots_cmp.c') diff --git a/sysdeps/alpha/soft-fp/ots_cmp.c b/sysdeps/alpha/soft-fp/ots_cmp.c index c28aa4f608..a441a92d3b 100644 --- a/sysdeps/alpha/soft-fp/ots_cmp.c +++ b/sysdeps/alpha/soft-fp/ots_cmp.c @@ -27,8 +27,8 @@ internal_equality (long al, long ah, long bl, long bh, long neq) FP_DECL_Q(A); FP_DECL_Q(B); long r; - FP_UNPACK_RAW_Q(A, a); - FP_UNPACK_RAW_Q(B, b); + AXP_UNPACK_RAW_Q(A, a); + AXP_UNPACK_RAW_Q(B, b); if ((A_e == _FP_EXPMAX_Q && !_FP_FRAC_ZEROP_2(A)) || (B_e == _FP_EXPMAX_Q && !_FP_FRAC_ZEROP_2(B))) -- cgit 1.4.1