[PATCH 02/16] x86: remove unneeded defined(__ASSEMBLY__) check from asm/dwarf2.h

0 views
Skip to first unread message

Masahiro Yamada

unread,
Mar 24, 2020, 4:49:37 AM3/24/20
to linux-...@vger.kernel.org, David S . Miller, Linus Torvalds, Kees Cook, clang-bu...@googlegroups.com, Herbert Xu, linux-...@vger.kernel.org, Ingo Molnar, Thomas Gleixner, Borislav Petkov, Peter Zijlstra, H . Peter Anvin, x...@kernel.org, linux-...@vger.kernel.org, Masahiro Yamada
This header file has the following check at the top:

#ifndef __ASSEMBLY__
#warning "asm/dwarf2.h should be only included in pure assembly files"
#endif

So, we expect defined(__ASSEMBLY__) is always true.

Signed-off-by: Masahiro Yamada <masa...@kernel.org>
Acked-by: Jason A. Donenfeld <Ja...@zx2c4.com>
---

arch/x86/include/asm/dwarf2.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/dwarf2.h b/arch/x86/include/asm/dwarf2.h
index ae391f609840..5a0502212bc5 100644
--- a/arch/x86/include/asm/dwarf2.h
+++ b/arch/x86/include/asm/dwarf2.h
@@ -36,7 +36,7 @@
#define CFI_SIGNAL_FRAME
#endif

-#if defined(CONFIG_AS_CFI_SECTIONS) && defined(__ASSEMBLY__)
+#if defined(CONFIG_AS_CFI_SECTIONS)
#ifndef BUILD_VDSO
/*
* Emit CFI data in .debug_frame sections, not .eh_frame sections.
--
2.17.1

Nick Desaulniers

unread,
Mar 24, 2020, 12:43:38 PM3/24/20
to Masahiro Yamada, LKML, David S . Miller, Linus Torvalds, Kees Cook, clang-built-linux, Herbert Xu, open list:HARDWARE RANDOM NUMBER GENERATOR CORE, Ingo Molnar, Thomas Gleixner, Borislav Petkov, Peter Zijlstra, H . Peter Anvin, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT), Linux Kbuild mailing list
On Tue, Mar 24, 2020 at 1:49 AM Masahiro Yamada <masa...@kernel.org> wrote:
>
> This header file has the following check at the top:
>
> #ifndef __ASSEMBLY__
> #warning "asm/dwarf2.h should be only included in pure assembly files"
> #endif
>
> So, we expect defined(__ASSEMBLY__) is always true.
>
> Signed-off-by: Masahiro Yamada <masa...@kernel.org>
> Acked-by: Jason A. Donenfeld <Ja...@zx2c4.com>

Reviewed-by: Nick Desaulniers <ndesau...@google.com>

> ---
>
> arch/x86/include/asm/dwarf2.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/dwarf2.h b/arch/x86/include/asm/dwarf2.h
> index ae391f609840..5a0502212bc5 100644
> --- a/arch/x86/include/asm/dwarf2.h
> +++ b/arch/x86/include/asm/dwarf2.h
> @@ -36,7 +36,7 @@
> #define CFI_SIGNAL_FRAME
> #endif
>
> -#if defined(CONFIG_AS_CFI_SECTIONS) && defined(__ASSEMBLY__)
> +#if defined(CONFIG_AS_CFI_SECTIONS)
> #ifndef BUILD_VDSO
> /*
> * Emit CFI data in .debug_frame sections, not .eh_frame sections.
> --
> 2.17.1
>
> --
> You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to clang-built-li...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20200324084821.29944-3-masahiroy%40kernel.org.



--
Thanks,
~Nick Desaulniers

Masahiro Yamada

unread,
Mar 26, 2020, 4:02:20 AM3/26/20
to linux-...@vger.kernel.org, Thomas Gleixner, Nick Desaulniers, Borislav Petkov, Peter Zijlstra, H . Peter Anvin, x...@kernel.org, Jason A . Donenfeld, clang-bu...@googlegroups.com, Masahiro Yamada, Ingo Molnar, linux-...@vger.kernel.org
This header file has the following check at the top:

#ifndef __ASSEMBLY__
#warning "asm/dwarf2.h should be only included in pure assembly files"
#endif

So, we expect defined(__ASSEMBLY__) is always true.

Signed-off-by: Masahiro Yamada <masa...@kernel.org>
Acked-by: Jason A. Donenfeld <Ja...@zx2c4.com>
Reviewed-by: Nick Desaulniers <ndesau...@google.com>
---

Changes in v2: None
Reply all
Reply to author
Forward
0 new messages