From patchwork Sun Feb 18 08:20:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1900597 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TczBL5yd9z1ybl for ; Sun, 18 Feb 2024 19:20:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9B64E60652; Sun, 18 Feb 2024 08:20:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nKRcJToAC7xn; Sun, 18 Feb 2024 08:20:21 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A2FFE606B3 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id A2FFE606B3; Sun, 18 Feb 2024 08:20:21 +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 8E74E1BF2A5 for ; Sun, 18 Feb 2024 08:20:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7A93B40126 for ; Sun, 18 Feb 2024 08:20:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 OnxdC2sr6X2e for ; Sun, 18 Feb 2024 08:20:17 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=62.149.156.177; helo=smtpcmd15177.aruba.it; envelope-from=giulio.benetti@benettiengineering.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 0BCB4400CF DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 0BCB4400CF Received: from smtpcmd15177.aruba.it (smtpcmd15177.aruba.it [62.149.156.177]) by smtp2.osuosl.org (Postfix) with ESMTPS id 0BCB4400CF for ; Sun, 18 Feb 2024 08:20:16 +0000 (UTC) Received: from localhost.localdomain ([84.33.84.190]) by Aruba Outgoing Smtp with ESMTPSA id bcPFrsLNb7rb2bcPFrkldI; Sun, 18 Feb 2024 09:20:13 +0100 From: Giulio Benetti To: buildroot@buildroot.org Date: Sun, 18 Feb 2024 09:20:12 +0100 Message-Id: <20240218082012.3425825-1-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4xfMGTd5sUhxHG8mmWDHStF9fweByXuGJTon89CZdpwzTvuqGjm+B3D/9S11LCXHVLKYDuytigbuTVG4ds3UndzUwFIvfMV7qtCuhKIg4iu33pdQY/JOVj 9Y890keveGeRVmMXbiQ+6uKiwybwByGI6hCmdsNcdpYja9qaxlTYFGw+Kn+aBfy5/fctFYj2HwVVW4I7HxhZsMvOif3VgRJROf4hwN67Aq13WU85VWE1iAU+ 5OESvmxuHUPzANiEVyVOvoAsawDGj9aSLndki0am2MpWC7UpUZN5ZtY65LG3/c52d9gAB0xTM/ZvNM2eOpvXx+nPi1zVcv/y11jDmQO2uylULa4MjW1I9CEP KLm9ZRRf X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1708244413; bh=nMru1BtR3A30eZvmtFE8O01vYUvwVfhTU0EtzanfGbA=; h=From:To:Subject:Date:MIME-Version; b=LgVPPoZblpjvogD0JaoOoUETEXdBTn3nwIxE6YysnWV4/sk2XPRoxph8Vnm6D5zn7 Ao4kaiVEzRAvXEnUKgM7twjvuVjlMzmqT4JZ+D9iO/189U0peMJFkgFSN1qDerQRyu AIyAY8jJqOuyWPxjflpd4sDjpAPiYca5Wv6oAgrrwtKM8BoX+aQ5J7WV5+WH1RFlaQ IGzaH+Q6MbAmITfy5Pnrn6EkX+oBgfHf5gQ0Qrb50PPNCbsl+91LaM1zF/GpNdeNQG pMZGlmsvJxrQ12DJ7idnu0B9EHWOAy6YzgGmGlGT51eJSbYyU7HcBA9WMD/CXFykyX 5hvLx5Pwu6rYw== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=benettiengineering.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=LgVPPoZb Subject: [Buildroot] [PATCH v3] package/attr: fix build failure on Microblaze architecture 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: , Cc: Giulio Benetti , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" On Microblaze architecture __has_attribute(__symver__) support is broken and always return true even if symver is not supported so let's add an upstream patch to detect if symver is supported during autoreconf. Let's also add ATTR_AUTORECONF = YES to let patch to affect building. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Signed-off-by: Giulio Benetti --- V1->V2: * written commit log as suggested by Thomas(there was no commit log at all since this patch has been pointed during Buildroot Dev Days in IRC to me) * re-sent local patch to the correct maililng list and updated Upstream: URL V2->V3: * since patch has been upstreamed after a little rework, use it and point upstream commit URL --- ...dd-detection-of-symver-gcc-attribute.patch | 75 +++++++++++++++++++ package/attr/attr.mk | 3 + 2 files changed, 78 insertions(+) create mode 100644 package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch new file mode 100644 index 0000000000..ee029e9735 --- /dev/null +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch @@ -0,0 +1,75 @@ +From 365426c28f8bf73d34d77cc06b7d5ffeae17f13a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 15:33:15 +0100 +Subject: [PATCH] configure.ac: add detection of symver gcc attribute + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=943c776089dbb24ebbfb7432ba9841f1845bf95a + +Signed-off-by: Thomas Petazzoni +[Giulio: rework local patch for #if nesting] +Signed-off-by: Giulio Benetti +--- + configure.ac | 15 +++++++++++++++ + libattr/syscalls.c | 8 ++++---- + 2 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7e362e9..98477b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,21 @@ AS_CASE([$host_os], + [linux*], [os_linux=yes]) + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) + ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, ++ gcc_cv_symver_attribute, ++ [cat > conftest.c </dev/null 2>&1; then \ ++ gcc_cv_symver_attribute=yes ++ fi ++ rm -f conftest.[cs] ++]) ++AS_IF([test $gcc_cv_symver_attribute = yes], ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 907560a..7ee6d39 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -31,10 +31,10 @@ + * prefer symver attribute if available (since gcc 10), + * fall back to traditional .symver asm directive otherwise. + */ +-#ifdef __has_attribute +-# if __has_attribute(__symver__) +-# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) +-# elif __has_attribute(__no_reorder__) ++#if defined(HAVE_SYMVER_ATTRIBUTE) ++# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) ++#elif defined(__has_attribute) ++# if __has_attribute(__no_reorder__) + /* + * Avoid wrong partitioning with older gcc and LTO. May not work reliably + * with all versions; use -flto-partition=none if you encounter problems. +-- +2.34.1 + diff --git a/package/attr/attr.mk b/package/attr/attr.mk index d1397921ff..1d24144f46 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VALID = YES +# Flag added for patch dealing with symver in configure.ac +ATTR_AUTORECONF = YES + ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls