From 0435c1628f2b60925114f847ef84b4a30de1f870 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 12 May 2023 17:34:04 +0800 Subject: [PATCH] add sw --- rpm-4.14.3-sw.patch | 119 ++++++++++++++++++++++++++++++++++++++++++++ rpm.spec | 7 ++- 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 rpm-4.14.3-sw.patch diff --git a/rpm-4.14.3-sw.patch b/rpm-4.14.3-sw.patch new file mode 100644 index 0000000..e227134 --- /dev/null +++ b/rpm-4.14.3-sw.patch @@ -0,0 +1,119 @@ +diff -Naur rpm-4.14.3.org/installplatform rpm-4.14.3.sw/installplatform +--- rpm-4.14.3.org/installplatform 2023-05-11 17:16:20.818506688 +0800 ++++ rpm-4.14.3.sw/installplatform 2023-05-12 14:44:13.520745718 +0800 +@@ -114,6 +114,12 @@ + CANONARCH=alpha + CANONCOLOR=0 + ;; ++ sw_64*) ++ ISANAME=sw_64 ++ ISABITS=64 ++ CANONARCH=sw_64 ++ CANONCOLOR=0 ++ ;; + aarch64) + ISANAME=aarch + ISABITS=64 +diff -Naur rpm-4.14.3.org/lib/rpmrc.c rpm-4.14.3.sw/lib/rpmrc.c +--- rpm-4.14.3.org/lib/rpmrc.c 2023-05-11 17:16:20.794506687 +0800 ++++ rpm-4.14.3.sw/lib/rpmrc.c 2023-05-12 17:30:27.072394959 +0800 +@@ -1247,6 +1247,13 @@ + strcpy(un.machine, "loongarch32"); + # endif /* __loongarch64 */ + ++ ++# if defined(__GNUC__) && defined(__alpha__) ++ { ++ strcpy(un.machine, "sw_64sw6b"); ++ } ++# endif ++ + # if defined(__GNUC__) && defined(__alpha__) + { + unsigned long amask, implver; +diff -Naur rpm-4.14.3.org/macros.in rpm-4.14.3.sw/macros.in +--- rpm-4.14.3.org/macros.in 2023-05-11 17:16:20.813506688 +0800 ++++ rpm-4.14.3.sw/macros.in 2023-05-12 14:54:53.461787376 +0800 +@@ -1154,6 +1154,10 @@ + %sparc sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v + + #------------------------------------------------------------------------------ ++# arch macro for all supported Sw_64 processors ++%sw_64 sw_64 sw_64sw6b ++ ++#------------------------------------------------------------------------------ + # arch macro for all supported Alpha processors + %alpha alpha alphaev56 alphaev6 alphaev67 + +diff -Naur rpm-4.14.3.org/rpmrc.in rpm-4.14.3.sw/rpmrc.in +--- rpm-4.14.3.org/rpmrc.in 2023-05-11 17:16:20.704506681 +0800 ++++ rpm-4.14.3.sw/rpmrc.in 2023-05-11 17:26:48.130547524 +0800 +@@ -25,6 +25,9 @@ + optflags: amd64 -O2 -g + optflags: ia32e -O2 -g + ++optflags: sw_64 -O2 -g -mieee ++optflags: sw_64sw6b -O2 -g -mieee -mtune=sw6b ++ + optflags: alpha -O2 -g -mieee + optflags: alphaev5 -O2 -g -mieee -mtune=ev5 + optflags: alphaev56 -O2 -g -mieee -mtune=ev56 +@@ -110,6 +113,7 @@ + archcolor: noarch 0 + archcolor: i386 1 + archcolor: alpha 2 ++archcolor: sw_64 2 + archcolor: sparc 1 + archcolor: sparc64 2 + archcolor: sparcv9 2 +@@ -173,6 +177,9 @@ + arch_canon: ia32e: ia32e 1 + arch_canon: em64t: em64t 1 + ++arch_canon: sw_64: sw_64 2 ++arch_canon: sw_64sw6b: sw_64sw6b 2 ++ + arch_canon: alpha: alpha 2 + arch_canon: alphaev5: alphaev5 2 + arch_canon: alphaev56: alphaev56 2 +@@ -310,6 +317,9 @@ + buildarchtranslate: i486: i386 + buildarchtranslate: i386: i386 + ++buildarchtranslate: sw_64: sw_64 ++buildarchtranslate: sw_64sw6b: sw_64 ++ + buildarchtranslate: alphaev5: alpha + buildarchtranslate: alphaev56: alpha + buildarchtranslate: alphapca56: alpha +@@ -402,6 +412,9 @@ + arch_compat: alphaev5: alpha + arch_compat: alpha: axp noarch + ++arch_compat: sw_64sw6b: sw_64 ++arch_compat: sw_64: axp noarch ++ + arch_compat: athlon: i686 + arch_compat: geode: i686 + arch_compat: pentium4: pentium3 +@@ -567,6 +580,9 @@ + buildarch_compat: alphaev5: alpha + buildarch_compat: alpha: noarch + ++buildarch_compat: sw_64sw6b: sw_64 ++buildarch_compat: sw_64: noarch ++ + buildarch_compat: m68k: noarch + + buildarch_compat: ppc8260: noarch +diff -Naur rpm-4.14.3.org/tools/elfdeps.c rpm-4.14.3.sw/tools/elfdeps.c +--- rpm-4.14.3.org/tools/elfdeps.c 2023-05-11 17:16:20.820506688 +0800 ++++ rpm-4.14.3.sw/tools/elfdeps.c 2023-05-12 14:45:04.537749039 +0800 +@@ -86,6 +86,7 @@ + if (ehdr->e_ident[EI_CLASS] == ELFCLASS64) { + switch (ehdr->e_machine) { + case EM_ALPHA: ++ case EM_SW_64: + case EM_FAKE_ALPHA: + /* alpha doesn't traditionally have 64bit markers */ + break; diff --git a/rpm.spec b/rpm.spec index 34fcaea..7fbb2be 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %define _legacy_common_support 1 # build against xz? %bcond_without xz @@ -150,6 +150,7 @@ Patch1001: compile-with-Platform-Python-binary-where-relevant.patch Patch1002: rpm-4.14.2-unversioned-python.patch Patch2000: 1000-rpm-anolis-support-loongarch.patch +Patch2001: rpm-4.14.3-sw.patch # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD @@ -699,6 +700,10 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog +* Thu May 12 2023 hpp - 4.14.3-24.0.2 +- Add sw64 Architecture + + * Fri Oct 28 2022 Liwei Ge - 4.14.3-24.0.1 - Rebrand for Anolis OS - Fix gcc10 -fno-common compile issue for compatible with gcc10 build -- Gitee