From patchwork Sun Oct 3 12:40:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1535812 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=RqQioDY3; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HMk3H4FShz9sX3 for ; Sun, 3 Oct 2021 23:40:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 80692424F5; Sun, 3 Oct 2021 12:40:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DY3Zr6rI24SX; Sun, 3 Oct 2021 12:40:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id A9DFC4256C; Sun, 3 Oct 2021 12:40:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 91D681BF327 for ; Sun, 3 Oct 2021 12:40:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7F96E4256C for ; Sun, 3 Oct 2021 12:40:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O1sd5YW5I5t2 for ; Sun, 3 Oct 2021 12:40:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by smtp4.osuosl.org (Postfix) with ESMTPS id 60C1C424F5 for ; Sun, 3 Oct 2021 12:40:34 +0000 (UTC) Received: by mail-wr1-x433.google.com with SMTP id v17so24954275wrv.9 for ; Sun, 03 Oct 2021 05:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=F7V8VidC0RWV8T9ZJ68mtl2Dfi4iK3tP2O8vLkXyLoc=; b=RqQioDY3zrkCl2n3LZw1tMP+dVvBvi/8YLFPlgK7az3WkNnwRYgLpx+cVcB+R4u/KC WoLDH5MOyJb0N2GbLhIfmhGmiAFtUlgt1W03P2XTfuJ79ve+3i8JeJRwX6fJOcE8vwDS Iu56lWjW1kOR44Orh+V9b50/mNO4lJIFZ7CnmLdK76ACLFK7wO0g5HQIO2YEoV3Gh8FE XbMwUnC3FtLuxWtkDo2KwcQbF3VE+7rvO8esfxS8J8sQymJGWOjC4DCV8DWGKePfA67A SqTFx0yvm1HfTxhqvf7Sr1pZ+mL52GFEPjRkqvvNTY1YRyhDD20BTGM9EaOHB7yOGeaH Bbrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=F7V8VidC0RWV8T9ZJ68mtl2Dfi4iK3tP2O8vLkXyLoc=; b=vHNhrx1uWpn6zYyJJiLCyAls75TJWPJBo6eDsFY83U0pDN/lGJDn/+7698KwvkVM9f FPxCvi5Uhl76u0EoN0lCrHTq7aWjyhgKSrelIA79JZOAiNKzMahZzW69U1PfGahCGmFV zmhDyHz5BHERdBevM6RsWs2qwDmqxXDBqcB6QN1Hz96KQ5wpPOMw3BUgbQBm9XC0P9w7 VszXFvvzX3HWfxl3yqImRgMezfU1AKs7Zu0Sey7Tc/8cpO3VtK5HcISmKFpb3CTcvJJL EdJq37qkTmrYIqJk2fzEi8K6eC5HwKSxo8DV0VM6bIyVWToiOPl0cr2MPFLysSMsXZfx otmA== X-Gm-Message-State: AOAM5302l6GJz4d4Zkz6fZUizV1Bb2r3Yb7JWvfyFBVvSnV6j6IP62xJ S1ejw9XKhn6fqvFyGoFy/3aWyfPdyM4= X-Google-Smtp-Source: ABdhPJxX8sTJ1VGYaSMZWi0G9VRG1nCgczl7rbAjoo7XpX9s5LJScEmKInwTctw9vnbEL57vhzy+Zg== X-Received: by 2002:a5d:5986:: with SMTP id n6mr8355725wri.75.1633264832435; Sun, 03 Oct 2021 05:40:32 -0700 (PDT) Received: from localhost.localdomain (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id 143sm1258704wma.37.2021.10.03.05.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 05:40:32 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 3 Oct 2021 14:40:23 +0200 Message-Id: <20211003124027.343390-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Thomas Petazzoni , Guo Ren Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" We are going to remove the gcc fork for csky since it doesn't build with the latest compilers (gcc 8, 10, 11 tested) [1]. Removing theses defconfigs and the csky gcc fork has become unavoidable since the Buildroot Docker image used by the gitlab CI will switch soon to Debian bullseye soon [2]. The cksy gcc fork based on gcc 6 has not been updated since it has been added to Buildroot [3]. Since then, csky has been added to binutils and gcc but using the latest upstream version (binutils 2.37 and gcc 11) is not yet possible due to build issue with glibc 2.34 [4]. Moreover, qemu_csky defconfigs was to be used with the csky qemu fork (based on Qemu 3.x) added by commit [5] and removed by commit [6]. Since then it's not possible to do a runtime test with theses defconfigs. Theses defconfigs can be added back later if the csky toolchain support is fixed and csky supported by upstream Qemu. [1] http://lists.busybox.net/pipermail/buildroot/2021-August/621504.html [2] 71b83227128be62c169313e85bb8f339f977ad67 [3] 7873a5bd5ebbeb1674293dae6b06b50f0a1f2184 [4] http://lists.busybox.net/pipermail/buildroot/2021-October/624596.html [5] f816e5b276f1ef15840bec6667f1e8219717ab7d [6] 58af9a70cc0f195116dedb3fd0e2ca5b4fec9e70 Signed-off-by: Romain Naour Cc: Guo Ren Cc: Thomas Petazzoni --- board/qemu/csky/linux-ck610.config.fragment | 6 ------ board/qemu/csky/linux-ck807.config.fragment | 5 ----- board/qemu/csky/linux-ck810.config.fragment | 5 ----- board/qemu/csky/linux-ck860.config.fragment | 9 --------- board/qemu/csky/readme.txt | 15 --------------- configs/qemu_csky610_virt_defconfig | 20 -------------------- configs/qemu_csky807_virt_defconfig | 20 -------------------- configs/qemu_csky810_virt_defconfig | 20 -------------------- configs/qemu_csky860_virt_defconfig | 20 -------------------- 9 files changed, 120 deletions(-) delete mode 100644 board/qemu/csky/linux-ck610.config.fragment delete mode 100644 board/qemu/csky/linux-ck807.config.fragment delete mode 100644 board/qemu/csky/linux-ck810.config.fragment delete mode 100644 board/qemu/csky/linux-ck860.config.fragment delete mode 100644 board/qemu/csky/readme.txt delete mode 100644 configs/qemu_csky610_virt_defconfig delete mode 100644 configs/qemu_csky807_virt_defconfig delete mode 100644 configs/qemu_csky810_virt_defconfig delete mode 100644 configs/qemu_csky860_virt_defconfig diff --git a/board/qemu/csky/linux-ck610.config.fragment b/board/qemu/csky/linux-ck610.config.fragment deleted file mode 100644 index b690c7d6ec..0000000000 --- a/board/qemu/csky/linux-ck610.config.fragment +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_COMPILE_TEST=y -CONFIG_CPU_CK610=y -CONFIG_CPU_PM_WAIT=y -CONFIG_RAM_BASE=0x10000000 -CONFIG_CSKY_APB_INTC=y -CONFIG_GX6605S_TIMER=y diff --git a/board/qemu/csky/linux-ck807.config.fragment b/board/qemu/csky/linux-ck807.config.fragment deleted file mode 100644 index b6974f0157..0000000000 --- a/board/qemu/csky/linux-ck807.config.fragment +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_COMPILE_TEST=y -CONFIG_CPU_CK807=y -# CONFIG_CPU_HAS_FPU is not set -CONFIG_CPU_PM_WAIT=y -CONFIG_CSKY_APB_INTC=y diff --git a/board/qemu/csky/linux-ck810.config.fragment b/board/qemu/csky/linux-ck810.config.fragment deleted file mode 100644 index 50fa1f4f79..0000000000 --- a/board/qemu/csky/linux-ck810.config.fragment +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_COMPILE_TEST=y -CONFIG_CPU_CK810=y -# CONFIG_CPU_HAS_FPU is not set -CONFIG_CPU_PM_WAIT=y -CONFIG_CSKY_APB_INTC=y diff --git a/board/qemu/csky/linux-ck860.config.fragment b/board/qemu/csky/linux-ck860.config.fragment deleted file mode 100644 index e8f6af10ba..0000000000 --- a/board/qemu/csky/linux-ck860.config.fragment +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG_COMPILE_TEST=y -CONFIG_CPU_CK860=y -# CONFIG_CPU_HAS_FPU is not set -CONFIG_CPU_PM_WAIT=y -CONFIG_SMP=y -CONFIG_HOTPLUG_CPU=y -CONFIG_CSKY_APB_INTC=y -CONFIG_CSKY_MPINTC=y -CONFIG_CSKY_MP_TIMER=y diff --git a/board/qemu/csky/readme.txt b/board/qemu/csky/readme.txt deleted file mode 100644 index 5e4cb1871c..0000000000 --- a/board/qemu/csky/readme.txt +++ /dev/null @@ -1,15 +0,0 @@ -Run with qemu: - -For ck860 smp: - qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux # qemu_csky860_virt_defconfig - -For ck807: - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky807_virt_defconfig - -For ck810: - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky810_virt_defconfig - -For ck610: - qemu-system-cskyv1 -M virt -nographic -kernel vmlinux # qemu_csky610_virt_defconfig - -The login prompt will appear in the terminal that started Qemu. Username is root and no password. diff --git a/configs/qemu_csky610_virt_defconfig b/configs/qemu_csky610_virt_defconfig deleted file mode 100644 index e7d75f5f49..0000000000 --- a/configs/qemu_csky610_virt_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck610=y - -# System -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# linux kernel header, the same version with linux kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" diff --git a/configs/qemu_csky807_virt_defconfig b/configs/qemu_csky807_virt_defconfig deleted file mode 100644 index df12450a55..0000000000 --- a/configs/qemu_csky807_virt_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck807=y - -# System -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# linux kernel header, the same version with linux kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck807.config.fragment" diff --git a/configs/qemu_csky810_virt_defconfig b/configs/qemu_csky810_virt_defconfig deleted file mode 100644 index dd1fd329f5..0000000000 --- a/configs/qemu_csky810_virt_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck810=y - -# System -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# linux kernel header, the same version with linux kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck810.config.fragment" diff --git a/configs/qemu_csky860_virt_defconfig b/configs/qemu_csky860_virt_defconfig deleted file mode 100644 index 6edfba4e8e..0000000000 --- a/configs/qemu_csky860_virt_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck860=y - -# System -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# linux kernel header, the same version with linux kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck860.config.fragment" From patchwork Sun Oct 3 12:40:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1535813 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=WSFkyYeR; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HMk3S5qhlz9sX3 for ; Sun, 3 Oct 2021 23:40:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 31ABE84812; Sun, 3 Oct 2021 12:40:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bjZJ8g0yCalC; Sun, 3 Oct 2021 12:40:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 94E37847FF; Sun, 3 Oct 2021 12:40:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id DF03B1BF327 for ; Sun, 3 Oct 2021 12:40:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D68ED402A2 for ; Sun, 3 Oct 2021 12:40:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nkYwhgeBhvWR for ; Sun, 3 Oct 2021 12:40:35 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8B2F5400F1 for ; Sun, 3 Oct 2021 12:40:35 +0000 (UTC) Received: by mail-wm1-x336.google.com with SMTP id j10-20020a1c230a000000b0030d523b6693so5950128wmj.2 for ; Sun, 03 Oct 2021 05:40:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hLV+EGeMI5H1jc7bbaA3+A5kqu8Y4s4JC4Ui+wsLRlo=; b=WSFkyYeReAnYEE/JxN0D6LmUISIy2uXMNw1CleJkpg4BuZG6zkhCQLaL05Swue7yms 83OQFDbZSMr3KQdAT/dL+Y74wc0+/e3p2gA3cAo4xmPGr33l26pMroEAJD98sgD15Zv0 M5On4ZGK+m1QFP6swqHEWNjHxF7dl1MbeYO/3wTUvIpQPfVbHweVmeEaT1NUMPqWfX09 kHdlds4ubSbi32M2qH6SY5ICM8+DakfHnnu+0Y8/TD5nIKi1/y6vwWimXbGC/cj61897 YqMda8CUGVFYBIuENTefbWlOo02dGYcSEK+ElwTfnpHxigmNFvZ9UE8z/FR5icYIhnZh 9D6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hLV+EGeMI5H1jc7bbaA3+A5kqu8Y4s4JC4Ui+wsLRlo=; b=KcbHDORvR/YKoMkxxLQORe87kpw9P0T1CtyRr81LBjGztJZa+9+YuHJ18xoYQUWNY8 yhxPxLXQhWfmYERN/2A5M1L3ZWg+4Ew40JSvfKcnme1bPLO+7vnLw8mCwC1Onj7CiBa2 4CRTskPiTNvXdNmUhefF5hte6RHXgxWJQC6NOWMRIQaFk4SFMQWoUDxL48RTZsDai3Ae vecFPOUMfX6pdobyTEpPVpk70F0ep91fCzeJDPGgccpiuTHPRau5NG17gSJel9lgjH0w gPFo5L9lK3IFY+ROECvzkdA1KXXggrdpoX4kok+1URGqRTuE9/8PiUX+g3+FOzdGH+as B7Sw== X-Gm-Message-State: AOAM5314Zd6zj3dGgjs16TqlLz18lVPxnkyH70U8I6bPmA97O8uDyAkd 43jwhe4BmeFCIs66NXtE1TEmoR2FtNk= X-Google-Smtp-Source: ABdhPJxKK1q8qTu+/gthRXsr7Q307XZ8YnJUnVOqIeQus9/jXKz4rOBSqgyk4Q+xrCsfphHQ9Pmkqw== X-Received: by 2002:a1c:21d7:: with SMTP id h206mr8544016wmh.163.1633264833539; Sun, 03 Oct 2021 05:40:33 -0700 (PDT) Received: from localhost.localdomain (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id 143sm1258704wma.37.2021.10.03.05.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 05:40:33 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 3 Oct 2021 14:40:24 +0200 Message-Id: <20211003124027.343390-2-romain.naour@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211003124027.343390-1-romain.naour@gmail.com> References: <20211003124027.343390-1-romain.naour@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/5] arch/Config.in: disable internal toolchain backend for csky X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Thomas Petazzoni , Guo Ren Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" We are going to remove the gcc fork for csky, first disable the internal toolchain backend. Signed-off-by: Romain Naour Cc: Guo Ren Cc: Thomas Petazzoni --- arch/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Config.in b/arch/Config.in index 1853e26bb4..ab40294ddc 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -77,6 +77,7 @@ config BR2_aarch64_be config BR2_csky bool "csky" + select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT select BR2_ARCH_HAS_MMU_MANDATORY # Most variants are supported by gcc-9+, except one that is # handled as a special exception in package/gcc/Config.in.host From patchwork Sun Oct 3 12:40:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1535814 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=lGvOLVas; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HMk3h10Ltz9sX3 for ; Sun, 3 Oct 2021 23:41:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B5CCE42590; Sun, 3 Oct 2021 12:41:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0ENu89dYywBC; Sun, 3 Oct 2021 12:41:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 05935426BD; Sun, 3 Oct 2021 12:40:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id BE5421BF327 for ; Sun, 3 Oct 2021 12:40:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B9E11402A2 for ; Sun, 3 Oct 2021 12:40:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FgW9nzV7bYjd for ; Sun, 3 Oct 2021 12:40:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by smtp2.osuosl.org (Postfix) with ESMTPS id 5936340269 for ; Sun, 3 Oct 2021 12:40:36 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id s21so24914992wra.7 for ; Sun, 03 Oct 2021 05:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WZv733Z/KVqp3WZaIkqGluzn3VgGgCtQ7GMwI9Tf4ms=; b=lGvOLVasHd2AI8WCKOvtt9ZnYd6E44/Ecub7xxhv9TaPzi+5udv7LWgc6X5ktI9+pF VMsMYhWJL1ZatMskdEbeKU1JHsh8zkWMQ4Xqb9ep0XFur4j1JCHjvhPyl1BiBjNfnwu6 2XT7gUTNpI6E6BcB/6mQfJPmedz8k1Lm45PkvJmiGrZwHoqmjklfVUvapPsYAddb3Qe/ L6wka+Z2PCROXaG1cAC18jSEvkWtkgj/8aY53EFIorDqny0OVFzgq0Bwo4P9yZ1Tj1y0 5D3z05buKR8bRLWsmaRJdhj52ukzBYSZZiig1rDjuRMG9Qapf+LUNWJZGXKlCraz2Cyo 2xyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WZv733Z/KVqp3WZaIkqGluzn3VgGgCtQ7GMwI9Tf4ms=; b=Z9jr72xP3w4ZRG0+zxCDZ6tzRdDPKP0GnWVZ7lw+YH0u+T9KUHtHvkQSC3e42XZcQR WdbsCZfpqeCLc46PNzBfd2OVVcSFcCrHxmnxWUFxcsfdCUDANOXxfFFLDctSqUGmgpnt BMjGbNe4fHG0pqMgwn5G8JuGj+0G+ZIy6+LLCdOc9qWzxU9IKjwenfnoPStbdLtwdqnl w1twfy5jYkkQBPGZcwjbhGxlm6GIIYlHXXgUkpkD2oJzHEojVN0XPeCpscWgWKTkW5yc f0VwlxBP5aiBTbO7aYI2UzuknFXGVKYYBPpzs4uT4gstooTWqRatZD+94HRMEkmP53NA 2NNQ== X-Gm-Message-State: AOAM530sgdfeyqhH4OLKynkkcRX/GHf3HRSGb5isr5U3C46Ts51hySQS R0QZvQyummd/tZMePdIyZmhsP2csrus= X-Google-Smtp-Source: ABdhPJxJwTUSB4BpB5eKhyMkoTlv0G8iXBd3QtCgZCuDOWQAVHWtGdAeIlCyYYNE3rqR/qk1frTfbg== X-Received: by 2002:adf:9b97:: with SMTP id d23mr7079753wrc.135.1633264834505; Sun, 03 Oct 2021 05:40:34 -0700 (PDT) Received: from localhost.localdomain (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id 143sm1258704wma.37.2021.10.03.05.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 05:40:34 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 3 Oct 2021 14:40:25 +0200 Message-Id: <20211003124027.343390-3-romain.naour@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211003124027.343390-1-romain.naour@gmail.com> References: <20211003124027.343390-1-romain.naour@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/5] package/glibc: remove glibc csky fork X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Thomas Petazzoni , Guo Ren Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Before removing csky gcc fork, remove the glibc fork. csky support has been merged in glibc 2.29 [1]. [1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=5f72b00591ce4d1b4c0418294ffe1623983d5679 Signed-off-by: Romain Naour Cc: Guo Ren Cc: Thomas Petazzoni --- .../7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash | 2 -- package/glibc/glibc.mk | 5 ----- 2 files changed, 7 deletions(-) delete mode 100644 package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash diff --git a/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash b/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash deleted file mode 100644 index a61bd65f80..0000000000 --- a/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated (fetched from https://github.com/c-sky/glibc) -sha512 9deb2deceefe347d72de13510a5baa3de00f94c684f3b25e136ca3660f61e65a69f2115abb488c2ab0fa93cda8535853ce1e13e186efcc8434ecc4049efd82b5 glibc-7630ed2fa60caea98f500e4a7a51b88f9bf1e176.tar.gz diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index c911c29554..3862e0624b 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -4,10 +4,6 @@ # ################################################################################ -ifeq ($(BR2_csky),y) -GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176 -GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION)) -else # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef @@ -19,7 +15,6 @@ GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 # *NEVER* decide on a version string by looking at the mirror. # Then check that the mirror has been synced already (happens once a day.) GLIBC_SITE = $(call github,bminor,glibc,$(GLIBC_VERSION)) -endif GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES From patchwork Sun Oct 3 12:40:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1535815 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Q4LwFZJy; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HMk3w06ZXz9sX3 for ; Sun, 3 Oct 2021 23:41:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C38B3847FB; Sun, 3 Oct 2021 12:41:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d79YETZ-3PoT; Sun, 3 Oct 2021 12:41:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id B7C0C8481E; Sun, 3 Oct 2021 12:41:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 366A81BF327 for ; Sun, 3 Oct 2021 12:40:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 253B840269 for ; Sun, 3 Oct 2021 12:40:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gJktvRMFeiHD for ; Sun, 3 Oct 2021 12:40:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by smtp2.osuosl.org (Postfix) with ESMTPS id 7B94D400F1 for ; Sun, 3 Oct 2021 12:40:37 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id e12so4735566wra.4 for ; Sun, 03 Oct 2021 05:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K0Y3QLMXNH0pTuUKAcC5jKt0eOohftW7stx1RcUHnqo=; b=Q4LwFZJy4ljYmz1GkDnGRAn9xBKgTaj51dU9vkd337qNpmpf2aLp3uxQjj9cztHm9w ITx9qymmmDMfoCaQFp7Q0pTFF8JPOAJZOsi6qJIxkAwz3Bc6loj9p5k862VGf7YL9vBB V7FDv2HKkbtcGyYwlsxXh5r1OhgHSTDYKDICTVdP4OESQlN9UTpKQAERwuFU4p1chl2s JCSv1V+nk/I/5IeULcdjwmIhswZy47oH3ue/rMOjNlz5s0oSos91uscw+I9P5gEllnQY IPbxvjPjHl9OV9eplfyDDeVkIzcUaZuvDSfN6GOeTOOify+WW2waXWRtfqF4Uz2ZqfuP HHHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K0Y3QLMXNH0pTuUKAcC5jKt0eOohftW7stx1RcUHnqo=; b=7NgcIpmMBOn11zJwHXbNnnH+IUPXVJrzQoV2PDcFUnXsQMXk7VvZhc9FmQzuNh4aYE zKFeSdcWEggGXuGx2hZDkqm0yPqCUxzdi698qNi9x4jP7EUqoqbJCbQbJOoMVh7j6D6N qB+gbscSeSLgN1Ih7eV7e8ktP7jklIvmdMpweoTWzOesQKHHGL1XWa4vpFeV7kBVzo3q xZJc0TFTH7sD11CuNq5xKzlnoTeI7KL6lVsK3zKj15z2aIu2iW6dn/tFnTYN7dWp/eFG 7jHfWPmt4LE/JRQE0uzn0YY4pIYblxgiVvX3unfeEylCks76o4r0dh1MUcmVGlPTLwEl qFaw== X-Gm-Message-State: AOAM5315nb1bXZwchFUrM1MX8Me3Bnod2NWQk1tGeR3dPQVEc4Y9FT9z MME8R1v+TE7JFowfRREB8vAvmIWpDJQ= X-Google-Smtp-Source: ABdhPJyZA7ougezcXDrR3O/6l2lR/cSFH5lGuVMWZZJYujOYWEL2MuvpW4Z8TFpE8kBRRP7F9NI+DA== X-Received: by 2002:adf:f48d:: with SMTP id l13mr8197655wro.94.1633264835508; Sun, 03 Oct 2021 05:40:35 -0700 (PDT) Received: from localhost.localdomain (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id 143sm1258704wma.37.2021.10.03.05.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 05:40:35 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 3 Oct 2021 14:40:26 +0200 Message-Id: <20211003124027.343390-4-romain.naour@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211003124027.343390-1-romain.naour@gmail.com> References: <20211003124027.343390-1-romain.naour@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/5] package/gcc: remove csky version X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Thomas Petazzoni , Guo Ren Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Remove gcc csky fork since it doesn't build with the latest compilers (gcc 8, 10, 11 tested) [1]. Removing the csky gcc fork has become unavoidable since the Buildroot Docker image used by the gitlab CI will switch soon to Debian bullseye soon [2]. The csky support for csky807 and csky810 has been upstreamed in gcc 10 [3] and csky860 will be supported by gcc 12 [4]. There is no info about the csky610. Although the csky architecture is supported since gcc 10, the support was not enabled in Buildroot. [1] http://lists.busybox.net/pipermail/buildroot/2021-August/621504.html [2] 71b83227128be62c169313e85bb8f339f977ad67 [3] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=cc7232b999b8336cf4e261407ed9289c77bed1f0 [4] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=db92bd223e3957ee58b5a0c0fffd8b7766f1def3 Signed-off-by: Romain Naour Cc: Guo Ren Cc: Thomas Petazzoni --- Config.in.legacy | 6 + arch/Config.in | 2 - ...er-Remove-cyclades-from-libsanitizer.patch | 121 ------------------ package/gcc/Config.in.host | 12 -- package/gcc/gcc.hash | 2 - package/gcc/gcc.mk | 3 - 6 files changed, 6 insertions(+), 140 deletions(-) delete mode 100644 package/gcc/48152afb96c59733d5bc79e3399bb7b3d4b44266/0001-libsanitizer-Remove-cyclades-from-libsanitizer.patch diff --git a/Config.in.legacy b/Config.in.legacy index 9f1f7687fb..2ce455c633 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2021.11" +config BR2_GCC_VERSION_CSKY + bool "gcc csky version removed" + select BR2_LEGACY + help + Support for gcc csky version has been removed. + config BR2_PACKAGE_STRONGSWAN_EAP bool "strongswan EAP plugins now individually selectable" select BR2_LEGACY diff --git a/arch/Config.in b/arch/Config.in index ab40294ddc..d50718e2d4 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -79,8 +79,6 @@ config BR2_csky bool "csky" select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT select BR2_ARCH_HAS_MMU_MANDATORY - # Most variants are supported by gcc-9+, except one that is - # handled as a special exception in package/gcc/Config.in.host select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 help csky is processor IP from china. diff --git a/package/gcc/48152afb96c59733d5bc79e3399bb7b3d4b44266/0001-libsanitizer-Remove-cyclades-from-libsanitizer.patch b/package/gcc/48152afb96c59733d5bc79e3399bb7b3d4b44266/0001-libsanitizer-Remove-cyclades-from-libsanitizer.patch deleted file mode 100644 index 9e6c4cfd03..0000000000 --- a/package/gcc/48152afb96c59733d5bc79e3399bb7b3d4b44266/0001-libsanitizer-Remove-cyclades-from-libsanitizer.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 0d2ee4f3a8cd3516f2c5c2f06373f8a32fd77b9d Mon Sep 17 00:00:00 2001 -From: Tamar Christina -Date: Fri, 21 May 2021 12:16:56 +0100 -Subject: [PATCH] libsanitizer: Remove cyclades from libsanitizer - -The Linux kernel has removed the interface to cyclades from -the latest kernel headers[1] due to them being orphaned for the -past 13 years. - -libsanitizer uses this header when compiling against glibc, but -glibcs itself doesn't seem to have any references to cyclades. - -Further more it seems that the driver is broken in the kernel and -the firmware doesn't seem to be available anymore. - -As such since this is breaking the build of libsanitizer (and so the -GCC bootstrap[2]) I propose to remove this. - -[1] https://lkml.org/lkml/2021/3/2/153 -[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379 - -libsanitizer/ChangeLog: - - PR sanitizer/100379 - * sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry-pick - llvm-project revision f7c5351552387bd43f6ca3631016d7f0dfe0f135. - * sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise. - * sanitizer_common/sanitizer_platform_limits_posix.h: Likewise. ---- - .../sanitizer_common_interceptors_ioctl.inc | 9 --------- - .../sanitizer_platform_limits_posix.cc | 11 ----------- - .../sanitizer_platform_limits_posix.h | 10 ---------- - 3 files changed, 30 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -index 6c5fda09fbf..8f9314142b6 100755 ---- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -358,15 +358,6 @@ static void ioctl_table_fill() { - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -index 9866cc9e17a..5277407aec7 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -156,7 +156,6 @@ typedef struct user_fpregs elf_fpregset_t; - #endif - #include - #include --#include - #include - #include - #include -@@ -439,7 +438,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -806,15 +804,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index b6f90eb3a74..ae3a938344d 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -949,7 +949,6 @@ struct __sanitizer_cookie_io_functions_t { - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; -- extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1294,15 +1293,6 @@ struct __sanitizer_cookie_io_functions_t { - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- extern unsigned IOCTL_CYGETDEFTHRESH; -- extern unsigned IOCTL_CYGETDEFTIMEOUT; -- extern unsigned IOCTL_CYGETMON; -- extern unsigned IOCTL_CYGETTHRESH; -- extern unsigned IOCTL_CYGETTIMEOUT; -- extern unsigned IOCTL_CYSETDEFTHRESH; -- extern unsigned IOCTL_CYSETDEFTIMEOUT; -- extern unsigned IOCTL_CYSETTHRESH; -- extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; --- -2.31.1 - diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 2b7f88154e..aa2665cbee 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -3,7 +3,6 @@ comment "GCC Options" choice prompt "GCC compiler Version" default BR2_GCC_VERSION_ARC if BR2_arc - default BR2_GCC_VERSION_CSKY if BR2_csky default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE default BR2_GCC_VERSION_10_X help @@ -15,12 +14,6 @@ config BR2_GCC_VERSION_ARC depends on BR2_arc select BR2_TOOLCHAIN_GCC_AT_LEAST_9 -config BR2_GCC_VERSION_CSKY - bool "gcc csky" - # Only supported architecture - depends on BR2_csky - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - config BR2_GCC_VERSION_POWERPC_SPE bool "gcc powerpc spe" # powerpc spe support has been deprecated since gcc 8.x. @@ -57,10 +50,6 @@ config BR2_GCC_VERSION_11_X # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_powerpc_SPE - # C-SKY sk610 needs abiv1, which is not supported in - # upstream gcc. C-SKY gcc upstream support not tested - # with upstream binutils and glibc. - depends on !BR2_csky # uClibc-ng broken on sparc due to recent gcc changes # that need to be reverted since gcc 8.4, 9.3 and 10.1. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 @@ -94,7 +83,6 @@ config BR2_GCC_VERSION default "10.3.0" if BR2_GCC_VERSION_10_X default "11.2.0" if BR2_GCC_VERSION_11_X default "arc-2020.09-release" if BR2_GCC_VERSION_ARC - default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index b37307ebe3..5655c7a9d7 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -11,5 +11,3 @@ sha512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a614 sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz -# Locally calculated (fetched from https://github.com/c-sky/gcc) -sha512 1c3564fd6573dce13451a73015e7d88fecbb214dc1df96607976255b1d8b9e60318405333f4f218eea8d07e3675a802b66eff6df3921d505c4036481512792c2 gcc-48152afb96c59733d5bc79e3399bb7b3d4b44266.tar.gz diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index ed9b93e50f..fcc352aa25 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -13,9 +13,6 @@ GCC_VERSION = $(call qstrip,$(BR2_GCC_VERSION)) ifeq ($(BR2_GCC_VERSION_ARC),y) GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION)) GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz -else ifeq ($(BR2_GCC_VERSION_CSKY),y) -GCC_SITE = $(call github,c-sky,gcc,$(GCC_VERSION)) -GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz else GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION) GCC_SOURCE = gcc-$(GCC_VERSION).tar.xz From patchwork Sun Oct 3 12:40:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1535816 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=MDMd26fg; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HMk480c7Cz9sX3 for ; Sun, 3 Oct 2021 23:41:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id ACAE340269; Sun, 3 Oct 2021 12:41:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14m7CRQ9vwBa; Sun, 3 Oct 2021 12:41:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 89A54402A2; Sun, 3 Oct 2021 12:41:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 779FF1BF327 for ; Sun, 3 Oct 2021 12:40:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 66ECB607C4 for ; Sun, 3 Oct 2021 12:40:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ARQ_iVZSjoN3 for ; Sun, 3 Oct 2021 12:40:38 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by smtp3.osuosl.org (Postfix) with ESMTPS id 5B587606A0 for ; Sun, 3 Oct 2021 12:40:38 +0000 (UTC) Received: by mail-wr1-x432.google.com with SMTP id m22so19545717wrb.0 for ; Sun, 03 Oct 2021 05:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EumWFeJhvNOak76pLbdgsfGhDDi2lNr+gHbp9UFfS1A=; b=MDMd26fgGqQhcQVAEfuSTW5fFTUg9mPy73kzixpb1faGnc0IEiL+2okdVDWVm81EUc 6cPsmRChcepSR+98p3uwCehgODiAKp7h6NzllazFO38uf2v/kC0uvesLL0XZfgsG0jx+ nZYfArAhVRWTNt1lc+vnRHapKFdxeHro4TGxVsef2PTghKjKWbiRSiW15UBLTkjSPLRE dS+YHGhek8NWuUkymjd1DfkXniIXUB6QeiWwFmppqLNMMtU43Od6jHWCJC5gxIxPCGVw wIBWRCgSgFc28n1xm+dQdCD4gGPFD4AKuDz3wynnNq/cElKD+Beck3ven9fgsKuneeis cdKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EumWFeJhvNOak76pLbdgsfGhDDi2lNr+gHbp9UFfS1A=; b=agUbkOabIYF05l7H5F5vNxK3BRYxAnwclB1bBwvvHzNsqUxOZo0Osr4qaxhkGyP70D TtoRqU2kMF4bXx8qQ65+aHQ8b6lCgtt8zTx4TkgSOPWeCQi+IhHHY69DPlkqjo+1poB9 dCutOxDk5/1fRfvcqVID6QdmORKQFyZ0nOVDeOhe9ptSFswyA7GVJGgUdpMXCHseaqn6 lIUrwx39VJfqzv/xkThxs1XE89NDSGsUS1d6wLIDN6Tj3eswQqj0+cCbNX8zRsC8cDAr sPXAJ3xxeYc+7tyjrTu6y8JUm25jBPCqGQ13ywRaQqrDOTB7Jvhrc/I0c0QF+J4C+sFY af2A== X-Gm-Message-State: AOAM530BfeD4GGQAryLFykOO/+fhe3wIARSzrswrllTXJtSuICPKRe77 YEOvBVN8GsB6pehLfRXjqvj9bhnUOlI= X-Google-Smtp-Source: ABdhPJyz8uQ+UPaCd0Dpp5+V7LrZzCkIYtlR8ZPJX2eFIeQIznYWHvbKmV6CIGYkUfaCnN65uNPSag== X-Received: by 2002:adf:a745:: with SMTP id e5mr8266916wrd.406.1633264836450; Sun, 03 Oct 2021 05:40:36 -0700 (PDT) Received: from localhost.localdomain (2a01cb058f8a18003dbee9eed79eb521.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:3dbe:e9ee:d79e:b521]) by smtp.gmail.com with ESMTPSA id 143sm1258704wma.37.2021.10.03.05.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 05:40:36 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 3 Oct 2021 14:40:27 +0200 Message-Id: <20211003124027.343390-5-romain.naour@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211003124027.343390-1-romain.naour@gmail.com> References: <20211003124027.343390-1-romain.naour@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/5] package/binutils: remove csky version X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Thomas Petazzoni , Guo Ren Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Binutils is the last part of the csky toolchain fork. The csky support has been merged in binutils 2.32 [1]. [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=9d24df82ece4e87a0328173d6bd31cb9ff558bb4 Signed-off-by: Romain Naour Cc: Guo Ren Cc: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/binutils/Config.in.host | 7 ------- package/binutils/binutils.hash | 3 --- package/binutils/binutils.mk | 6 ------ 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 2ce455c633..e49583bc7a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2021.11" +config BR2_BINUTILS_VERSION_CSKY + bool "binutils csky version removed" + select BR2_LEGACY + help + Support for binutils csky version has been removed. + config BR2_GCC_VERSION_CSKY bool "gcc csky version removed" select BR2_LEGACY diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index b4c86dd473..ea1f020989 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -9,7 +9,6 @@ choice prompt "Binutils Version" default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky default BR2_BINUTILS_VERSION_ARC if BR2_arc - default BR2_BINUTILS_VERSION_CSKY if BR2_csky help Select the version of binutils you wish to use. @@ -33,7 +32,6 @@ config BR2_BINUTILS_VERSION_2_36_X config BR2_BINUTILS_VERSION_2_37_X bool "binutils 2.37" - depends on !BR2_csky # https://github.com/uclinux-dev/elf2flt/pull/16 # https://github.com/uclinux-dev/elf2flt/issues/12 depends on !BR2_BINFMT_FLAT @@ -42,16 +40,11 @@ config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" depends on BR2_arc -config BR2_BINUTILS_VERSION_CSKY - bool "binutils csky" - depends on BR2_csky - endchoice config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC - default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY default "2.32" if BR2_BINUTILS_VERSION_2_32_X default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index f543b49940..d1be6cbce8 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -7,9 +7,6 @@ sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz -# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) -sha512 979552d4b3a4f31e9f3b9a7027321bd4eb3ac6c2d8deac1720e94e54f81d736db09c53c5d87c301010e307b64127e14400a036c7a35e5d63a954a4edd9cc8e2c binutils-c66d8bbcebfddf713b2b436e1b135e6b125a55a5.tar.gz - # locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 8ec76134bc..bfad25422d 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -21,12 +21,6 @@ BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y endif -ifeq ($(BR2_csky),y) -BINUTILS_SITE = $(call github,c-sky,binutils-gdb,$(BINUTILS_VERSION)) -BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz -BINUTILS_FROM_GIT = y -endif - BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.xz BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))