Skip to content

Commit 9aecda9

Browse files
rddunlapjcmvbkbc
authored andcommitted
xtensa: umulsidi3: fix conditional expression
Even when a variant has one or more of these defines set to 1, the multiplier code paths are not used. Change the expression so that the correct code paths are used. arch/xtensa/lib/umulsidi3.S:44:38: warning: "XCHAL_NO_MUL" is not defined, evaluates to 0 [-Wundef] 44 | #if defined(__XTENSA_CALL0_ABI__) && XCHAL_NO_MUL arch/xtensa/lib/umulsidi3.S:145:38: warning: "XCHAL_NO_MUL" is not defined, evaluates to 0 [-Wundef] 145 | #if defined(__XTENSA_CALL0_ABI__) && XCHAL_NO_MUL arch/xtensa/lib/umulsidi3.S:159:5: warning: "XCHAL_NO_MUL" is not defined, evaluates to 0 [-Wundef] 159 | #if XCHAL_NO_MUL Fixes: 8939c58 ("xtensa: add __umulsidi3 helper") Signed-off-by: Randy Dunlap <[email protected]> Cc: Chris Zankel <[email protected]> Cc: Max Filippov <[email protected]> Message-Id: <[email protected]> Signed-off-by: Max Filippov <[email protected]>
1 parent 54d3d7d commit 9aecda9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

arch/xtensa/lib/umulsidi3.S

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
#include <asm/asmmacro.h>
44
#include <asm/core.h>
55

6-
#if !XCHAL_HAVE_MUL16 && !XCHAL_HAVE_MUL32 && !XCHAL_HAVE_MAC16
6+
#if XCHAL_HAVE_MUL16 || XCHAL_HAVE_MUL32 || XCHAL_HAVE_MAC16
7+
#define XCHAL_NO_MUL 0
8+
#else
79
#define XCHAL_NO_MUL 1
810
#endif
911

0 commit comments

Comments
 (0)