From patchwork Sat Aug 31 05:23:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 172706 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1556799ily; Fri, 30 Aug 2019 22:24:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqxeTbGQPR/VLeigSfs3D6M9crVXcnpsPvg+yuRdvYBiq8rnpT9Tgy/217rMWftoZDLOclXN X-Received: by 2002:a17:902:5a1:: with SMTP id f30mr19822942plf.64.1567229062909; Fri, 30 Aug 2019 22:24:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567229062; cv=none; d=google.com; s=arc-20160816; b=08tgUH+SDNfAZxR99u+XfBkTzQjS6dLS1orPLsJ1JGAxXtM+C0+ziKYFc91Bk74HhI mNMZW+BmkT2YA2QikbsdmcMe2I4fQW+7SHA1cpw/dM61cInV0++rXePPoHgtVaYR8JCR CpK9pWOGM3EUy7gGqsevnrxvWADBCQ/t4eNOMXrJz+BfM2+bwLkF8Vwq0vFqVNJnjhAh P92C0/0MCGAARM/nrRuXEW+yYKGJJ629BNoxL4LWbna4Cd3d06+e3Z0qGev633udw4vu q6d/kbBywGxLj+hmsdw3MbgeD3aM11kmfmdQWD8IPo5+2VgrMHkmpx0idF9bcWYBjwYB vvog== 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=L6CopnRI6v33QsMc9cP5meJuSEHvH2PfAgvcMcg6FVQ=; b=XamFO2jFNm9YAW0dT5ZumR0fd/5kL5V7gEbNCFfF/0qRnT8tc0hFcRSv46vKImc9Iq pjW0TXX8ERKSot/Yy08lWPb1IHk+VV5nR++B3doHpGGl7Ll12I6gz10yRnSNCBf7JOMX 03bap+a+bCWAji/ZJslQfGNZgB8/d+8Zkxt0CnSL+7+5/O8ytHOmmxEAdS2aWBYfKRnN IfwjjfwaxKYQY+Mo9kgApib9D7VehWZHRhtjxU4X8J2AhHM/unus9+b4SrDvCsmY14VB XF8VmgdZAJvySMvHHeVmga58jRA/E/1ma7wxn84boJjSJyFfokFszXZ8CgLov8dlwbGD Ld0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=kgCOqAmn; 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 g1si6516190plg.111.2019.08.30.22.24.22; Fri, 30 Aug 2019 22:24:22 -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=kgCOqAmn; 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 0D4147F493; Sat, 31 Aug 2019 05:24:15 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by mail.openembedded.org (Postfix) with ESMTP id B52D87DDAA for ; Sat, 31 Aug 2019 05:23:26 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id o3so4243432plb.13 for ; Fri, 30 Aug 2019 22:23:28 -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=Oih8fyY0tJfCNxXY88xRO9dFNcGaPxPMjyUw/HSrCyw=; b=kgCOqAmn1XnVI0PS9GaQWKlmCVqY3jv/ZIQ1ktEpNsqzxBvANPyBqkXPZz/M1YgOCA UQ4GB3akofxbMD/qAkIryttLEQqOIN469Svwb9DTTU1SS2OQ8nZCjVtehhMxbIfgtj6Z uBjgKnlOQI1sWBFVOZlIFdrh9m7+AiH0FIZV2pRVICzrrUF7eFZjpaBZl4mJqAbOa45y r5FJGYe7VZmsxRghtWcvJiPVUEPQJxKThU5HlkYbYNTQ9OM7/uu28YQUGwT0xy0iG0Yz ROyT7iUF32GkcNNfVMUssOLAMXFW59SbkKJ7ec+jFrQEJQjKhaxK78f1hCBpzRQ88hrM Eghg== 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=Oih8fyY0tJfCNxXY88xRO9dFNcGaPxPMjyUw/HSrCyw=; b=TLUEk28mJFYjkkT713WKfvnPtWv66+m5ijzj8N3q+2xvvxxmnNf4Cl3eNwPc47xSgk SZONefLzD7Spf6o3xz+P5WCy98Awadhtuu05uz82cz/6qecZTqd2OBQreh2lnyI2WMju 9NYTX+1M0EFfUX8TjJ7oiX9gPRELBU13bjLgDvDaQJ+6OU+7kLliyhNuRPVLz2JKS/Dk BpYWAKc2mIYs0AoIP5KMhNxHnqmQZ+GozrF4ljm9ugkQm0IWTOfx/54pUdMxnCDkFSVY sf7l2otcuxusL/LgfQzkZDTTtnzRMEOehFwBzhZnqZlGX+VYHtwMIANW5BKQ+5g2SIAb KlwA== X-Gm-Message-State: APjAAAX01zE242evc9dS8hiU5Pq7Zutm71vJpsty8UoSlspMg94FSebX k07wkgNMixMCpWux3dFH16PX5aaTbZ0= X-Received: by 2002:a17:902:ab86:: with SMTP id f6mr522049plr.15.1567229007411; Fri, 30 Aug 2019 22:23:27 -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 131sm6493221pge.37.2019.08.30.22.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 22:23:27 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 30 Aug 2019 22:23:13 -0700 Message-Id: <20190831052314.19974-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190831052314.19974-1-raj.khem@gmail.com> References: <20190831052314.19974-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 3/4] gcc: Move STANDARD_STARTFILE_PREFIX_1 and STANDARD_STARTFILE_PREFIX_2 back to gcc.c 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 when compiling for ppc64, build emits additional STANDARD_STARTFILE_PREFIX_1 and STANDARD_STARTFILE_PREFIX_2 into gcc/defaults.h which is not conditional because it really want to override others with this new value, but it ends up with two definitions since it gets emitted _after_ the definition this patch moves to default.h and ends up in duplicate defines. Signed-off-by: Khem Raj --- ...e-target-gcc-headers-can-be-included.patch | 47 +------------------ 1 file changed, 2 insertions(+), 45 deletions(-) -- 2.23.0 -- _______________________________________________ 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/0019-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch index af0ea5c60a..53f9e99d07 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch +++ b/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch @@ -22,8 +22,6 @@ Signed-off-by: Khem Raj gcc/gcc.c | 7 ------- 4 files changed, 15 insertions(+), 7 deletions(-) -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 0064a282488..98d1488171f 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -618,6 +618,7 @@ libexecdir = @libexecdir@ @@ -34,7 +32,7 @@ index 0064a282488..98d1488171f 100644 # Directory in which the compiler finds executables libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) # Directory in which all plugin resources are installed -@@ -2866,6 +2867,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" +@@ -2866,6 +2867,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localed PREPROCESSOR_DEFINES = \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ @@ -42,11 +40,9 @@ index 0064a282488..98d1488171f 100644 -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ -diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c -index c4796385643..980e2bd47a7 100644 --- a/gcc/cppdefault.c +++ b/gcc/cppdefault.c -@@ -59,6 +59,10 @@ const struct default_include cpp_include_defaults[] +@@ -59,6 +59,10 @@ const struct default_include cpp_include /* This is the dir for gcc's private headers. */ { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, #endif @@ -57,42 +53,3 @@ index c4796385643..980e2bd47a7 100644 #ifdef LOCAL_INCLUDE_DIR /* /usr/local/include comes before the fixincluded header files. */ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, -diff --git a/gcc/defaults.h b/gcc/defaults.h -index b7534256119..41ca579b267 100644 ---- a/gcc/defaults.h -+++ b/gcc/defaults.h -@@ -1459,4 +1459,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - #define DWARF_GNAT_ENCODINGS_DEFAULT DWARF_GNAT_ENCODINGS_GDB - #endif - -+/* Default prefixes to attach to command names. */ -+ -+#ifndef STANDARD_STARTFILE_PREFIX_1 -+#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#endif -+#ifndef STANDARD_STARTFILE_PREFIX_2 -+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" -+#endif -+ - #endif /* ! GCC_DEFAULTS_H */ -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 4e7c45b268c..1a3704b2763 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1470,13 +1470,6 @@ static const char *gcc_libexec_prefix; - - /* Default prefixes to attach to command names. */ - --#ifndef STANDARD_STARTFILE_PREFIX_1 --#define STANDARD_STARTFILE_PREFIX_1 "/lib/" --#endif --#ifndef STANDARD_STARTFILE_PREFIX_2 --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" --#endif -- - #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ - #undef MD_EXEC_PREFIX - #undef MD_STARTFILE_PREFIX --- -2.22.1 -