From patchwork Sat Jan 27 17:49:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126052 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp1172863ljd; Sat, 27 Jan 2018 09:50:09 -0800 (PST) X-Google-Smtp-Source: AH8x226lL/HuupESmEx5a/VqXwZYzKK50ZhnxxvNsPmNUjjope2grlH+j7UN+tmvoFGgfs3mDl3F X-Received: by 10.99.164.74 with SMTP id c10mr5376793pgp.18.1517075408943; Sat, 27 Jan 2018 09:50:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517075408; cv=none; d=google.com; s=arc-20160816; b=UmB9I/PsgQvXhoXXGXHEXHhvNYn6+57J+fLoNq+f06x+SA1gnAO8IaRhhO92jerqPT Y6Rg3uPE2c8EiQkeLY19VCXqwTTnT7EFbhu6w7X+YKbt5g2h7AGfRinG9lULMior6Xa1 YRIE7KnA48FqrWLd+cUU7V8P7620+6m8Npz5nvx86q0pcnjngfQq3p0cOJLrJhB9Waej O4kyWJOaJ9h7MOkdfxOpRdsS4kKrzdHRDulfKJmkzItgyQCRhv+i8s12p2rr70r8z0Sl xcOniMluJ97zS/yYriNeE20dLehxqfTOntDnsZXqJRGqtfIGvFcCGucUZL4hvxslTWFF 8Zdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=qk6ED6tEppvxwlHdJBexl1wrRuGtE2vNGZLQzLSyDf8=; b=SVHPQQm96zd34ruu8MNjnUM7Zmb8kMe1xpQPJiMFOe0jQt0DET0QeZnhwkw5knHwgf 6fgP37nylVMFRuBQKAhuaIbF+xWL/ImDuVB3ao2g7TqUmh87xwkGGKX27pWBaEZ/k5Rh ZLOvvBURyYzSGcAQoj5pbXF8/OSod8ZACaR1Q+hG17Gv4p2MCqXsPA4+ULosturMgQjj gphCNImyacINXmxfmHT98lEOuOtvTsh+I31bCRSERSF9EoOMRMh/71LxV7emoagJx8gI Dm3vb5QKDE74EdvKl+UMoY7MO6qlZCuB3cnEmQXL5Gs5HvCHiEpfI2poz5nvRWqfM6zu GnCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AASMqaXL; 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=NONE 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 g1-v6si1267884plm.153.2018.01.27.09.50.08; Sat, 27 Jan 2018 09:50:08 -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=AASMqaXL; 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=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 80EF47883F; Sat, 27 Jan 2018 17:50:04 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id D4F0065CC6 for ; Sat, 27 Jan 2018 17:50:02 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id n17so1849752pgf.10 for ; Sat, 27 Jan 2018 09:50:04 -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; bh=v35w854K3NhsIp8Ly+ZhhmnyOOiN37zvbzt1Q3JapV0=; b=AASMqaXLOI7bx+KI7ixn1zVPcU+qD08y3nf+W8Ef0WvzKTRGpuogcOIM9RD8ZZVRHI xIRVQ8dzGtz8XO7VgFVEHRMtKXfeWqlXADNzu9jH6N5MCqtv+XkeadSaEk46mG9ggjVc EdB+HaCrSBNt3aZdK8qUjeMM2E8LAkPkyDWkIT0AAQk3zUrokT6lWWyLzaum9TkYuUC7 vqfciY8J2yhnDQRPlLO7YIoTKoRA+kX7/xw3Z2LN+KM+zCS6QAaS0Ftc4lfKxBXUvOBt g5siMCFs4QH0N5dNWULBI3XEASJJ8/k7Few537bpjAWz2RnB9kHqQaCTQqB1nYFLMQiz wB7w== 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; bh=v35w854K3NhsIp8Ly+ZhhmnyOOiN37zvbzt1Q3JapV0=; b=iPVydJMAh94rKoBM0KvHYfqyRY6z2+2D6QnnkD791qwb67QuJpbXTKsE/o996qWaMG A8b4YfNisaamcbXcz98+FCdSO2YXd1W4LfMmYuq5bqG2yqvM1c+4JSF63XVGsR+2Rsed SEji708uc9VnArGogIhTPl5S2OZzf8vK6//bP5Q3maHm5DzDGDZc8pzIOKQkYS8o4fJm QkDsU9mtT3revDXUyyxVoDL3UaB0M7J6U1IJpZyChirUGBJ0L6elPwLIflM0xr1vFCTL Vi5hEcGtKjyhVOleS2ziRa569C1BqBCJd03nK71bZGVYG8pPcufyvf8RhNpRo1vViWMr JBOQ== X-Gm-Message-State: AKwxytfqiLmcqYM2bhhAuR4Oday2vZ7upVusYpZHcy1b1NspZTTF65Bq bPvGPJHrYQwOcAPgBOESySVOsQ== X-Received: by 10.101.91.140 with SMTP id i12mr17521738pgr.297.1517075403553; Sat, 27 Jan 2018 09:50:03 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::a8d6]) by smtp.gmail.com with ESMTPSA id y1sm13542938pge.78.2018.01.27.09.50.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Jan 2018 09:50:02 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sat, 27 Jan 2018 09:49:55 -0800 Message-Id: <20180127174955.39473-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 Subject: [OE-core] [PATCH] gcc-7.3: Drop upstreamed musl cpuinfo patch 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This patch is already in gcc-7-branch https://github.com/gcc-mirror/gcc/commit/6e6c7fc1e15525a10f48d4f5ac2edd853e2f5cb7 Thanks nsz for noticing it Signed-off-by: Khem Raj --- meta/recipes-devtools/gcc/gcc-7.3.inc | 1 - ...e-alias-for-__cpu_indicator_init-instead-.patch | 85 ---------------------- 2 files changed, 86 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-7.3/0046-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch -- 2.16.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-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc index efa62eaf6a..724f9c32a0 100644 --- a/meta/recipes-devtools/gcc/gcc-7.3.inc +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc @@ -70,7 +70,6 @@ SRC_URI = "\ file://0043-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch \ file://0044-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch \ file://0045-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ - file://0046-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ file://0047-sync-gcc-stddef.h-with-musl.patch \ file://0048-gcc-Enable-static-PIE.patch \ file://fix-segmentation-fault-precompiled-hdr.patch \ diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0046-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc-7.3/0046-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch deleted file mode 100644 index f6b2829364..0000000000 --- a/meta/recipes-devtools/gcc/gcc-7.3/0046-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch +++ /dev/null @@ -1,85 +0,0 @@ -From c7bce03a625fe2215a13f520850604178103ddd7 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy -Date: Sat, 24 Oct 2015 20:09:53 +0000 -Subject: [PATCH 46/47] libgcc_s: Use alias for __cpu_indicator_init instead of - symver - -Adapter from - -https://gcc.gnu.org/ml/gcc-patches/2015-05/msg00899.html - -This fix was debated but hasnt been applied gcc upstream since -they expect musl to support '@' in symbol versioning which is -a sun/gnu versioning extention. This patch however avoids the -need for the '@' symbols at all - -libgcc/Changelog: - -2015-05-11 Szabolcs Nagy - - * config/i386/cpuinfo.c (__cpu_indicator_init_local): Add. - (__cpu_indicator_init@GCC_4.8.0, __cpu_model@GCC_4.8.0): Remove. - - * config/i386/t-linux (HOST_LIBGCC2_CFLAGS): Remove -DUSE_ELF_SYMVER. - -gcc/Changelog: - -2015-05-11 Szabolcs Nagy - - * config/i386/i386.c (ix86_expand_builtin): Make __builtin_cpu_init - call __cpu_indicator_init_local instead of __cpu_indicator_init. - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - gcc/config/i386/i386.c | 4 ++-- - libgcc/config/i386/cpuinfo.c | 6 +++--- - libgcc/config/i386/t-linux | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index dec3aee0048..0452dcfcb8d 100644 ---- a/gcc/config/i386/i386.c -+++ b/gcc/config/i386/i386.c -@@ -36918,10 +36918,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, - { - case IX86_BUILTIN_CPU_INIT: - { -- /* Make it call __cpu_indicator_init in libgcc. */ -+ /* Make it call __cpu_indicator_init_local in libgcc.a. */ - tree call_expr, fndecl, type; - type = build_function_type_list (integer_type_node, NULL_TREE); -- fndecl = build_fn_decl ("__cpu_indicator_init", type); -+ fndecl = build_fn_decl ("__cpu_indicator_init_local", type); - call_expr = build_call_expr (fndecl, 0); - return expand_expr (call_expr, target, mode, EXPAND_NORMAL); - } -diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c -index a1dc011525f..dac5e889abf 100644 ---- a/libgcc/config/i386/cpuinfo.c -+++ b/libgcc/config/i386/cpuinfo.c -@@ -391,7 +391,7 @@ __cpu_indicator_init (void) - return 0; - } - --#if defined SHARED && defined USE_ELF_SYMVER --__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0"); --__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0"); -+#ifndef SHARED -+int __cpu_indicator_init_local (void) -+ __attribute__ ((weak, alias ("__cpu_indicator_init"))); - #endif -diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux -index 11bb46e0ee4..4f47f7bfa59 100644 ---- a/libgcc/config/i386/t-linux -+++ b/libgcc/config/i386/t-linux -@@ -3,4 +3,4 @@ - # t-slibgcc-elf-ver and t-linux - SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver - --HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER -+HOST_LIBGCC2_CFLAGS += -mlong-double-80 --- -2.12.2 -