[PATCH] x86-64: fix UML build after adding CFI annotations to lib/rwsem_64.S

[PATCH] x86-64: fix UML build after adding CFI annotations to lib/rwsem_64.S

[Jan Beulich]

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Jeff Dike <jdike@addtoit.com>

---
 arch/um/Kconfig.x86     |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

--- 2.6.38-rc6/arch/um/Kconfig.x86
+++ 2.6.38-rc6-x86_64-cfi-annotate-rwsem-UML/arch/um/Kconfig.x86
@@ -19,6 +19,9 @@ config X86_32
 	def_bool !64BIT
 	select HAVE_AOUT
 
+config X86_64
+	def_bool 64BIT
+
 config RWSEM_XCHGADD_ALGORITHM
 	def_bool X86_XADD
 

[tip:x86/asm] um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S

[tip-bot for Jan Beulich]

Commit-ID:  bfc39061d3dbf812e6a78f9529a548e5f0050c64
Gitweb:     http://git.kernel.org/tip/bfc39061d3dbf812e6a78f9529a548e5f0050c64
Author:     Jan Beulich <JBeulich@novell.com>
AuthorDate: Tue, 1 Mar 2011 11:14:55 +0000
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 1 Mar 2011 12:19:44 +0100

um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S

arch/um/Kconfig.x86 has X86_32 but not X86_64 - that's resulting in
asm/dwarf2.h producing the 32-bit (pushl_cfi & Co) macros instead of
the 64-bit ones.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Jeff Dike <jdike@addtoit.com>
LKML-Reference: <4D6CE3400200007800034498@vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/um/Kconfig.x86 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86
index 5ee3280..62f2115 100644
--- a/arch/um/Kconfig.x86
+++ b/arch/um/Kconfig.x86
@@ -19,6 +19,9 @@ config X86_32
 	def_bool !64BIT
 	select HAVE_AOUT
 
+config X86_64
+	def_bool 64BIT
+
 config RWSEM_XCHGADD_ALGORITHM
 	def_bool X86_XADD
 

Re: [PATCH] x86-64: fix UML build after adding CFI annotations to lib/rwsem_64.S

[Stratos Psomadakis]

On 03/01/2011 01:14 PM, Jan Beulich wrote:
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
> Cc: Jeff Dike <jdike@addtoit.com>
>
> ---
>  arch/um/Kconfig.x86     |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
>
> --- 2.6.38-rc6/arch/um/Kconfig.x86
> +++ 2.6.38-rc6-x86_64-cfi-annotate-rwsem-UML/arch/um/Kconfig.x86
> @@ -19,6 +19,9 @@ config X86_32
>  	def_bool !64BIT
>  	select HAVE_AOUT
>  
> +config X86_64
> +	def_bool 64BIT
> +
>  config RWSEM_XCHGADD_ALGORITHM
>  	def_bool X86_XADD
>  
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml
tested it and works(build + boot).
i think that you could add "select HAVE_AOUT" to x86_64 too, or move it to
config UML_X86, to catch both configs.

-- 
Stratos Psomadakis
<psomas@ece.ntua.gr>