From 76c956a31a4bebbd8dcc7e0505cf277f630ee743 Mon Sep 17 00:00:00 2001
From: Federico Di Pierro <nierro92@gmail.com>
Date: Thu, 13 Jul 2023 09:58:26 +0200
Subject: [PATCH] update(cmake,driver): bumped libbpf to latest release
 (1.2.2).

Cleaned up some now useless lines in `modern_bpf/helpers/base/common.h`.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
---
 cmake/modules/libbpf.cmake              | 4 ++--
 driver/modern_bpf/helpers/base/common.h | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/libbpf.cmake b/cmake/modules/libbpf.cmake
index 2f16391db5..ce7ceb0e01 100644
--- a/cmake/modules/libbpf.cmake
+++ b/cmake/modules/libbpf.cmake
@@ -22,9 +22,9 @@ else()
         libbpf
         PREFIX "${PROJECT_BINARY_DIR}/libbpf-prefix"
         DEPENDS zlib libelf
-        URL "https://github.com/libbpf/libbpf/archive/refs/tags/v1.0.1.tar.gz"
+        URL "https://github.com/libbpf/libbpf/archive/refs/tags/v1.2.2.tar.gz"
         URL_HASH
-        "SHA256=3d6afde67682c909e341bf194678a8969f17628705af25f900d5f68bd299cb03"
+        "SHA256=32b0c41eabfbbe8e0c8aea784d7495387ff9171b5a338480a8fbaceb9da8d5e5"
         CONFIGURE_COMMAND mkdir -p build root
         BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} BUILD_STATIC_ONLY=y OBJDIR=${LIBBPF_BUILD_DIR}/build DESTDIR=${LIBBPF_BUILD_DIR}/root NO_PKG_CONFIG=1 "EXTRA_CFLAGS=-I${LIBELF_INCLUDE} -I${ZLIB_INCLUDE}" "LDFLAGS=-Wl,-Bstatic" "EXTRA_LDFLAGS=-L${LIBELF_SRC}/libelf/libelf -L${ZLIB_SRC}" -C ${LIBBPF_SRC}/libbpf/src install install_uapi_headers
         INSTALL_COMMAND ""
diff --git a/driver/modern_bpf/helpers/base/common.h b/driver/modern_bpf/helpers/base/common.h
index ed46d5d061..5bd3a0cd27 100644
--- a/driver/modern_bpf/helpers/base/common.h
+++ b/driver/modern_bpf/helpers/base/common.h
@@ -21,6 +21,8 @@
  * to the others `PT_REGS_PARAM...`
  */
 
+#ifndef PT_REGS_PARM6_CORE_SYSCALL
+
 #if defined(bpf_target_x86)
 #define __PT_PARM6_REG r9
 #elif defined(bpf_target_arm64)
@@ -32,6 +34,8 @@
 #define PT_REGS_PARM6_CORE(x) BPF_CORE_READ(__PT_REGS_CAST(x), __PT_PARM6_REG)
 #define PT_REGS_PARM6_CORE_SYSCALL(x) PT_REGS_PARM6_CORE(x)
 
+#endif
+
 /*=============================== LIBBPF MISSING TRACING DEFINITION ===========================*/
 
 /*=============================== DEBUG MACRO ===========================*/