From patchwork Thu Jan 3 20:09:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Corbin X-Patchwork-Id: 1020485 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.b="COaW6vcp"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43VzYL296fz9s7h for ; Fri, 4 Jan 2019 07:10:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AAC37870A1; Thu, 3 Jan 2019 20:10:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C6Ei4bdCZDGV; Thu, 3 Jan 2019 20:10:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1BDBD8709D; Thu, 3 Jan 2019 20:10:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CF9D91C2A15 for ; Thu, 3 Jan 2019 20:10:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CC8D886005 for ; Thu, 3 Jan 2019 20:10:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XzCAhYAQDxmk for ; Thu, 3 Jan 2019 20:10:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 17B2186044 for ; Thu, 3 Jan 2019 20:10:04 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id 96so34757190wrb.2 for ; Thu, 03 Jan 2019 12:10:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PlecRAe5lKX3w9wX6ev0/UeYYYCb4CUnMamq95Z1bA4=; b=COaW6vcpIfyo1TNvh6S43pAo8yBp+L3tfpgN8cUghAOywbjeFIhFzVkl86Y4ise8er A5hjhm+gBpMdA51uwO4PBPIfLnug0GKU72dxStmzrfp4eycc8p/ivDbMsTsXDaNAhvwz 3Te5TyWd9alD3RHxKQbp6bXNBEoZnjnAYJaWKX98iaon2cAR6o97V3cKaqEm6XPtEfDL qPMB9uFZnGHExfZeqRWlEF+U4EULw/Udw2tBGgyPNh0Viwe9c/Z3XWpZ75tcjrjtyPtX kfwa7GHZB7QWiPlyhB5a/wIigpwlY+l7vKIMf4vpNro0gOqKGcwOo+ONX6fUS489imMh WHYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PlecRAe5lKX3w9wX6ev0/UeYYYCb4CUnMamq95Z1bA4=; b=Vn8JpPtYW16tuUhZS9yxCrrUbLjQPx4Y3vsf1u6GikeFiyiJphabqxTrLn9FuBQixl gl5z6ZpAHwwkk7QnRVErAIcXlezOut+h9GGVIFRuh6BhUs7sj3QcVf2fRI2ZWNUoQX7D CryG1AewscSshXDEVZ3dF7M26A23oiRVADBT9aUSjz9EIuXuK1l67rUZ+kq6CYcBKdJh u0zRkx8lGDI42u3eisucb5a1JVJdrWOJlzzAyJ2ASPWIr+c5HcaZRq+3VlPIzKSZa0gM 7SHOmFBY4CM3PqYUKrBR6MJLev56PnoCbXG9aqof45ts7IqAI3tWus5vJlDnf6rS4lG8 6vvA== X-Gm-Message-State: AJcUukeQcfNC/GdZj1o2THBSvBCMU+B59fOCUR+/b+qZsrL/tv3uApIJ KGB6gghE35AyaA3td4/peaeiWY7P7RMLEg== X-Google-Smtp-Source: ALg8bN6YHDxCEImNy4yM8vd5Z7Cxwqr9lUWAnltyC5mlVVkrqflGxVJH/ilc8nx+FBk1XWI0fkNqug== X-Received: by 2002:adf:a58a:: with SMTP id g10mr42054291wrc.3.1546546202135; Thu, 03 Jan 2019 12:10:02 -0800 (PST) Received: from godzilla.lym.embecosm-corp.com (cust64-dsl91-135-5.idnet.net. [91.135.5.64]) by smtp.gmail.com with ESMTPSA id f14sm46356416wrv.56.2019.01.03.12.10.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Jan 2019 12:10:01 -0800 (PST) From: Mark Corbin To: buildroot@buildroot.org Date: Thu, 3 Jan 2019 20:09:11 +0000 Message-Id: <20190103200911.8779-1-mark.corbin@embecosm.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/glibc: bump version for more post-2.28 fixes X-BeenThere: buildroot@busybox.net 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: Mark Corbin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This update includes two specific fixes that have been backported to the glibc 2.28 release branch from the glibc master branch: 1) UAPI header file asm/syscalls.h has been merged into the UAPI asm/unistd.h header file for the RISC-V architecture in the 4.20 kernel. This causes the glibc 2.28 build to break. 2) sysdeps/ieee754/soft-fp: ignore maybe-uninitialized with -O [BZ #19444]. The current patch for this issue can now be dropped from Buildroot. Signed-off-by: Mark Corbin --- ...soft-fp-ignore-maybe-uninitialized-w.patch | 88 ------------------- .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- 3 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch rename package/glibc/{glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa => glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1}/glibc.hash (69%) diff --git a/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch b/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch deleted file mode 100644 index febcd36f79..0000000000 --- a/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/0001-sysdeps-ieee754-soft-fp-ignore-maybe-uninitialized-w.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 4a06ceea33ecc220bbfe264d8f1e74de2f04e90d Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 2 Oct 2018 15:38:43 +0000 -Subject: [PATCH] sysdeps/ieee754/soft-fp: ignore maybe-uninitialized with -O - [BZ #19444] - -* with -O, -O1, -Os it fails with: - -In file included from ../soft-fp/soft-fp.h:318, - from ../sysdeps/ieee754/soft-fp/s_fdiv.c:28: -../sysdeps/ieee754/soft-fp/s_fdiv.c: In function '__fdiv': -../soft-fp/op-2.h:98:25: error: 'R_f1' may be used uninitialized in this function [-Werror=maybe-uninitialized] - X##_f0 = (X##_f1 << (_FP_W_TYPE_SIZE - (N)) | X##_f0 >> (N) \ - ^~ -../sysdeps/ieee754/soft-fp/s_fdiv.c:38:14: note: 'R_f1' was declared here - FP_DECL_D (R); - ^ -../soft-fp/op-2.h:37:36: note: in definition of macro '_FP_FRAC_DECL_2' - _FP_W_TYPE X##_f0 _FP_ZERO_INIT, X##_f1 _FP_ZERO_INIT - ^ -../soft-fp/double.h:95:24: note: in expansion of macro '_FP_DECL' - # define FP_DECL_D(X) _FP_DECL (2, X) - ^~~~~~~~ -../sysdeps/ieee754/soft-fp/s_fdiv.c:38:3: note: in expansion of macro 'FP_DECL_D' - FP_DECL_D (R); - ^~~~~~~~~ -../soft-fp/op-2.h:101:17: error: 'R_f0' may be used uninitialized in this function [-Werror=maybe-uninitialized] - : (X##_f0 << (_FP_W_TYPE_SIZE - (N))) != 0)); \ - ^~ -../sysdeps/ieee754/soft-fp/s_fdiv.c:38:14: note: 'R_f0' was declared here - FP_DECL_D (R); - ^ -../soft-fp/op-2.h:37:14: note: in definition of macro '_FP_FRAC_DECL_2' - _FP_W_TYPE X##_f0 _FP_ZERO_INIT, X##_f1 _FP_ZERO_INIT - ^ -../soft-fp/double.h:95:24: note: in expansion of macro '_FP_DECL' - # define FP_DECL_D(X) _FP_DECL (2, X) - ^~~~~~~~ -../sysdeps/ieee754/soft-fp/s_fdiv.c:38:3: note: in expansion of macro 'FP_DECL_D' - FP_DECL_D (R); - ^~~~~~~~~ - -Build tested with Yocto for ARM, AARCH64, X86, X86_64, PPC, MIPS, MIPS64 -with -O, -O1, -Os. -For AARCH64 it needs one more fix in locale for -Os. - - [BZ #19444] - * sysdeps/ieee754/soft-fp/s_fdiv.c: Include and use - DIAG_PUSH_NEEDS_COMMENT, DIAG_IGNORE_NEEDS_COMMENT and - DIAG_POP_NEEDS_COMMENT to disable -Wmaybe-uninitialized. - - -Signed-off-by: Yegor Yefremov ---- - sysdeps/ieee754/soft-fp/s_fdiv.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+) - -diff --git a/sysdeps/ieee754/soft-fp/s_fdiv.c b/sysdeps/ieee754/soft-fp/s_fdiv.c -index 341339f5ed..7a15cbeee6 100644 ---- a/sysdeps/ieee754/soft-fp/s_fdiv.c -+++ b/sysdeps/ieee754/soft-fp/s_fdiv.c -@@ -25,6 +25,16 @@ - #undef fdivl - - #include -+#include -+ -+/* R_f[01] are not set in cases where they are not used in packing, -+ but the compiler does not see that they are set in all cases where -+ they are used, resulting in warnings that they may be used -+ uninitialized. The location of the warning differs in different -+ versions of GCC, it may be where R is defined using a macro or it -+ may be where the macro is defined. This happens only with -O1. */ -+DIAG_PUSH_NEEDS_COMMENT; -+DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized"); - #include - #include - #include -@@ -53,4 +63,6 @@ __fdiv (double x, double y) - CHECK_NARROW_DIV (ret, x, y); - return ret; - } -+DIAG_POP_NEEDS_COMMENT; -+ - libm_alias_float_double (div) --- -2.17.0 - diff --git a/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash b/package/glibc/glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1/glibc.hash similarity index 69% rename from package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash rename to package/glibc/glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1/glibc.hash index 7429ab3809..e83b1caf4c 100644 --- a/package/glibc/glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa/glibc.hash +++ b/package/glibc/glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 b070f746f932cfce107bb9be2d59ded5b44b25ddafb480c9110c52b88cc2dec1 glibc-glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa.tar.gz +sha256 ebf04c7b00153d6df8beceec0666d4b13e1ac613b40d5774d1b8c6f61c1686e6 glibc-glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 94c7834754..345d257d03 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -10,7 +10,7 @@ GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VE else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master -GLIBC_VERSION = glibc-2.28-50-gb8dd0f42780a3133c02f064a2c0c5c4e7ab61aaa +GLIBC_VERSION = glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror.