From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Sat, 6 May 2023 21:06:43 +0000 (-0300)
Subject: Revert "perf build: Warn for BPF skeletons if endian mismatches"
X-Git-Tag: v6.6.17~4887^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3e6df97fa25ff310c3d5e7f1644248e072e3cb0;p=platform%2Fkernel%2Flinux-rpi.git

Revert "perf build: Warn for BPF skeletons if endian mismatches"

This reverts commit 51924ae69eea5bc90b5da525fbcf4bbd5f8551b3.

We need to better polish building with BPF skels, so revert back to
making it an experimental feature that has to be explicitely enabled
using BUILD_BPF_SKEL=1.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---

diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 71442c5..16bea51 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -663,17 +663,14 @@ ifndef NO_BPF_SKEL
   $(call feature_check,clang-bpf-co-re)
   ifeq ($(feature-clang-bpf-co-re), 0)
     dummy := $(error: ERROR: BPF skeletons unsupported. clang too old/not installed or build with NO_BPF_SKEL=1.)
+  else
+    ifeq ($(filter -DHAVE_LIBBPF_SUPPORT, $(CFLAGS)),)
+      dummy := $(error: ERROR: BPF skeletons unsupported. BPF skeleton support requires libbpf or build with NO_BPF_SKEL=1.)
+    else
+      $(call detected,CONFIG_PERF_BPF_SKEL)
+      CFLAGS += -DHAVE_BPF_SKEL
+    endif
   endif
-  ifeq ($(filter -DHAVE_LIBBPF_SUPPORT, $(CFLAGS)),)
-    dummy := $(error: ERROR: BPF skeletons unsupported. BPF skeleton support requires libbpf or build with NO_BPF_SKEL=1.)
-  endif
-  host_byte_order=$(echo ""|$(HOSTCC) -dM -E -|grep __BYTE_ORDER__)
-  target_byte_order=$(echo ""|$(CC) -dM -E -|grep __BYTE_ORDER__)
-  ifneq ($(host_byte_order), $(target_byte_order))
-    $(warning Possibly mismatched host and target endianness may break BPF skeletons)
-  endif
-  $(call detected,CONFIG_PERF_BPF_SKEL)
-  CFLAGS += -DHAVE_BPF_SKEL
 endif
 
 dwarf-post-unwind := 1