From patchwork Tue Jul 10 00:51:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10516029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ED6936032C for ; Tue, 10 Jul 2018 00:51:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB10E28864 for ; Tue, 10 Jul 2018 00:51:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD22F289FB; Tue, 10 Jul 2018 00:51:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8073328864 for ; Tue, 10 Jul 2018 00:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=Fjhc3dTIVhUNsJlOSlD5J+FuJE23vVXptB1RM9AFJpY=; b=cGK xqz+I9fw7AL31UDEQxaSCdYNqgz+l2LaEThYzacFvPJJRvHs58Y305rbfYgnOF73QKLwfol+grdqG m3VEIR2DIkKutTrQnRnaV1UKGmUooPTNCIG65quOLOcGoFs4lTQZCJ1vw+2LV6TXH2ICXFdlgVer5 8m73PsdCetA2iIAZgLz2faaSmGvHziXy8owE1uIU7V/0CEFfZRdI9MFAqiWCN5x7uZluYeiwUXXTp kd4Rj1KRmc/xgSPH8EEtRrNYlDa2J5IU3ciXeaxDyUPHTJ5AdyR77fH3us3X0cep8OtlMg1hKRNZX So31cb1iXrJ4l/1DBKuU/bB3l3H2T/w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcgse-0007Pm-QX; Tue, 10 Jul 2018 00:51:48 +0000 Received: from mail-qk0-f193.google.com ([209.85.220.193]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcgsa-0007OK-JB for linux-arm-kernel@lists.infradead.org; Tue, 10 Jul 2018 00:51:46 +0000 Received: by mail-qk0-f193.google.com with SMTP id t79-v6so10715040qke.4 for ; Mon, 09 Jul 2018 17:51:34 -0700 (PDT) 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=WB9pcwnvGIOQfaIcEEDBnltbglxMrlBjMgr/jK4qBNU=; b=CQ49cL+VuNpr2LpjxQYiH+w2coXzVLVE3ttkoPGME4QG8M1uZtr1Yq6qR3BVKP3XLi wiDUhbwSYf9tYjFigaLE7Mk5uj18ZNqcJXoYIkRnwqwxuU/hjg2skH4iLKAFRahBFJ/y iWJ/5d8aWOLwAjLYGS0rzwScGl7pZUfkGd4ZLGtHNvUeOLEGFv0hIlCIEzJXrMxYoA5P 9Y5TMlCMfMXNsjPLvqYzKQ6ayuZLnUisyX6oAHV8lFWNA7/OYMvHNf1I0TzRYYhNlTc5 B7IHhJ6b3p6A+luCH+W+rPCYy0xzSDhS1rnMBAWR9B2f+5HVOM9OmPCQfKDqUZPTCycM /BoQ== X-Gm-Message-State: APt69E1sXjkt5dmHrUhuGdryOTmvc7l0lbMtqV+9gBIRZxu1kRkyHnAX w0gBzukPLB0FVua8IW7jWasmXQ== X-Google-Smtp-Source: AAOMgpc/WLd93vs8C0XkDEtFsYeftg1bRNLsxC2NVI7DZ7fGsr2D4W8uLKq6KOq3tjXX2KzxunNsrA== X-Received: by 2002:a37:15da:: with SMTP id 87-v6mr19538874qkv.67.1531183893604; Mon, 09 Jul 2018 17:51:33 -0700 (PDT) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc::1941]) by smtp.gmail.com with ESMTPSA id d12-v6sm4086190qtp.6.2018.07.09.17.51.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Jul 2018 17:51:32 -0700 (PDT) From: Laura Abbott To: Will Deacon , Paul Kocialkowski , Catalin Marinas Subject: [PATCHv2] Revert "arm64: Use aarch64elf and aarch64elfb emulation mode variants" Date: Mon, 9 Jul 2018 17:51:27 -0700 Message-Id: <20180710005127.22883-1-labbott@redhat.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180709_175144_625450_90723676 X-CRM114-Status: GOOD ( 12.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laura Abbott , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 38fc42486775 ("arm64: Use aarch64elf and aarch64elfb emulation mode variants") unfortunately breaks with some toolchains: CHK include/generated/compile.h LD [M] arch/arm64/crypto/sha512-ce.o aarch64-linux-gnu-ld: cannot open linker script file ldscripts/aarch64elf.xr: No such file or directory make[1]: *** [scripts/Makefile.build:530: arch/arm64/crypto/sha512-ce.o] Error 1 make: *** [Makefile:1029: arch/arm64/crypto] Error 2 If the distribution doesn't package the associated linker strips from binutils, this will fail. Both Fedora and Debian currently fall into this category so just revert it. Fixes: 38fc42486775 ("arm64: Use aarch64elf and aarch64elfb emulation mode variants") Tested-by: Kevin Hilman Signed-off-by: Laura Abbott --- v2: Tweaked the commit text to be a bit clearer about what the underlying problem is. --- arch/arm64/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 7976d2d242fa..f476d52ad8d6 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -60,13 +60,13 @@ ifeq ($(CONFIG_CPU_BIG_ENDIAN), y) KBUILD_CPPFLAGS += -mbig-endian CHECKFLAGS += -D__AARCH64EB__ AS += -EB -LDFLAGS += -EB -maarch64elfb +LDFLAGS += -EB -maarch64linuxb UTS_MACHINE := aarch64_be else KBUILD_CPPFLAGS += -mlittle-endian CHECKFLAGS += -D__AARCH64EL__ AS += -EL -LDFLAGS += -EL -maarch64elf +LDFLAGS += -EL -maarch64linux UTS_MACHINE := aarch64 endif