From patchwork Mon Aug 5 19:34:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170614 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4687827ile; Mon, 5 Aug 2019 12:35:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqytyAJIPv++8H/y/cpiDOoa5qlttch0Yhju9jVVs2LJqUGhtn9wmqG0YOKSgiDO4BzfdlND X-Received: by 2002:a17:902:7288:: with SMTP id d8mr62221304pll.133.1565033719726; Mon, 05 Aug 2019 12:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565033719; cv=none; d=google.com; s=arc-20160816; b=NoNuSUEtBjixnj+Sb8hkYMt5RrVW+DkzezKcS8OJIueL/zVMrPYMcprc5R0MdzKUCv A69rHG1RYuxZQEJ+pbDzgnJAA1vIT2PMO1diDuqc7cd90/m8WSdf37eAWt6hJUoYMPrf WJ6C8xarQtwRTDS6j46kwP/C5ggH5nrD7qCLG7/oeMlarZLlcEfbbM0uxtsud0p+uum4 PoU0QIkbjb9D9rXS7iazURjzYM0PnQ8R7OwaN85BliY0dsEs6KLNwk0XFzFNZ4ZJcRL+ x+6BP7aRRixuMiXDIaCPup7D+njRRAx8F9783RTSUHSwH9IDKCnblPyuwSzjkO9QruCG f18w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=CLbXPffhWmZ6I1jaiV/mtgDOnviKN287XdF3taQEgZQ=; b=Wdy8cgVGZMTstQkhiiQeQBjpKO3zqU9woyyLUTuVkQ91VIa5mXhw5pe/H0j7r3aGYA P24zPtEEkgazlsWAwOyNo3LWFo/uHRmy3mrpZsVIgTq+5F8BE4V9tldRknPtwxcTmuN4 gv1SPXubBVIWmFYz1n65/diZ9QmEHsjW9FzZNgGua9VtczaQKGwzeK0TieHKsugkJIHY XagJjWWZ5HrWZjWqxRzO7JH9DI+YLvbMV52MtIGGSBcA6GAUY887KLv23orAXeCBFO/9 nNy4Vvuo4Z/nU0FT6ho2YUUb1dPTFv3lsCB0KPzQqJt/URmcmc6UGGJlSLzVtBp5jhiJ YPEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="W/OxY661"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f91si41909947plf.300.2019.08.05.12.35.19; Mon, 05 Aug 2019 12:35:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="W/OxY661"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A3C067F300; Mon, 5 Aug 2019 19:35:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mail.openembedded.org (Postfix) with ESMTP id 804867F2ED for ; Mon, 5 Aug 2019 19:34:46 +0000 (UTC) Received: by mail-pf1-f175.google.com with SMTP id q10so40128448pff.9 for ; Mon, 05 Aug 2019 12:34:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/y8Rw5BjL4SSnJIvDgTYY62MZo/gEoqNXiA3nNaGgj8=; b=W/OxY661AdbZJODQn7DqXCfjGsPKJ94VCj6JiFl4uy3cTiIW4TjvQxsKY6zdQtVb7L ml5eDYsYrJQPIzXlc87CPes7pWQ6HM4LF8Oa3Pee+n0rQlX1WIAXep0AKlr4fA9iX0B6 gkqYpZslKad0nR1XmrFhPuNyLah0pxmRuv9/O1n/WeMs8QnZC48JIJt1YtvuMqSxW8hN 4/ZbmXJaIne7v6bYHuz5GCza1UYUJBxoeIuyG/r4ASSpydya4MEfSLVj0jrVVa1B3ZRw AXCQcgTOMM0R6AIMKRIqiQoBcTmwCu9AYA7jHPd+7Y/OvXurQXEy6fQYaWDYRFhwkrW5 +/9A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/y8Rw5BjL4SSnJIvDgTYY62MZo/gEoqNXiA3nNaGgj8=; b=umv8FWHi85x2k2gzJvu2HuEV9gPSzjYdntt6qNbFCj26uhFCPPUqrqEVeFJeoi0tMY lr+v/WSwlmtfUI38+s5HokMqR+RyJnq6RCKZYSslddffmKdm78llqkN7QXyalzch6xZZ XuH0koNiUs01+iBY7o3t8V3ybX4xQeFAC8fPSloKGTeIAiabK1yEFD+KB0l3UN+2Edf3 L2tFig50Ab9UNbCOWlY5z8/64a7giPYyLs+H0c8IdLrB9jl+JsAYaEvjueq1fgMiUBL0 6RqPLxFvHExvav2jpna+kXiGjcpOCGVDK1bfvQpdxBw2w1rM7pWFg3DOTygSVCQcqhRp zZ1A== X-Gm-Message-State: APjAAAWUEnCBgH3RrEdVM7RLGbRG2oGozTzZMdttNDmk/cL8Uz8JzTGX Zi6Vwyh4ts1j2a5MSgU77WvmlX5oXoc= X-Received: by 2002:a63:e807:: with SMTP id s7mr133600638pgh.194.1565033687016; Mon, 05 Aug 2019 12:34:47 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id j10sm51904961pfn.188.2019.08.05.12.34.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 12:34:46 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 5 Aug 2019 12:34:30 -0700 Message-Id: <20190805193431.32053-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190805193431.32053-1-raj.khem@gmail.com> References: <20190805193431.32053-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/3] musl: Fix clock_gettime on 32-bit archs without vdso X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This was seen in x86 code being run via qemu-user ending in (process:883): GLib-ERROR **: 22:28:34.117: GLib requires working CLOCK_MONOTONIC qemu: uncaught target signal 5 (Trace/breakpoint trap) - core dumped Signed-off-by: Khem Raj --- ...n-clock_gettime-on-32-bit-archs-with.patch | 30 +++++++++++++++++++ meta/recipes-core/musl/musl_git.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-core/musl/musl/0001-fix-regression-in-clock_gettime-on-32-bit-archs-with.patch -- 2.22.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/musl/musl/0001-fix-regression-in-clock_gettime-on-32-bit-archs-with.patch b/meta/recipes-core/musl/musl/0001-fix-regression-in-clock_gettime-on-32-bit-archs-with.patch new file mode 100644 index 0000000000..d89fcee4f3 --- /dev/null +++ b/meta/recipes-core/musl/musl/0001-fix-regression-in-clock_gettime-on-32-bit-archs-with.patch @@ -0,0 +1,30 @@ +From 192c8e18c0f502fe8269b075c21e58290f875182 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Mon, 5 Aug 2019 12:01:13 -0400 +Subject: [PATCH] fix regression in clock_gettime on 32-bit archs without vdso + +commit 72f50245d018af0c31b38dec83c557a4e5dd1ea8 broke this by creating +a code path where r is uninitialized. + +Upstream-Status: Submitted +Signed-off-by: Khem Raj + +--- + src/time/clock_gettime.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/time/clock_gettime.c b/src/time/clock_gettime.c +index 63e9f9c8..3e1d0975 100644 +--- a/src/time/clock_gettime.c ++++ b/src/time/clock_gettime.c +@@ -73,6 +73,7 @@ int __clock_gettime(clockid_t clk, struct timespec *ts) + #endif + + #ifdef SYS_clock_gettime64 ++ r = -ENOSYS; + if (sizeof(time_t) > 4) + r = __syscall(SYS_clock_gettime64, clk, ts); + if (SYS_clock_gettime == SYS_clock_gettime64 || r!=-ENOSYS) +-- +2.22.0 + diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index bf6f983dc0..87eec31a0f 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -15,6 +15,7 @@ PV = "${BASEVER}+git${SRCPV}" SRC_URI = "git://git.musl-libc.org/musl \ file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ + file://0001-fix-regression-in-clock_gettime-on-32-bit-archs-with.patch \ " S = "${WORKDIR}/git"