From a672a2258256f331b658c97e2f68711b709fdbe8 Mon Sep 17 00:00:00 2001
From: David Faust <david.faust@oracle.com>
Date: Tue, 28 Sep 2021 10:29:50 -0700
Subject: [PATCH] bpf: correct extra_headers

The BPF CO-RE support (commit 8bdabb37549f12ce727800a1c8aa182c0b1dd42a)
mistakenly overwrote bpf-*-* extra_headers in config.gcc, causing
bpf-helpers.h to not be installed. The redefinition with coreout.h is
unneeded, so delete it.

gcc/ChangeLog:

	* config.gcc (bpf-*-*): Do not overwrite extra_headers.
---
 gcc/config.gcc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 498c51e619d..aa5bd5d1459 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1531,7 +1531,6 @@ bpf-*-*)
         use_collect2=no
         extra_headers="bpf-helpers.h"
         use_gcc_stdint=provide
-        extra_headers="coreout.h"
         extra_objs="coreout.o"
         target_gtfiles="$target_gtfiles \$(srcdir)/config/bpf/coreout.c"
         ;;