From bae0f46c505c2da6545066bfbea07acb43835ba0 Mon Sep 17 00:00:00 2001 From: yueyaoqiang Date: Fri, 28 Mar 2025 13:59:04 +0800 Subject: [PATCH] add support sw_64 (cherry picked from commit 413e9c3d36cfec37e5b4559e37facc99524761ed) --- add-support-sw_64.patch | 97 +++++++++++++++++++++++++++++++++++++++++ texinfo.spec | 6 ++- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 add-support-sw_64.patch diff --git a/add-support-sw_64.patch b/add-support-sw_64.patch new file mode 100644 index 0000000..d8a84f3 --- /dev/null +++ b/add-support-sw_64.patch @@ -0,0 +1,97 @@ +From 2d0f95853fb2662321c2e8b9babbe6410f68ab0e Mon Sep 17 00:00:00 2001 +From: yueyaoqiang +Date: Fri, 28 Mar 2025 13:50:33 +0800 +Subject: [PATCH] add support sw_64 + +--- + build-aux/config.guess | 3 +++ + build-aux/config.sub | 1 + + gnulib/m4/host-cpu-c-abi.m4 | 3 +++ + tp/Texinfo/XS/config.guess | 3 +++ + tp/Texinfo/XS/config.sub | 1 + + tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4 | 3 +++ + 6 files changed, 14 insertions(+) + +diff --git a/build-aux/config.guess b/build-aux/config.guess +index e81d3ae..b053c02 100755 +--- a/build-aux/config.guess ++++ b/build-aux/config.guess +@@ -1036,6 +1036,9 @@ EOF + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; ++ sw_64:Linux:*:*) ++ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ++ ;; + m32r*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; +diff --git a/build-aux/config.sub b/build-aux/config.sub +index baf1512..60bd925 100755 +--- a/build-aux/config.sub ++++ b/build-aux/config.sub +@@ -1208,6 +1208,7 @@ case $cpu-$vendor in + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 \ ++ | sw_64 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ +diff --git a/gnulib/m4/host-cpu-c-abi.m4 b/gnulib/m4/host-cpu-c-abi.m4 +index b922324..9d45f28 100644 +--- a/gnulib/m4/host-cpu-c-abi.m4 ++++ b/gnulib/m4/host-cpu-c-abi.m4 +@@ -385,6 +385,9 @@ EOF + #ifndef __loongarch64__ + #undef __loongarch64__ + #endif ++#ifndef __sw_64__ ++#undef __sw_64__ ++#endif + #ifndef __m68k__ + #undef __m68k__ + #endif +diff --git a/tp/Texinfo/XS/config.guess b/tp/Texinfo/XS/config.guess +index e81d3ae..b053c02 100755 +--- a/tp/Texinfo/XS/config.guess ++++ b/tp/Texinfo/XS/config.guess +@@ -1036,6 +1036,9 @@ EOF + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; ++ sw_64:Linux:*:*) ++ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ++ ;; + m32r*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; +diff --git a/tp/Texinfo/XS/config.sub b/tp/Texinfo/XS/config.sub +index d74fb6d..5ffdcdc 100755 +--- a/tp/Texinfo/XS/config.sub ++++ b/tp/Texinfo/XS/config.sub +@@ -1203,6 +1203,7 @@ case $cpu-$vendor in + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ ++ | sw_64 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ +diff --git a/tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4 b/tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4 +index b922324..9d45f28 100644 +--- a/tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4 ++++ b/tp/Texinfo/XS/gnulib/m4/host-cpu-c-abi.m4 +@@ -385,6 +385,9 @@ EOF + #ifndef __loongarch64__ + #undef __loongarch64__ + #endif ++#ifndef __sw_64__ ++#undef __sw_64__ ++#endif + #ifndef __m68k__ + #undef __m68k__ + #endif +-- +2.27.0 + diff --git a/texinfo.spec b/texinfo.spec index fce27e2..50d0924 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -4,7 +4,7 @@ Name: texinfo Version: 7.0.3 -Release: 3 +Release: 4 Summary: The GNU Documentation System License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ @@ -19,6 +19,7 @@ Patch6001: texinfo-6.5-covscan-fixes.patch Patch6002: texinfo-7.0.2-undef-val-array-ref.patch Patch6003: info-6.5-sync-fix-info-dir.patch Patch6004: texinfo-6.5-fix-info-dir.patch +Patch6005: add-support-sw_64.patch BuildRequires: gcc perl-generators zlib-devel ncurses-devel help2man BuildRequires: perl(Data::Dumper) perl(Locale::Messages) perl(Unicode::EastAsianWidth) perl(Text::Unidecode) perl(Storable) perl(Unicode::Normalize) @@ -144,6 +145,9 @@ export ALL_TESTS=yes %{_mandir}/man5/texinfo.5* %changelog +* Fri Mar 28 2025 yueyaoqiang - 7.0.3-4 +- add support sw_64 + * Tue Aug 29 2023 zhouwenpei - 7.0.3-3 - add fix-info-dir command -- Gitee