From patchwork Tue Jun 14 17:03:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frederik Van Bogaert X-Patchwork-Id: 1643371 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind.be header.i=@mind.be header.a=rsa-sha256 header.s=google header.b=fdM4/j9W; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LMvsf4t75z9tlJ for ; Wed, 15 Jun 2022 03:03:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C99D841899; Tue, 14 Jun 2022 17:03:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Wg0SEdhF_2_G; Tue, 14 Jun 2022 17:03:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 5A5B5410A4; Tue, 14 Jun 2022 17:03:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9CB041BF37A for ; Tue, 14 Jun 2022 17:03:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9937140B65 for ; Tue, 14 Jun 2022 17:03:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=mind.be Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zsYSjvqFJ-Ts for ; Tue, 14 Jun 2022 17:03:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by smtp2.osuosl.org (Postfix) with ESMTPS id E205640B81 for ; Tue, 14 Jun 2022 17:03:40 +0000 (UTC) Received: by mail-ed1-x52f.google.com with SMTP id c2so12542502edf.5 for ; Tue, 14 Jun 2022 10:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; h=message-id:date:mime-version:user-agent:from:subject:to :content-language:content-transfer-encoding; bh=wRolCTeJdURsIOZIoRenSXquaTpTCZTI7KuiX7edqUQ=; b=fdM4/j9WYqkhbe8/I8blNyTwJoqh+fxDTVoi6T+m0JRzbNkITj8I0X6R4ydHNYgIju UuLRHy7mFCUp+xpsC9rCd5a/i4QT5WKptCNMqACIOV1Y9xTVn6Y+guTaQZJY+1Su+DYv 1VOmdN2XXJ1raFmKsAeJyK2+wj+FmUmDrpC3Th3KeOq57JaHyfrX429OfoFhruxH9MST g79ns7o1J/cU2Ov3uVUFYCbYEzK6nVpluw2klzaV5gDGSKgvbTXW1rJ6XzZc00IMny6n Qj7IfuYUfNdEL0H+7NSC0VzMHyAoHkGn1g0omCqBgkB7OgKO85QO03uoLnno3yx/8TGf IaKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:content-language:content-transfer-encoding; bh=wRolCTeJdURsIOZIoRenSXquaTpTCZTI7KuiX7edqUQ=; b=LMTyWXP2I3dav3JvOgb1Mn1jmgSkEER4zBjLb1xoparL0okbEbPtnMLDhABh8GHXIo koYRFKf392Xklb/xN5eQuo3IEzBW49gsUmq7Bbv2Vtw7ZQgnDamKn8Gv3Zv3emwzhZ+9 FNxu+n026RpZpjOH6s3dJjmiFJoNoRylGJmfCGqFlxKsRCgPB/IpprBksgAe/yfLCbiW aFnD3VcW4d3YC5zfjzDKhheqRtJ3tm9cXSbtuJAnQyBLY53xBSdnDz4hJ9knrvFgWVtx xzZvcE1foLZr+V+/mkMNtc1GAGfLHSXiZRlwl+dq8+GsxKv+LvNcTaI9hYy98eiKtFh+ 6/zA== X-Gm-Message-State: AJIora+pH/kQc0wl6sQBHae0GenqYH13gTXseCeT0n/svwhNWMyvHgfH uzsEfOxJo9PjlzIG1Orb4ndmfz2mM5kq15/a X-Google-Smtp-Source: ABdhPJwZ7RhZIl/4siWXkEhg2cEIVe1CoWxiuSL+oYYAqMTHSj+r+Jth/mI+5OZqWktfjepbxqG2EA== X-Received: by 2002:a05:6402:22eb:b0:42d:d578:25d9 with SMTP id dn11-20020a05640222eb00b0042dd57825d9mr7287027edb.310.1655226219061; Tue, 14 Jun 2022 10:03:39 -0700 (PDT) Received: from [10.1.0.189] (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id r20-20020a056402235400b0042bdb6a3602sm7379462eda.69.2022.06.14.10.03.38 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Jun 2022 10:03:38 -0700 (PDT) Message-ID: Date: Tue, 14 Jun 2022 19:03:34 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 From: Frederik Van Bogaert To: buildroot@buildroot.org Content-Language: en-US Subject: [Buildroot] [PATCH] package/libunwind: Upstep to v1.6.2 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This also removes an old patch to fix atomic_ops for ARM pre-ARMv6. atomic_ops support has been replaced with C11 atomics, so the patch     did not apply anymore, and should be unnecessary. This does mean compilation will fail with systems that don't support     C11 atomics, i.e. GCC versions older than 4.9 Signed-off-by: Frederik Van Bogaert ---  ...O_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch | 56 -------------------  package/libunwind/Config.in                   |  2 +  package/libunwind/libunwind.hash              |  2 +-  package/libunwind/libunwind.mk                |  6 +-  4 files changed, 4 insertions(+), 62 deletions(-)  delete mode 100644 package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch      --disable-tests \      $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cxx-exceptions,--disable-cxx-exceptions) -ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) -LIBUNWIND_DEPENDENCIES += libatomic_ops -endif -  $(eval $(autotools-package)) diff --git a/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch deleted file mode 100644 index 2a37ed7784..0000000000 --- a/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 24484e80b3e329c9edee1995e102f8612eedb79c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 13 May 2014 23:32:27 +0200 -Subject: [PATCH] Add AO_REQUIRE_CAS to fix build on ARM < v6 - -ARM earlier than ARMv6, such as ARMv4 and ARMv5 do not provide -optimize atomic operations in libatomic_ops. Since libunwind is using -such operations, it should define AO_REQUIRE_CAS before including - so that libatomic_ops knows it should use emulated -atomic operations instead (even though they are obviously a lot more -expensive). - -Also, while real atomic operations are all inline functions and -therefore linking against libatomic_ops was not required, the emulated -atomic operations actually require linking against libatomic_ops, so -the commented AC_CHECK_LIB test in acinclude.m4 is uncommented to make -sure we link against libatomic_ops. - -Signed-off-by: Thomas Petazzoni ---- - acinclude.m4          | 8 +------- - include/libunwind_i.h | 1 + - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 497f7c2..9c15af1 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -22,11 +22,5 @@ fi]) - AC_DEFUN([CHECK_ATOMIC_OPS], - [dnl Check whether the system has the atomic_ops package installed. -   AC_CHECK_HEADERS(atomic_ops.h) --# --# Don't link against libatomic_ops for now.  We don't want libunwind --# to depend on libatomic_ops.so.  Fortunately, none of the platforms --# we care about so far need libatomic_ops.a (everything is done via --# inline macros). --# --#  AC_CHECK_LIB(atomic_ops, main) -+  AC_CHECK_LIB(atomic_ops, main) - ]) -diff --git a/include/libunwind_i.h b/include/libunwind_i.h -index 23f615e..deabdfd 100644 ---- a/include/libunwind_i.h -+++ b/include/libunwind_i.h -@@ -95,6 +95,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */ -     (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) - - #ifdef HAVE_ATOMIC_OPS_H -+# define AO_REQUIRE_CAS - # include - static inline int - cmpxchg_ptr (void *addr, void *old, void *new) --- -1.9.2 - diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in index 5284b5864c..b914cd46f7 100644 --- a/package/libunwind/Config.in +++ b/package/libunwind/Config.in @@ -23,6 +23,8 @@ config BR2_PACKAGE_LIBUNWIND      bool "libunwind"      depends on BR2_TOOLCHAIN_HAS_THREADS      depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS +    # GCC 4.9 is the first to implement C11 atomics +    depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9      # forcefully links against libgcc_s, only available in dynamic      # linking configurations      depends on !BR2_STATIC_LIBS diff --git a/package/libunwind/libunwind.hash b/package/libunwind/libunwind.hash index de00c59988..1d532a7830 100644 --- a/package/libunwind/libunwind.hash +++ b/package/libunwind/libunwind.hash @@ -1,5 +1,5 @@  # Locally calculated after checking pgp signature -sha256 90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017 libunwind-1.5.0.tar.gz +sha256 4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976 libunwind-1.6.2.tar.gz  # Hash for license file  sha256 6a0dbbdaec2b3136b7bf045586f4212bdf74e7af688bf9dfe9154607cf5ec156 COPYING diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index aaa33464a9..9cd587d0a3 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -4,7 +4,7 @@  #  ################################################################################ -LIBUNWIND_VERSION = 1.5.0 +LIBUNWIND_VERSION = 1.6.2  LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind  LIBUNWIND_INSTALL_STAGING = YES  LIBUNWIND_LICENSE_FILES = COPYING @@ -16,8 +16,4 @@ LIBUNWIND_CONF_OPTS = \