diff --git a/0001-add-loongarch64-support.patch b/0040-add-loongarch64-support.patch similarity index 100% rename from 0001-add-loongarch64-support.patch rename to 0040-add-loongarch64-support.patch diff --git a/0051-fix-rela.init.text-section-changed-due-to-__BTF_id_-changed.patch b/0041-fix-rela.init.text-section-changed-due-to-__BTF_id_-changed.patch similarity index 100% rename from 0051-fix-rela.init.text-section-changed-due-to-__BTF_id_-changed.patch rename to 0041-fix-rela.init.text-section-changed-due-to-__BTF_id_-changed.patch diff --git a/0042-add-sw_64-mips64el-support.patch b/0042-add-sw_64-mips64el-support.patch new file mode 100644 index 0000000000000000000000000000000000000000..1be02c0fa598dcba5aae07cc91d0d2529869446e --- /dev/null +++ b/0042-add-sw_64-mips64el-support.patch @@ -0,0 +1,42 @@ +From 774ad9e2e731c06f4c3027f70d6ed9f0cbb6702a Mon Sep 17 00:00:00 2001 +From: zhangxianting +Date: Wed, 18 Dec 2024 10:15:35 +0800 +Subject: [PATCH] add sw_64 mips64el support + +--- + kpatch-build/Makefile | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/kpatch-build/Makefile b/kpatch-build/Makefile +index f042a6a..f03aaa1 100644 +--- a/kpatch-build/Makefile ++++ b/kpatch-build/Makefile +@@ -18,6 +18,16 @@ SOURCES += insn/insn.c insn/inat.c + INSN = insn/insn.o insn/inat.o + insn/%.o: CFLAGS := $(filter-out -Wconversion, $(CFLAGS)) + endif ++ifeq ($(ARCH),sw_64) ++SOURCES += insn/insn.c insn/inat.c ++INSN = insn/insn.o insn/inat.o ++insn/%.o: CFLAGS := $(filter-out -Wconversion, $(CFLAGS)) ++endif ++ifeq ($(ARCH),mips64) ++SOURCES += insn/insn.c insn/inat.c ++INSN = insn/insn.o insn/inat.o ++insn/%.o: CFLAGS := $(filter-out -Wconversion, $(CFLAGS)) ++endif + ifeq ($(ARCH),ppc64le) + SOURCES += gcc-plugins/ppc64le-plugin.c + PLUGIN = gcc-plugins/ppc64le-plugin.so +@@ -27,7 +37,7 @@ PLUGIN_CFLAGS := $(filter-out -Wconversion, $(CFLAGS)) + PLUGIN_CFLAGS += -shared -I$(GCC_PLUGINS_DIR)/include \ + -Igcc-plugins -fPIC -fno-rtti -O2 -Wall + endif +-ifeq ($(filter $(ARCH),s390x x86_64 ppc64le aarch64 riscv64 loongarch64),) ++ifeq ($(filter $(ARCH),s390x x86_64 ppc64le aarch64 riscv64 loongarch64 sw_64 mips64),) + $(error Unsupported architecture ${ARCH}, check https://github.com/dynup/kpatch/#supported-architectures) + endif + +-- +2.39.3 + diff --git a/kpatch.spec b/kpatch.spec index 5b87e5d176aaa91100e29031de5f0e0d666bfa92..1764284c97923911dece8aabba4618cd4c95783d 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,7 +1,7 @@ Name: kpatch Epoch: 1 Version: 0.9.9 -Release: 12 +Release: 13 Summary: A Linux dynamic kernel patching infrastructure License: GPLv2 @@ -52,8 +52,9 @@ Patch0036:0036-create-diff-object-ignore-entsize-change-of-.return_.patch Patch0037:0037-add-initial-riscv64-support.patch Patch0038:0038-Fix-undefined-behavior-problem-when-using-list_forea.patch Patch0039:0039-build-support-for-building-with-clang.patch -Patch0040:0001-add-loongarch64-support.patch -Patch0041:0051-fix-rela.init.text-section-changed-due-to-__BTF_id_-changed.patch +Patch0040:0040-add-loongarch64-support.patch +Patch0041:0041-fix-rela.init.text-section-changed-due-to-__BTF_id_-changed.patch +Patch0042:0042-add-sw_64-mips64el-support.patch Patch9001:huawei-fix-function-ptr-relocation.patch Patch9002:huawei-lookup.c-ignore-BTF-ID-when-matching-locals.patch @@ -126,6 +127,12 @@ popd %{_mandir}/man1/*.1.gz %changelog +* Tue May 13 2025 mahailiang - 1:0.9.9-13 +- Type:update +- CVE:NA +- SUG:NA +- DESC:add support sw_64 mips64el + * Thu Apr 17 2025 jinsaihang - 1:0.9.9-12 - Type:bugfix - CVE:NA