x86/vdso: Define BUILD_VDSO while building and emit .eh_frame in asm

For the vDSO, user code wants runtime unwind info.  Make sure
that, if we use .cfi directives, we generate it.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/16e29ad8855e6508197000d8c41f56adb00d7580.1444091584.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 10 insertions, 3 deletions

diff --git a/arch/x86/include/asm/dwarf2.h b/arch/x86/include/asm/dwarf2.h
index de1cdaf4d743..09133ba032b3 100644
--- a/arch/x86/include/asm/dwarf2.h
+++ b/arch/x86/include/asm/dwarf2.h
@@ -36,15 +36,22 @@
 #endif
 
 #if defined(CONFIG_AS_CFI_SECTIONS) && defined(__ASSEMBLY__)
+#ifndef BUILD_VDSO
         /*
          * Emit CFI data in .debug_frame sections, not .eh_frame sections.
          * The latter we currently just discard since we don't do DWARF
          * unwinding at runtime.  So only the offline DWARF information is
-         * useful to anyone.  Note we should not use this directive if this
-         * file is used in the vDSO assembly, or if vmlinux.lds.S gets
-         * changed so it doesn't discard .eh_frame.
+         * useful to anyone.  Note we should not use this directive if
+         * vmlinux.lds.S gets changed so it doesn't discard .eh_frame.
          */
         .cfi_sections .debug_frame
+#else
+         /*
+          * For the vDSO, emit both runtime unwind information and debug
+          * symbols for the .dbg file.
+          */
+        .cfi_sections .eh_frame, .debug_frame
+#endif
 #endif
 
 #else