Commit-ID:  af79ded44b7c5eee46b433a9269fcf899372225b
Gitweb:     http://git.kernel.org/tip/af79ded44b7c5eee46b433a9269fcf899372225b
Author:     Josh Poimboeuf <jpoim...@redhat.com>
AuthorDate: Mon, 7 Aug 2017 09:38:05 -0500
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Thu, 10 Aug 2017 14:16:19 +0200

x86/asm: Fix UNWIND_HINT_REGS macro for older binutils

Apparently the binutils 2.20 assembler can't handle the '&&' operator in
the UNWIND_HINT_REGS macro.  Rearrange the macro to do without it.

This fixes the following error:

  arch/x86/entry/entry_64.S: Assembler messages:
  arch/x86/entry/entry_64.S:521: Error: non-constant expression in ".if" 
statement
  arch/x86/entry/entry_64.S:521: Error: non-constant expression in ".if" 
statement
  arch/x86/entry/entry_64.S:521: Error: non-constant expression in ".if" 
statement
  arch/x86/entry/entry_64.S:521: Error: non-constant expression in ".if" 
statement
  arch/x86/entry/entry_64.S:521: Error: non-constant expression in ".if" 
statement
  arch/x86/entry/entry_64.S:521: Error: non-constant expression in ".if" 
statement
  arch/x86/entry/entry_64.S:521: Error: non-constant expression in ".if" 
statement
  arch/x86/entry/entry_64.S:521: Error: non-constant expression in ".if" 
statement
  arch/x86/entry/entry_64.S:521: Error: non-constant expression in ".if" 
statement

Reported-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Josh Poimboeuf <jpoim...@redhat.com>
Cc: Andy Lutomirski <l...@kernel.org>
Cc: Borislav Petkov <b...@alien8.de>
Cc: Brian Gerst <brge...@gmail.com>
Cc: Denys Vlasenko <dvlas...@redhat.com>
Cc: H. Peter Anvin <h...@zytor.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Fixes: 39358a033b2e ("objtool, x86: Add facility for asm code to provide unwind 
hints")
Link: 
http://lkml.kernel.org/r/e2ad97c1ae49a484644b4aaa4dd3faa4d6d969b2.1502116651.git.jpoim...@redhat.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 arch/x86/include/asm/unwind_hints.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/unwind_hints.h 
b/arch/x86/include/asm/unwind_hints.h
index 5e02b11..bae46fc 100644
--- a/arch/x86/include/asm/unwind_hints.h
+++ b/arch/x86/include/asm/unwind_hints.h
@@ -44,10 +44,12 @@
 .endm
 
 .macro UNWIND_HINT_REGS base=%rsp offset=0 indirect=0 extra=1 iret=0
-       .if \base == %rsp && \indirect
-               .set sp_reg, ORC_REG_SP_INDIRECT
-       .elseif \base == %rsp
-               .set sp_reg, ORC_REG_SP
+       .if \base == %rsp
+               .if \indirect
+                       .set sp_reg, ORC_REG_SP_INDIRECT
+               .else
+                       .set sp_reg, ORC_REG_SP
+               .endif
        .elseif \base == %rbp
                .set sp_reg, ORC_REG_BP
        .elseif \base == %rdi

Reply via email to