#1 Update to 1.3.1
Merged 5 years ago by spot. Opened 5 years ago by ankursinha.
rpms/ ankursinha/libunwind master  into  master

@@ -1,43 +0,0 @@ 

- From c7ab998ec52b09d61ec3c0ea62aa07cd26077ea3 Mon Sep 17 00:00:00 2001

- From: Romain Naour <romain.naour@smile.fr>

- Date: Mon, 3 Jul 2017 14:43:02 +0200

- Subject: [PATCH] libunwind-arm: fix build failure due to asm()

- 

- The gcc documentation [1] suggest to use __asm__ instead of asm.

- 

- Fixes:

- http://autobuild.buildroot.net/results/3ef/3efe156b6494e4392b6c31de447ee2c72acc1a53

- 

- [1] https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords

- 

- Signed-off-by: Romain Naour <romain.naour@smile.fr>

- Cc: Bernd Kuhls <bernd.kuhls@t-online.de>

- ---

-  include/libunwind-arm.h | 4 ++--

-  1 file changed, 2 insertions(+), 2 deletions(-)

- 

- diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h

- index f208487..1c856fa 100644

- --- a/include/libunwind-arm.h

- +++ b/include/libunwind-arm.h

- @@ -265,7 +265,7 @@ unw_tdep_context_t;

-  #ifndef __thumb__

-  #define unw_tdep_getcontext(uc) (({                                     \

-    unw_tdep_context_t *unw_ctx = (uc);                                   \

- -  register unsigned long *unw_base asm ("r0") = unw_ctx->regs;          \

- +  register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs;      \

-    __asm__ __volatile__ (                                                \

-      "stmia %[base], {r0-r15}"                                           \

-      : : [base] "r" (unw_base) : "memory");                              \

- @@ -273,7 +273,7 @@ unw_tdep_context_t;

-  #else /* __thumb__ */

-  #define unw_tdep_getcontext(uc) (({                                     \

-    unw_tdep_context_t *unw_ctx = (uc);                                   \

- -  register unsigned long *unw_base asm ("r0") = unw_ctx->regs;          \

- +  register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs;      \

-    __asm__ __volatile__ (                                                \

-      ".align 2\nbx pc\nnop\n.code 32\n"                                  \

-      "stmia %[base], {r0-r15}\n"                                         \

- -- 

- 2.9.4

- 

file modified
+6 -4
@@ -3,8 +3,8 @@ 

  

  Summary: An unwinding library

  Name: libunwind

- Version: 1.2.1

- Release: 6%{?dist}

+ Version: 1.3.1

+ Release: 1%{?dist}

  License: BSD

  URL: http://savannah.nongnu.org/projects/libunwind

  
@@ -12,7 +12,6 @@ 

  

  #Fedora specific patch

  Patch1: libunwind-arm-default-to-exidx.patch

- Patch2: libunwind-fix-arm-build-failure-due-to-asm.patch

  

  ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64

  
@@ -36,7 +35,6 @@ 

  %prep

  %setup -q

  %patch1 -p1 -b .default-to-exidx

- %patch2 -p1 -b .arm

  

  %build

  aclocal
@@ -90,6 +88,10 @@ 

  %{_includedir}/libunwind*.h

  

  %changelog

+ * Sun Jan 13 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.3.1-1

+ - Update to 1.3.1

+ - Remove no longer needed patch (builds on all arches without it)

+ 

  * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-6

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (libunwind-1.2.1.tar.gz) = af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b

+ SHA512 (libunwind-1.3.1.tar.gz) = 3110d0aed4f5c781ef1ff72c9337e59793c02c42066209a4ac44f50eff1c0b0e02a5ff9f66891e62016de14af065a47975763970b839b700c0ff2e9f415c8def

  • Fixes rhbz #1462042
  • remove unneeded patch

Succesful scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=32003635
It seems that the patch is no longer required as builds on all arches succeed, but please do check :)

Pull-Request has been merged by spot

5 years ago