From patchwork Sun Dec 22 04:05:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182362 Delivered-To: patch@linaro.org Received: by 2002:a92:1f98:0:0:0:0:0 with SMTP id f24csp2503539ilf; Sat, 21 Dec 2019 20:06:19 -0800 (PST) X-Google-Smtp-Source: APXvYqwu45+UmrVBwJNQ5fMRD1OhUB5G3pT3edWF01sTjQWcUNGq5cKFQKDO7eq2gzCHSVMoHMWt X-Received: by 2002:a63:fc57:: with SMTP id r23mr15999381pgk.71.1576987579155; Sat, 21 Dec 2019 20:06:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576987579; cv=none; d=google.com; s=arc-20160816; b=s3JhiMLzM3S+GuPmTADc71GGDOuA79IsPIjbkVHZCU1QSBM2R4YJSZV6IXqXD52wqV sJB2F3eRFhjAEFSZAFMiYsY3WkHC8zzefZdSIuP4VcTRNs0Aqczxm03FlHyez+8ywiJP a5zRmeXCKvZJQF335vEli/GKOgizQO218+AlMVSoG5KDszEb3zhpww8D8LSJbwHU9Dd4 5l3uJsj0F+/zn321kQbq6cyyRr6CaCkvdWpJvvUbfsYUzhcx/iUUw2s6eA5xLPCnaEEG pXrGmGns/ENYsdx5KTGMtk0pMSzXxUDgftOoeg52/AaKVT9LzmxvsF6rycD/m32GepN0 REmw== 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:message-id:date:to:from:dkim-signature:delivered-to; bh=M89SaAndu2xY1x4hXTeFo5FxDFD2v8ByvJuSyh/Xb0g=; b=wknjqTSguABc9CswR4xu7mFxYUB5KnNp/v0TWPtCNYhrdkbqJuMNOpJGOX1WEFeuRS eF9b3mjMkwHZ9Mf/kD3wW7B+6jigfzsNBdM9iBTn1TaiYxqR7VXokPuWCSBBsl0hpDI0 k4n7dx6KIBz2z/yjFiHLHFFb6xub6FZAbhkg2GIrJ1Wn2P+BPSGEnN0eI+2FGEe2T3rL hFsGOxlC6f64b3NIgzpK7R0aVjOGKzYfnfm9ei9OazPFg+Wxd56Xmv6JJLRdFhige2fe DtXS3L3+51eIHS7xb7zeOdoWAhUzgNr9axevczwkI2dC4S3uqLwPR2V76o+k3KeIO/JL 9lFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=IyAJhDUR; 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 83si13884215pgf.115.2019.12.21.20.06.10; Sat, 21 Dec 2019 20:06:19 -0800 (PST) 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=IyAJhDUR; 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 0BF3B7F8D0; Sun, 22 Dec 2019 04:06:00 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by mail.openembedded.org (Postfix) with ESMTP id 7C9FD7FCB6 for ; Sun, 22 Dec 2019 04:05:57 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id k197so7042228pga.10 for ; Sat, 21 Dec 2019 20:05:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=T0SyvsKexEQzjv7ANIzPnuJL/nIcevzUrrqeVg4KRVM=; b=IyAJhDURljAToudOOt0CpkJUYSW4+k1G0Q1L1hXIAWS0RUt5qEGlgmZsS5/WYgbnQN rdGQFkA+3iKI5a2byfVodgE1M6g5l/3dKFPtabD+o0zGWsi7CeMXWUmYSTqIJ8NeSMan FrAM77VEyroFk6jLKGWpy5w34Kz0+Gy3CMBnc2IExVSfPxX4Cf+CLbM9llcG7na2HTpt ++FhBP862/kmVGSCPUOmxKq9ZvSPfRxsA9tFKc1wwDprvsiXssW9bITIttmhhbWe/a7a tw3jQ91eIDtsRji1JNNLcBsiRqYq0DAtsZS+MN7FX5BdTdtukfCUw5wNyUNZ3qKhNtY+ vzqA== 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=T0SyvsKexEQzjv7ANIzPnuJL/nIcevzUrrqeVg4KRVM=; b=ccbdAVSiTlMZW9qxc0iPI0/43BzZcYX1jcmL5B1s9lghaOgWYpaRSvfoz2CeOeg3SR X+fmo7Kyq5KA4BXyecwv9rTcyaSA6HSuV0As5489s03zZgCk9jn9QIEl9DFV/SruAPvB RTgsGHm1iB/lAwQyEb0l4euRe4tW66F953NWmuUk33WqSi2nfZtM5ehYiE3w5LMTyezZ DL7y6EQpOhbdrE00sk9wTbaKwktq7cCFVqUzwsmu26UaQUjPKYX87390ITNvhr+3uWVE 6w71aJuyqpCgRayAzV2ZfhRY7fic/CxZ9tDzc+FX8rrzk11LATu7QASpo6+9ejQx2j9V 12XQ== X-Gm-Message-State: APjAAAUxY9as9aqvT/PYbDje+Dw2Gmk5NyPqaKEI6Z6jSWmlMYVeUZMM LvccGcF8Y73aic2T4jGJtgge3dR1PQY= X-Received: by 2002:a62:f842:: with SMTP id c2mr25684774pfm.104.1576987557890; Sat, 21 Dec 2019 20:05:57 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::36e9]) by smtp.gmail.com with ESMTPSA id h16sm18988306pfn.85.2019.12.21.20.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Dec 2019 20:05:57 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Dec 2019 20:05:46 -0800 Message-Id: <20191222040549.286151-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/4] gcc-sanitizers: Add missing dep on libcrypt 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 Signed-off-by: Khem Raj --- meta/recipes-devtools/gcc/gcc-sanitizers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.24.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc index 8b1d1c94bf..668e14a59f 100644 --- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc +++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc @@ -43,7 +43,7 @@ do_install () { INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY_${PN} = "1" -DEPENDS = "gcc-runtime virtual/${TARGET_PREFIX}gcc" +DEPENDS = "virtual/crypt gcc-runtime virtual/${TARGET_PREFIX}gcc" # used to fix ../../../../../../../../../work-shared/gcc-8.3.0-r0/gcc-8.3.0/libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: 'st.st_mode' may be used uninitialized in this function [-Werror=maybe-uninitialized] DEBUG_OPTIMIZATION_append = " -Wno-error" From patchwork Sun Dec 22 04:05:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182363 Delivered-To: patch@linaro.org Received: by 2002:a92:1f98:0:0:0:0:0 with SMTP id f24csp2503924ilf; Sat, 21 Dec 2019 20:06:55 -0800 (PST) X-Google-Smtp-Source: APXvYqz5pvvvUQoG6cJKhgwGvbjcMa/uw7XXViOBPaojXMaY7JC1NIzKgO3ZU08n3YdTz7xRje13 X-Received: by 2002:a17:902:76cb:: with SMTP id j11mr24029119plt.175.1576987615729; Sat, 21 Dec 2019 20:06:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576987615; cv=none; d=google.com; s=arc-20160816; b=kz8V6uH/eUOoZ7sIrz6Q9yFR7zGUT0t1YVImvtxYw6no4lqqbqtk0yXVAG1EHuB0uy IvBFu/m01y++RdVc2RRD21rkYOWXuCrHC7vV66HveQwBFvAjA8IltO5ZjZnLmOQZ3ajb bKGcgkdCqgqXsuCWgW4cMziFS26C/oWY2a0M7IIlywrQZxK2PdIwslwHSR+ClLFAHWjx b3LXt0h7M7G5+h4xKxj09LCZn6m/S1wOj7zv8fHlhib1egFIHwJXoxAGq9SU67yIeRjS fX7ruMQKPdqcUwcCKGIX+5rCVIDnE7Hm1wRdoiwuZ7oGuO+eW7GBtp3/dq0HyJh29fTi MjHA== 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=5P3AGMxoGp0e9eVaFc8p1wvaJ7fWjyPIYVKud48yf5A=; b=OeQqVW3kIjTm3LqRaFucNBMeMjVKAE4h7/MfemgnvdnnmZj671WWgiIaNC9a0mwr4s FLlJq5e/9VdXuu7lrmt2TAAsVdhKfcGx0cmKS8Ya+k+Drd1I4lqadxH/k/+uOnbXSMvV TFm5Mik/YyMvKcaSNRI6yeTDYRaN0dFRW10z9AoWCn1DB1KdYhxcCJx4RRYi2Nm/QKJZ rq/1lYPR/sutu1ixj6/fblDWrBg5aySk41hD+aChdLNKgcDzpdTJSYOjwa/kSDfYfbV5 GdsQooClXA9/IY/jTUEA5/LbHy9Q/dX3JZc6CyBYrSjPS9sWd6HVo2AjTESV0WpByhPx 41bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WopmL4p+; 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 d185si14089682pfa.97.2019.12.21.20.06.55; Sat, 21 Dec 2019 20:06:55 -0800 (PST) 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=WopmL4p+; 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 E9D1E7FCE1; Sun, 22 Dec 2019 04:06:52 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mail.openembedded.org (Postfix) with ESMTP id 0D5DA7FCB6 for ; Sun, 22 Dec 2019 04:05:57 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id z124so7035725pgb.13 for ; Sat, 21 Dec 2019 20:05:59 -0800 (PST) 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=81bkBcFLIhdN5U+NQKFzg8Kl4Qiyt8L/XUg2+d+Qha0=; b=WopmL4p+LiXJfzcH7vHPllQNSnEHjOS6oCFbxli37nUwvWoG60YCSiS5FuL6yK+vb5 gMFM83m5K7GVL/FS7h97Smt0IRHtGOjis15/vJ2ge1NcebDa+Ih7e61QV5/sO9EQIB1G DNMIVu4vKIFTX7pQ2V3/wWwmDz/+Nm0g+MmwbE6V1ND/UMfCJHJFKblYRLiVxVDYZJZI ZoZ39LaMe9Rg2yZbvjY2nS6ZQC9smOrD+eht0IWzW1ImzoJixgr6LDaoRQm8MmXbOH++ jpiHaM4+HsKm3h/BDWBk9DrWZeinZwjtwsj6qoWJCl2DqKNbMc+8X5noOqMQ0QRez7ub 64zQ== 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=81bkBcFLIhdN5U+NQKFzg8Kl4Qiyt8L/XUg2+d+Qha0=; b=E3QqAUkAQHr+HLiPlYDT3vEoxHqhiqFftN+XR+acNIXlM2IJPz/Ch1nIZJ2ZlSj39E nvUZHbaABDhk2rvR9ae4SkaX6M+PGDX8lIVFdK12DJ0h2G8ZP7LgKNffFVR8F02ZnkuZ HSZgCl/IA0Dv0hrmVCHO6+b6R2LTwFnY4tb6jJljbnEAJ0Y6pok0V9NuRTe7bZqx1WI/ PrIwG8CtUmqof3pmOLnveDfvR+BWXXSWItecjMY/JCoM0qSSixGZ5RxCGv0mDDDQX2no dXL9SaruPz0cbqb1XOdkoUYuDgbZHJ0THdPFaLWoFZwIUu137+Om4uNslumvA78VDjih 4Hkw== X-Gm-Message-State: APjAAAUtrYikr3PZ6It81yISJUstm6ExSQx7El0B8jhY29yp2usP+Iq2 jd5A7zoe3idttBH/aBLe2Ho9xSvrSdo= X-Received: by 2002:a62:888e:: with SMTP id l136mr25959011pfd.80.1576987558534; Sat, 21 Dec 2019 20:05:58 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::36e9]) by smtp.gmail.com with ESMTPSA id h16sm18988306pfn.85.2019.12.21.20.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Dec 2019 20:05:58 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Dec 2019 20:05:47 -0800 Message-Id: <20191222040549.286151-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191222040549.286151-1-raj.khem@gmail.com> References: <20191222040549.286151-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/4] gcc-sanitizers: Fix build with glibc 2.31 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 Backport a patch from latest gcc-9-branch to fix an API change in glibc 2.31, this patch wont be needed when upgrading to 9.3 or 10.x Signed-off-by: Khem Raj --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + ...libsanitizer-build-with-master-glibc.patch | 70 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch -- 2.24.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index c6395998d5..926df11c27 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -64,6 +64,7 @@ SRC_URI = "\ file://0034-fix-segmentation-fault-in-precompiled-header-generat.patch \ file://0035-Fix-for-testsuite-failure.patch \ file://0036-Re-introduce-spe-commandline-options.patch \ + file://0037-Fix-up-libsanitizer-build-with-master-glibc.patch \ file://CVE-2019-14250.patch \ file://CVE-2019-15847_1.patch \ file://CVE-2019-15847_2.patch \ diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch b/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch new file mode 100644 index 0000000000..abe074c289 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch @@ -0,0 +1,70 @@ +From 7ed24d12664319f34625a12fd8c0f729a0e71f5c Mon Sep 17 00:00:00 2001 +From: Auto Builder +Date: Sun, 22 Dec 2019 02:58:24 +0000 +Subject: [PATCH] Fix up libsanitizer build with master glibc + +2019-11-26 Jakub Jelinek + + PR sanitizer/92154 + * sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick + llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce. + * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise. + +Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b02486e0951bc0ed38310a03be73e479fc6f3e7a;hp=3feeac76ffc38427de2d7d086e2928e63eee2d44] +Signed-off-by: Auto Builder +--- + .../sanitizer_platform_limits_posix.cc | 5 +++-- + .../sanitizer_platform_limits_posix.h | 15 +-------------- + 2 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 6cd4a5bac..d823a1219 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1156,8 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit ++ on many architectures. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 73af92af1..6a673a7c9 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -211,26 +211,13 @@ namespace __sanitizer { + u64 __unused1; + u64 __unused2; + #elif defined(__sparc__) +-#if defined(__arch64__) + unsigned mode; +- unsigned short __pad1; +-#else +- unsigned short __pad1; +- unsigned short mode; + unsigned short __pad2; +-#endif + unsigned short __seq; + unsigned long long __unused1; + unsigned long long __unused2; +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) +- unsigned int mode; +- unsigned short __seq; +- unsigned short __pad1; +- unsigned long __unused1; +- unsigned long __unused2; + #else +- unsigned short mode; +- unsigned short __pad1; ++ unsigned int mode; + unsigned short __seq; + unsigned short __pad2; + #if defined(__x86_64__) && !defined(_LP64) +-- +2.17.1 + From patchwork Sun Dec 22 04:05:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182364 Delivered-To: patch@linaro.org Received: by 2002:a92:1f98:0:0:0:0:0 with SMTP id f24csp2504138ilf; Sat, 21 Dec 2019 20:07:15 -0800 (PST) X-Google-Smtp-Source: APXvYqy6zFE5HFTXkRLK8uvCrk5Nw4Xe0/12ZBmZJnJ90H5/ZPEhj2pNAlarpi1A89Zxj0EyY6pF X-Received: by 2002:a17:902:758f:: with SMTP id j15mr23836410pll.201.1576987635354; Sat, 21 Dec 2019 20:07:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576987635; cv=none; d=google.com; s=arc-20160816; b=XsIPuveQ95Ra2iOhcDSrndeMl5icRqcWsBuUt6T1LyQL4OZhGJAbis90xW6IbpBzm+ UWqJPPA5s6kEucIDIeoUOXqcyvYlZ2iWYwRXYuoWx6zpP5IcDSbFOj1h2jaKqYxeqlf7 gAnWL4n92U0a46l/8neuI91vn/gcvYP98IQwFBibs+bD/i8ZLQsYbcGgDZByR+BWgfzy wiDftr0r0K8MzTEOHOi3aIxOs0+gxqfXEtSvVRlmNjs0SYUx1bkStCgEslOMJcvbwEAy ZrwkvL3x7y+xhurireHTNdMQHr7VFoWffJ6mDV0RChjz5w0/dvOazim7ByzJmw8HeiW9 pcOg== 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=qala9vR3u+iSlv4RjFYE5o1Zpg+DGrr0z0W/35M38LE=; b=JxTaiWgy8W5BWCgq0IpBIdIACWBRRksRl0oDn/bmubof+tf5FcmoWuEho/WhMzmWEg SU48N8+sUiuukHKoO54oOtRluH1bCcecrI36G4lYUc5CoqdFbMKwUQwWVsjjEWUu5CTI zoMK3drBtOX70l5ApT+weJBAirFlVAg4exFvcfG8vZ3yisui/qIx4CVKvi27YN7YVqhy 3J/3P5aByU63SsVn+RlP+L41iXudbzEGoM56SwdXWk5HQqae7JdAnzaIySSa3SfdlEiU UBK88pY1ugEVYxwrg9nMUqdgNUWEnTbPzZb7jaEOVb2WGYXLIz5kui8S5gQlqw9fjCwh kQ1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hErXke01; 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 u18si5794101pjx.25.2019.12.21.20.07.15; Sat, 21 Dec 2019 20:07:15 -0800 (PST) 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=hErXke01; 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 1614B7FCB0; Sun, 22 Dec 2019 04:07:13 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by mail.openembedded.org (Postfix) with ESMTP id D1F277F63C for ; Sun, 22 Dec 2019 04:05:58 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id s7so5938183pjc.0 for ; Sat, 21 Dec 2019 20:06:00 -0800 (PST) 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=XFqCijbHOrjH0s+m7FR3fVNyb9xzQ/If7eo66o7JPCA=; b=hErXke01Mw85vLgtn+J8Z6H8KzFNrfEK2tLScN+Xp/5llypi7gcLOANUQDdWmZk0d1 GdCu93fOcNEOETGuc4Zgnb04bxuMlsYXJQ70KE/2jGTAobBcqHEccIk9OozatYF3bG0p tnaVv3uXR2BWcRDul7cuVWm2+Y94+VwIvQMPeTjrIfLClltwzr4e9OiK40y+hkyXy+LS DfnT+cikv32Wi8OAlqd1ZWLxEJlLyGT1ms3G+64V1a4wtjMIdnXuZV1UPV63dn7rr7vW 5zrAkklktqJ/iDtxtpwhUygRkaXKtKUhnzg5YsrqPte8BBonKxV4dmqpsfyJJux8nEOH xUkw== 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=XFqCijbHOrjH0s+m7FR3fVNyb9xzQ/If7eo66o7JPCA=; b=A20zmgDit+RObI5ORUhoOXwRaSqZLMlFjxWtQeVUrciyHedfK5VRCJsw7gE+NAXoOZ XC9vaJnOMpckdkgpk1AOdd3gQ3n+/HQJHHYox17rrY9sVfMiOxWAxDsWMAq+dDwWMt53 FVZrS44tS2CSOcPQNNw6/Hy5p2ikPUuLtIOuw/DsUiAJXwipAl1FXc0Y9dGhpmlLArPH CLAoO4pAQIx3fYlxFWNbKRGgi4nsUV0hqTYRCEDXqO48i+pw10YW/5jx7qv0t2OJosCq 9njLjO+fPCxnsL84I0YswnKE3j/y9HQpJZihx3nEsPTHTldVGy4ByBriXne2e7TbxGXI d3Tg== X-Gm-Message-State: APjAAAUk7IJihlgmFcwmQISBPJbcjqZ7cnJL61NwwwTadwgGceNRzkzq bWoiN8xWGfcohC+1ko6O85ftaO0MsIo= X-Received: by 2002:a17:902:59cd:: with SMTP id d13mr24322716plj.146.1576987559247; Sat, 21 Dec 2019 20:05:59 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::36e9]) by smtp.gmail.com with ESMTPSA id h16sm18988306pfn.85.2019.12.21.20.05.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Dec 2019 20:05:58 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Dec 2019 20:05:48 -0800 Message-Id: <20191222040549.286151-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191222040549.286151-1-raj.khem@gmail.com> References: <20191222040549.286151-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 3/4] qemu: Replace stime() API with clock_settime 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 Signed-off-by: Khem Raj --- meta/recipes-devtools/qemu/qemu.inc | 1 + ...linux-user-remove-host-stime-syscall.patch | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch -- 2.24.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 601fc2286b..07dabfe25c 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -27,6 +27,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0009-Fix-webkitgtk-builds.patch \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ + file://0011-linux-user-remove-host-stime-syscall.patch \ file://CVE-2019-15890.patch \ file://CVE-2019-12068.patch \ " diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch new file mode 100644 index 0000000000..659e6be45d --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0011-linux-user-remove-host-stime-syscall.patch @@ -0,0 +1,61 @@ +From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 +From: Laurent Vivier +Date: Tue, 12 Nov 2019 15:25:56 +0100 +Subject: [PATCH] linux-user: remove host stime() syscall + +stime() has been withdrawn from glibc +(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") + +Implement the target stime() syscall using host +clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. + +Tested qemu-ppc/x86_64 with: + + #include + #include + + int main(void) + { + time_t t; + int ret; + + /* date -u -d"2019-11-12T15:11:00" "+%s" */ + t = 1573571460; + ret = stime(&t); + printf("ret %d\n", ret); + return 0; + } + + # date; ./stime; date + Tue Nov 12 14:18:32 UTC 2019 + ret 0 + Tue Nov 12 15:11:00 UTC 2019 + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=0f1f2d4596aee037d3ccbcf10592466daa54107f] +Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 +Reported-by: Cole Robinson +Signed-off-by: Laurent Vivier +Reviewed-by: Peter Maydell +Message-Id: <20191112142556.6335-1-laurent@vivier.eu> +--- + linux-user/syscall.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -7651,10 +7651,12 @@ static abi_long do_syscall1(void *cpu_en + #ifdef TARGET_NR_stime /* not on alpha */ + case TARGET_NR_stime: + { +- time_t host_time; +- if (get_user_sal(host_time, arg1)) ++ struct timespec ts; ++ ts.tv_nsec = 0; ++ if (get_user_sal(ts.tv_sec, arg1)) { + return -TARGET_EFAULT; +- return get_errno(stime(&host_time)); ++ } ++ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); + } + #endif + #ifdef TARGET_NR_alarm /* not on alpha */ From patchwork Sun Dec 22 04:05:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182365 Delivered-To: patch@linaro.org Received: by 2002:a92:1f98:0:0:0:0:0 with SMTP id f24csp2504217ilf; Sat, 21 Dec 2019 20:07:21 -0800 (PST) X-Google-Smtp-Source: APXvYqztO1LbYTzaEGMMIwqUzIqRAhCYaXt2uY+/axlLka3ytHwiUcDFzgFK5vjen01dWaCZsid4 X-Received: by 2002:a17:902:322:: with SMTP id 31mr24305576pld.244.1576987641187; Sat, 21 Dec 2019 20:07:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576987641; cv=none; d=google.com; s=arc-20160816; b=SPtynfOZgVTV3o9HRiTZPl2qMuW83/zwxU2yMSqyKyLX3CIFSIcc9by+hop6JFbnl2 3hLlONN2i3G7mmtgw/0HJa/p7I6NMzLOUD/8uFK/ZTyJ8FpnV6UA5k5O64oqfMSFnqlR XQjY5MnaaPYEqV0CIvVG3mJheD3hNMF2DAHjPdZYAz9FJIDV6Tia/3ZJT/vX2NRJZVwc C2P8Dm697us/iJCislyqRIpbDlIJ+TxhUsXzPl5AdT1ZWIBfz8jUMXXh8+u29kP3OocW Si6uMefbh1Cg6e7qDcMNRwzQstC6c+WekEpwSi6dsyaaMnIQDHhkB7sLFhYrgoUPlBk3 9nYg== 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=y/bJE/Mp75YuSOZLfeP9Ix9qnrsQhdV854o2Os+IYyY=; b=GwskEk31Hhi4PCITPwmKF9sTCFC6PRrA9JgE9YGHwClGIy3OXEEOUaux6nTtudiMct GZhwP6Qij+lS04Jc9t5bxMGtRj35qlHCVnq9kxQhWPdcPRD9HfU+hkpLgQrOHciJy6oG 4U9oMfQh2QvuPFNPtF2iiDt8Y+K+3cET1/byO/Sugn+YMrP+Hqz7C3U/BAY0uSmee33K p3Btm/ADM7rXqFwOxasGBrzoc96WW4tKYW4GTdxq30wa6t/5tSa6ah3yfBBM55mwmVEm xOzW9DeK0vjhV8i8/YqEIZBo6LFEpaqQ7x2gcfzPFNmmGEEEkbbi8Tg3kJ2MxmqGkimL /oXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Jb8LpbQR; 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 94si13746897ple.162.2019.12.21.20.07.20; Sat, 21 Dec 2019 20:07:21 -0800 (PST) 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=Jb8LpbQR; 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 91B217FD00; Sun, 22 Dec 2019 04:07:14 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by mail.openembedded.org (Postfix) with ESMTP id 6CC8B7FCCD for ; Sun, 22 Dec 2019 04:05:59 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id j11so5919306pjs.1 for ; Sat, 21 Dec 2019 20:06:00 -0800 (PST) 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=cVaMU03YXlA2ISyTCpdUFInwpj6K9UmhqFroGVnZdbA=; b=Jb8LpbQR0m/dBmXgsHDE4DhoEw3fEETXma2RpsLeby34g5z5/Om8Cj8RiOYYhTmTTa Pe3gOzLA3wLeWlKzxEwh3zNM6WzZmnpwOu3ZZ+2H6FvbdzwA9GPVMTvhd4TWh0wj6nuQ cOG2mZrP/BI/qziYDVyz0SU+cK3YzGYepaH+bbxsOzIoztLvwU0eLUxLvefpThcusbyy CrsnReA2ikzY54by2JNu1ULaPZB0WOugY/6E+8AZ7/kBczC3+PLn2n7EM/L7KnBlwxv1 0oqF6gyz/0OVBAHMTJGE252INPmRXM2kquu2KHicBLS4mgjsqNOqcKfcOMdVlnV5N5rj d5oQ== 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=cVaMU03YXlA2ISyTCpdUFInwpj6K9UmhqFroGVnZdbA=; b=iGBaJsd69BJmyr43ePU0N6C8CCQhDDtuxjyK74ER/rl+RAfIBhAL05IV6LNgmJ9f6J CpAU2rFkP2zIPt4NKhzwAOBFALlshyjCSknlHy0UW4Xwi1cAZbn/YXX1Xt0P+oAznoFq RTQnhkyP+LiUBHaBpx2/Q3pUt2LeG22yNqvh5Gt7qeHo8OgyyleTDX4EY8hzBrqG9qOG OvBzBB8qc+61s/pOijnHtodEd83EBR3yajNnCOzyuzC7kshDcbz3I1QWqjdwxUInkBk/ gIeVdTn1hUBnPSNMosLW/QlaxQZ4S3ROpI50uBF778kk06iVraGDCdKna0UO9umTOsLK 2JQA== X-Gm-Message-State: APjAAAX3CUvmfkU5/zV+E0tNJK9gHT1HoBe1FSKC6R6QY8gjvcqt626I MrB+a2xbo5uzSakOplv1QrFYIOtI7DU= X-Received: by 2002:a17:90a:234f:: with SMTP id f73mr25908681pje.109.1576987560046; Sat, 21 Dec 2019 20:06:00 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::36e9]) by smtp.gmail.com with ESMTPSA id h16sm18988306pfn.85.2019.12.21.20.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Dec 2019 20:05:59 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 21 Dec 2019 20:05:49 -0800 Message-Id: <20191222040549.286151-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191222040549.286151-1-raj.khem@gmail.com> References: <20191222040549.286151-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 4/4] linux-yocto: Fix build with gcc10 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 Signed-off-by: Khem Raj Cc: Bruce Ashfield --- ...sed-64-Define-__force_order-only-whe.patch | 42 +++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto_5.2.bb | 2 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-kernel/linux/files/0001-x86-boot-compressed-64-Define-__force_order-only-whe.patch -- 2.24.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-kernel/linux/files/0001-x86-boot-compressed-64-Define-__force_order-only-whe.patch b/meta/recipes-kernel/linux/files/0001-x86-boot-compressed-64-Define-__force_order-only-whe.patch new file mode 100644 index 0000000000..bd48de6dd9 --- /dev/null +++ b/meta/recipes-kernel/linux/files/0001-x86-boot-compressed-64-Define-__force_order-only-whe.patch @@ -0,0 +1,42 @@ +From 199caf12cdbe24796dc31fbd4fe5729ba2acf659 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 20 Dec 2019 17:42:02 -0800 +Subject: [PATCH] x86/boot/compressed/64: Define __force_order only when + CONFIG_RANDOMIZE_BASE is unset + +kaslr_64.c also defines the same variable, however when both files are +included into final link, linker complains about multiple definition of +`__force_order' which is coming from kaslr_64.o and pgtable_64.o, its +possible that kaslr_64.o is disabled via CONFIG_RANDOMIZE_BASE config +option, therefore define it conditionally only when +CONFIG_RANDOMIZE_BASE is not set + +Signed-off-by: Khem Raj +Cc: Kirill A. Shutemov +Cc: Kees Cook +Cc: "H. Peter Anvin" +Cc: Ingo Molnar +Cc: Thomas Gleixner +Cc: x86-ml +Cc: Arnd Bergmann +--- + arch/x86/boot/compressed/pgtable_64.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/x86/boot/compressed/pgtable_64.c b/arch/x86/boot/compressed/pgtable_64.c +index c8862696a47b..077d19268b0b 100644 +--- a/arch/x86/boot/compressed/pgtable_64.c ++++ b/arch/x86/boot/compressed/pgtable_64.c +@@ -12,7 +12,9 @@ + * It is not referenced from the code, but GCC < 5 with -fPIE would fail + * due to an undefined symbol. Define it to make these ancient GCCs work. + */ ++#ifndef CONFIG_RANDOMIZE_BASE + unsigned long __force_order; ++#endif + + #define BIOS_START_MIN 0x20000U /* 128K, less than this is insane */ + #define BIOS_START_MAX 0x9f000U /* 640K, absolute maximum */ +-- +2.24.1 + diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb index ff0f547399..5af0924808 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -29,6 +29,8 @@ SRCREV_meta ?= "bd0762cd138f1624b5a5f8669cfa3ac2b71cb87b" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" +SRC_URI += "file://0001-x86-boot-compressed-64-Define-__force_order-only-whe.patch" + LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LINUX_VERSION ?= "5.2.20"