Update RISC-V patch for 1.20.4

This commit is contained in:
Andrew Lukoshko 2025-08-21 15:49:35 +00:00
parent e33eb0e121
commit 76ff5bf522

View File

@ -1,16 +1,16 @@
From b42d1b1d3fb5447c2804b56ceb864e2c8b47d54a Mon Sep 17 00:00:00 2001
From 762363d2cb5de264973f08453279400cd570935c Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Sun, 20 Apr 2025 05:49:41 +0000
Date: Thu, 21 Aug 2025 15:47:31 +0000
Subject: [PATCH] Add support for riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
Signed-off-by: Andrew Lukoshko <alukoshko@almalinux.org>
---
Makefile | 11 ++++++++++-
src/stalld.h | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 4585b6c..5d7259c 100644
index 2027791..e70d8e0 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,11 @@ ifeq ($(ARCH),powerpc)
@ -25,7 +25,7 @@ index 4585b6c..5d7259c 100644
$(info USE_BPF=$(USE_BPF))
$(info FCF_PROTECTION=$(FCF_PROTECTION))
@@ -125,6 +130,10 @@ endif
@@ -134,6 +139,10 @@ endif
ifeq ($(ARCH),s390x)
CLANGARCH=-D__s390x__
endif
@ -36,20 +36,20 @@ index 4585b6c..5d7259c 100644
.PHONY: all tests
@@ -145,7 +154,7 @@ bpf/vmlinux.h:
@@ -154,7 +163,7 @@ bpf/vmlinux.h:
# The .bpf.c needs to be transformed into the .bpf.o.
# The .bpf.o is then required to build the .skel.h.
bpf/stalld.bpf.o: bpf/vmlinux.h bpf/stalld.bpf.c
- @$(CLANG) -g -O2 -target bpf $(CLANGARCH) -D__TARGET_ARCH_$(ARCH) $(INCLUDES) $(CLANG_BPF_SYS_INCLUDES) -c $(filter %.c,$^) -o $@
+ @$(CLANG) -g -O2 -target bpf $(CLANGARCH) $(CLANGFLAGS) -D__TARGET_ARCH_$(ARCH) $(INCLUDES) $(CLANG_BPF_SYS_INCLUDES) -c $(filter %.c,$^) -o $@
- @$(CLANG) -g -O2 -target bpf $(CLANGARCH) -DDEBUG_STALLD=$(DEBUG) -D__TARGET_ARCH_$(ARCH) \
+ @$(CLANG) -g -O2 -target bpf $(CLANGARCH) $(CLANGFLAGS) -DDEBUG_STALLD=$(DEBUG) -D__TARGET_ARCH_$(ARCH) \
$(INCLUDES) $(CLANG_BPF_SYS_INCLUDES) -c $(filter %.c,$^) -o $@
@$(LLVM_STRIP) -g $@ # strip useless DWARF info
# This is the second step: The .bpf.o object is translated into
diff --git a/src/stalld.h b/src/stalld.h
index 0c4dcee..8d2f92f 100644
index 68a89a0..1350bb8 100644
--- a/src/stalld.h
+++ b/src/stalld.h
@@ -121,7 +121,7 @@ struct stalld_backend {
@@ -122,7 +122,7 @@ struct stalld_backend {
#elif __arm__
# define __NR_sched_setattr 380
# define __NR_sched_getattr 381
@ -59,6 +59,5 @@ index 0c4dcee..8d2f92f 100644
# define __NR_sched_getattr 275
#elif __powerpc__
--
2.49.0
2.43.7