diff --git a/systemtap-4.7-sw.patch b/systemtap-4.7-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..0270e52cff43ab55bb1fbc90b2fd2bae5cbb41ef --- /dev/null +++ b/systemtap-4.7-sw.patch @@ -0,0 +1,17 @@ +diff -Naur systemtap-4.7/staplog.c systemtap-4.7.sw/staplog.c +--- systemtap-4.7/staplog.c 2023-05-12 14:01:36.247985590 +0800 ++++ systemtap-4.7.sw/staplog.c 2023-05-12 14:00:24.859482686 +0800 +@@ -24,10 +24,12 @@ + X86, X86_64, etc. See crash/configure.c (!). */ + #if !defined(X86) && !defined(X86_64) && !defined(ALPHA) && !defined(PPC) && \ + !defined(IA64) && !defined(PPC64) && !defined(S390) && !defined(S390X) && \ +- !defined(ARM) && !defined(ARM64) && !defined(LOONGARCH64) ++ !defined(ARM) && !defined(ARM64) && !defined(LOONGARCH64) && !defined(SW_64) + + #if defined(__alpha__) + #define ALPHA ++#elif defined(__sw_64__) ++#define SW_64 + #elif defined(__x86_64__) + #define X86_64 + #elif defined(__i386__) diff --git a/systemtap.spec b/systemtap.spec index d4e973164acecdc34e897629c3d624f7149294ea..e38928166116f3ac05b0cf8bf75ba157807e0fa8 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %{!?with_sqlite: %global with_sqlite 0%{?fedora} >= 17 || 0%{?rhel} >= 7} # prefer prebuilt docs %{!?with_docs: %global with_docs 0} @@ -167,6 +167,7 @@ Patch3: pr29108.patch Patch4: pr30749.patch Patch10: 0001-add-loongarch-support-for-systemtap.patch +Patch11: systemtap-4.7-sw.patch # Build* BuildRequires: make @@ -602,6 +603,7 @@ or within a container. %patch -P4 -p1 %patch10 -p1 +%patch11 -p1 %build @@ -1321,6 +1323,9 @@ exit 0 # PRERELEASE %changelog +* Thu Mar 21 2024 wxiat - 4.9-3.0.2 +- cherry-pick `add sw patch #235276f841f14ad7dd407205841304185551ac43`. + * Mon Dec 11 2023 WenlongZhang - 4.9-3.0.1 - add loongarch support for systemtap