[gcc r12-3389] debug: Add BTF_WITH_CORE_DEBUG debug format

[gcc r12-3389] debug: Add BTF_WITH_CORE_DEBUG debug format

[Indu Bhagat]

https://gcc.gnu.org/g:053db9a49b00d422cd735bee4c0939b7ff07c40e

commit r12-3389-g053db9a49b00d422cd735bee4c0939b7ff07c40e
Author: Indu Bhagat <indu.bhagat@oracle.com>
Date:   Tue Sep 7 11:16:53 2021 -0700

    debug: Add BTF_WITH_CORE_DEBUG debug format
    
    To best handle BTF/CO-RE in GCC, a distinct BTF_WITH_CORE_DEBUG debug format is
    being added.  This helps the compiler detect whether BTF with CO-RE relocations
    needs to be emitted.
    
    gcc/ChangeLog:
    
            * flag-types.h (enum debug_info_type): Add new enum
            DINFO_TYPE_BTF_WITH_CORE.
            (BTF_WITH_CORE_DEBUG): New bitmask.
            * flags.h (btf_with_core_debuginfo_p): New declaration.
            * opts.c (btf_with_core_debuginfo_p): New definition.

Diff:
---
 gcc/flag-types.h | 6 +++++-
 gcc/flags.h      | 4 ++++
 gcc/opts.c       | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index 4fb1cb4743d..cc41b2ae103 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -31,7 +31,8 @@ enum debug_info_type
   DINFO_TYPE_VMS = 4,		  /* VMS debug info.  */
   DINFO_TYPE_CTF = 5,		  /* CTF debug info.  */
   DINFO_TYPE_BTF = 6,		  /* BTF debug info.  */
-  DINFO_TYPE_MAX = DINFO_TYPE_BTF /* Marker only.  */
+  DINFO_TYPE_BTF_WITH_CORE = 7,	  /* BTF debug info with CO-RE relocations.  */
+  DINFO_TYPE_MAX = DINFO_TYPE_BTF_WITH_CORE /* Marker only.  */
 };
 
 #define NO_DEBUG      (0U)
@@ -47,6 +48,9 @@ enum debug_info_type
 #define CTF_DEBUG     (1U << DINFO_TYPE_CTF)
 /* Write BTF debug info (using btfout.c).  */
 #define BTF_DEBUG     (1U << DINFO_TYPE_BTF)
+/* Write BTF debug info for BPF CO-RE usecase (using btfout.c).  */
+#define BTF_WITH_CORE_DEBUG     (1U << DINFO_TYPE_BTF_WITH_CORE)
+
 /* Note: Adding new definitions to handle -combination- of debug formats,
    like VMS_AND_DWARF2_DEBUG is not recommended.  This definition remains
    here for historical reasons.  */
diff --git a/gcc/flags.h b/gcc/flags.h
index afedef0abea..af61bcd613b 100644
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -44,6 +44,10 @@ const char * debug_set_names (uint32_t w_symbols);
 
 extern bool btf_debuginfo_p ();
 
+/* Return true iff BTF with CO-RE debug info is enabled.  */
+
+extern bool btf_with_core_debuginfo_p ();
+
 /* Return true iff CTF debug info is enabled.  */
 
 extern bool ctf_debuginfo_p ();
diff --git a/gcc/opts.c b/gcc/opts.c
index e0501551ef5..1d2d22d7a3f 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -135,6 +135,14 @@ btf_debuginfo_p ()
   return (write_symbols & BTF_DEBUG);
 }
 
+/* Return TRUE iff BTF with CO-RE debug info is enabled.  */
+
+bool
+btf_with_core_debuginfo_p ()
+{
+  return (write_symbols & BTF_WITH_CORE_DEBUG);
+}
+
 /* Return TRUE iff CTF debug info is enabled.  */
 
 bool