From patchwork Thu Sep 5 01:29:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 173105 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp85061ilq; Wed, 4 Sep 2019 18:30:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5V5vBaMDjYkImGMvwc14izGAQiV2SWGTE5fFOvHvzpVfbAJGX/OSwdq0TNde7CnPyUDTM X-Received: by 2002:a17:90a:734a:: with SMTP id j10mr1118455pjs.63.1567647018036; Wed, 04 Sep 2019 18:30:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567647018; cv=none; d=google.com; s=arc-20160816; b=GsBR2OHV+cHoPa3Q/XK01nfYpbj4LiW4rCaGuTaB0sRJ5lrln39X7h4RhSGaiEbyhY HEFNca3tHygzmGMvBJ/o98U5OlPOWcvquDE39U3Miee10Qaa4mJa3DBYIYOHJyM8MXU5 G6Ni3IF+WHUv4d8I+Cx1t987OzgQrY5+pQ0QhkulwExjJRQOx/ws7G/YJ17VwAqv7Nh7 4DThX5ZL/BXp9ppk08EYl7+CPW0+ZCTch/YNPFqe/lPH+YYizNCfVzoS0SU5lGf0N7jL e2lY+sPHUGm9ZnmjkVrIFyXh6pQdGmqj/1U9jL7uWD8lWsveqN93Lrrf0X1G+co2myoW Vcsw== 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=S5T91vcAPVsoR/xkZPiy16Z/LnP54yTFDf4zv+T2KM4=; b=I8DM5o6PJEESn+nTCPAcYGeME2e17QtsUcCTULaTfEKD0HPzhBHkfIHM81vaEuZ8he iDyTZj3KjHuFXBQwzpUhlDI2FS+OyD1a1rs/E3v+PIiapkZpJHaEIHbNbMmTMqIvlpc4 BjpHXCbvk0MRm3vBqXRfMDWeNLvv2QcvvK7JqOTBk9v0tBNeWXKzdGki77Z/eqVcfPX4 KhG8nzVwe6zUs9CAi1zSzNNu3Ih6oF1r+2L3ItC9zlBf/6NUpZyCgFBOszmChRT5+sRY 3fwoNk1yNXnb3LZh+J0IhhKxGXxav6EaTqVB97WSRtK4vWGTR/+W3ZHtC86uvmLRc60h ZnRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EgvtxWL1; 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 k190si346012pge.308.2019.09.04.18.30.17; Wed, 04 Sep 2019 18:30:18 -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=EgvtxWL1; 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 6AC297F04A; Thu, 5 Sep 2019 01:30:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mail.openembedded.org (Postfix) with ESMTP id 402137D279 for ; Thu, 5 Sep 2019 01:30:09 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id b13so586459pfo.8 for ; Wed, 04 Sep 2019 18:30:10 -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:mime-version :content-transfer-encoding; bh=OGFEp8heO7rSNq+LAnFVl1oYJkYgMXeSMtvnywhU/VU=; b=EgvtxWL1qlCEaNGS/cYIWst3PhEVyTNw85HVIPRi7PEoi40K7MEMpHtBcSLrcj2KgM +wCU3F4kkH76cXQiGDvr6A11/HPK2s2mrS1iivc0vFOpgi7JI1kt7oCA1bNDBJr7Au0G hyCNO0/cDc3kf0MYuGpqmOmoNHRL/hlC2ovetd+rEO8irQUKYKgIJwgELejdavEI6plK i3h3BSlHC6zCF1w6qtw4hvRfiVQ83z0+KgrAry9UoT2dJfF38LJ/BMK1yVnWKVnjjqQo FNRRR0V7MKAKmJVTG4HtAQ76cdS4hekVABkERY0RYeiFeLDMvOZJT1yxaOdMJrGkRLiG TmPQ== 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=OGFEp8heO7rSNq+LAnFVl1oYJkYgMXeSMtvnywhU/VU=; b=YYeQ8nmXoRvEbgiAqPOOyqhDUNW4fYuYNAnwBnZgxaDchaE3pGmlMPIkwfqqByGcnH WGU2T0SqkCV+iDdZ70FGlGv0czgXLyHbBMjUZx69ep2mvW5g0vKf3WAIhEGNRCDRyKPh PTFYgZE1IPhHkvcw1ZfAThFIvi1lTFcH/a23XrNV8WLcVwlc1C38u6yRzO+2bHS/Itmz FyKpjk6cjiy3no5s0k4P/HjJw+8GDZpcaokhejULqvAL0XDOzrvTlZvvub3kL+8gO2SW 9hDsC45yTOKYWPSEqKgFIsSWVKpcn/AiSl2QRXRXUmtTbP6kVL/pAWE8DoDI0j2LGvtj HWQQ== X-Gm-Message-State: APjAAAXv6K7iZOaqDoIufHJ3hNf7WxS7PGHRHnw++N5sfR1RHW6k/wGp nJYojxs2uk/+trbzyjQqH3GKKG6DC6s= X-Received: by 2002:a17:90a:148:: with SMTP id z8mr1131246pje.96.1567647009032; Wed, 04 Sep 2019 18:30:09 -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 v10sm243070pjk.23.2019.09.04.18.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 18:30:08 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 4 Sep 2019 18:29:58 -0700 Message-Id: <20190905012958.5888-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [OE-core] [PATCH] gcc-9.2: Fix risc-v dynamic linker relocation 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 Accidentally dropped in 9.2 update Reported-by: Ricardo Salveti Signed-off-by: Khem Raj --- ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) -- 2.23.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Reviewed-by: Alistair Francis diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index 21908bce9b..66fb24d4cd 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch @@ -1,7 +1,7 @@ -From a93743732b2125aebd9a6d65e999d7506b01d6b3 Mon Sep 17 00:00:00 2001 +From 72fc3975bcd720b2f8040fa87cd23d3db4c5975a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:24:50 +0400 -Subject: [PATCH 11/36] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER +Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER relative to SYSTEMLIBS_DIR This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER @@ -23,11 +23,12 @@ Upstream-Status: Inappropriate [OE configuration] gcc/config/i386/linux64.h | 6 +++--- gcc/config/linux.h | 8 ++++---- gcc/config/mips/linux.h | 12 ++++++------ + gcc/config/riscv/linux.h | 2 +- gcc/config/rs6000/linux64.h | 15 +++++---------- gcc/config/sh/linux.h | 2 +- gcc/config/sparc/linux.h | 2 +- gcc/config/sparc/linux64.h | 4 ++-- - 11 files changed, 28 insertions(+), 33 deletions(-) + 12 files changed, 29 insertions(+), 34 deletions(-) diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h index 824861befec..6afacce3292 100644 @@ -152,6 +153,19 @@ index 6f79ac9c01a..25de96f9561 100644 #undef MUSL_DYNAMIC_LINKER32 #define MUSL_DYNAMIC_LINKER32 \ +diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h +index 58dd18b89f3..112ba9cd764 100644 +--- a/gcc/config/riscv/linux.h ++++ b/gcc/config/riscv/linux.h +@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see + GNU_USER_TARGET_OS_CPP_BUILTINS(); \ + } while (0) + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" + + #define MUSL_ABI_SUFFIX \ + "%{mabi=ilp32:-sf}" \ diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index 9946d3fed94..45a9a7cae59 100644 --- a/gcc/config/rs6000/linux64.h @@ -227,6 +241,3 @@ index 789d1df4bd5..b920c680fb1 100644 #ifdef SPARC_BI_ARCH --- -2.22.1 -