From b3be7112d674061a8944a48216738736fee49160 Mon Sep 17 00:00:00 2001 From: hubin Date: Fri, 16 Dec 2022 14:29:34 +0800 Subject: [PATCH] fix byte_order_is_valid function logic Signed-off-by: hubin --- ...x-byte_order_is_valid-function-logic.patch | 31 +++++++++++++++++++ libunwind.spec | 10 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-fix-byte_order_is_valid-function-logic.patch diff --git a/0001-fix-byte_order_is_valid-function-logic.patch b/0001-fix-byte_order_is_valid-function-logic.patch new file mode 100644 index 0000000..a40375a --- /dev/null +++ b/0001-fix-byte_order_is_valid-function-logic.patch @@ -0,0 +1,31 @@ +From dd49933f80043f933bc10e2f0f1c6d3e664475ed Mon Sep 17 00:00:00 2001 +From: hubin +Date: Fri, 16 Dec 2022 09:24:50 +0800 +Subject: [PATCH] fix byte_order_is_valid function logic + +byte_order_is_valid is an inline function extracted from unw_create_addr_space +in libunwind 1.6, currently its logic mismatches the function intention. + +Signed-off-by: hubin +--- + include/libunwind_i.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/libunwind_i.h b/include/libunwind_i.h +index fea5c26..9742267 100644 +--- a/include/libunwind_i.h ++++ b/include/libunwind_i.h +@@ -119,8 +119,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + static inline int + byte_order_is_valid(int byte_order) + { +- return byte_order != UNW_BIG_ENDIAN +- && byte_order != UNW_LITTLE_ENDIAN; ++ return byte_order == UNW_BIG_ENDIAN ++ || byte_order == UNW_LITTLE_ENDIAN; + } + + static inline int +-- +2.33.0 + diff --git a/libunwind.spec b/libunwind.spec index d14da31..56e2f16 100644 --- a/libunwind.spec +++ b/libunwind.spec @@ -1,12 +1,14 @@ Name: libunwind Epoch: 2 Version: 1.6.2 -Release: 2 +Release: 3 Summary: Libunwind provides a C ABI to determine the call-chain of a program License: BSD URL: http://savannah.nongnu.org/projects/libunwind Source: http://download-mirror.savannah.gnu.org/releases/libunwind/libunwind-%{version}.tar.gz +Patch0001: 0001-fix-byte_order_is_valid-function-logic.patch + ExclusiveArch: aarch64 %{ix86} x86_64 riscv64 BuildRequires: automake libtool autoconf texlive-latex2man @@ -84,6 +86,12 @@ make check || true %{_mandir}/*/* %changelog +* Fri Dec 16 2022 Bin Hu - 2:1.6.2-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix byte_order_is_valid function logic + * Tue Apr 26 2022 renhongxun -2:1.6.2-2 - Type:update - ID:NA -- Gitee