From patchwork Wed May 29 18:23:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 165377 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp10270061ili; Wed, 29 May 2019 11:23:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqxMDUh21jkW58rm2soQN0RYuHRr4LF4ROEghM5JbOEjzGqajbvueiCCw3hCbwJSOlaY24Wl X-Received: by 2002:a17:90a:344c:: with SMTP id o70mr13831728pjb.21.1559154215932; Wed, 29 May 2019 11:23:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559154215; cv=none; d=google.com; s=arc-20160816; b=rK/6LSIrT+rxnwddPNOlwxzA4ahJVCFA3gMauSMjVBfejjggrhS0mybj4yj5E2csW+ ICmEYlhnUgiwb9sSQ+3GwfG1grAHPvIKjN/Z1cjOAFPiIh+epsmlBdtarCoe5MlE/vyD 6Ds+umtI/CSm9DV5wa0G3n1lJ9q7E2/ixz0KZO5PJhFNbIhS/CRuPXCyU9WOUDPzO5Rk xlXN7sUjxd/FbTB85RMVu+nlBoTjRGFaM/fGc5wry0iXJCF2PswRIvoeFqWXaKQcJzLB dp0/91X5+1/yxoi3J1j4aRmBJkPWv+ifGlXgGzm729+Rb6BlDUqbDhnAqrzxdwnHNWSm AV/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=xUyh9qCf6zB8eO4cynysk8Z99O5rKxLgBX4erxP3644=; b=uLXYfxA5ul66x1974l72lU8vOMY6jUtEDPVDX+7RBxQhQt5lZJhby6OeTqPPaJSEJV VxOoN2oX9vs9bhdY/rrco8tndfp0DkOPsA62ay5K+CF30hqoe5vilwTRybf9eDtWwaRM g8XXvSzf0KiLZ8BfKdy2IBqmlvTx5lhO/E4HFf9aHtrJ5cksguh6H9hsS+wn5j20D9JX Ynu+WtnxAENHgEFfo3lFu4tG+VNEYn1THtucOznQuJDG0H2/hQZfNnIvzTEo7H260/rY tnHyWMKUT1r9VjyfuBW8JkPi8QvkkhnX5a6+FsVy9DvocLF8iT9/YvPim6YByT53iREA mWmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=lDBVYM8W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f12si400045pfh.227.2019.05.29.11.23.35; Wed, 29 May 2019 11:23:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=lDBVYM8W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727556AbfE2SXe (ORCPT + 30 others); Wed, 29 May 2019 14:23:34 -0400 Received: from frisell.zx2c4.com ([192.95.5.64]:47815 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725917AbfE2SXd (ORCPT ); Wed, 29 May 2019 14:23:33 -0400 Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTP id c2fb5373; Wed, 29 May 2019 17:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=mail; bh=gYtRFTzPGPTPSkG9w5pOkEZn+Ho=; b=lDBVYM8WGc0FxLn08jwD nZgR+t9bpWIdm5oDXeDV+mP4rsRkT76wFFZUxDMIS2Uu+/5s/rDOpnw8S9lhdO4A /45dOCDJNbbnwrMM2xMEVIJy0XizNYAnSlOU6wnJiGSEBOdyVDciqhNRQHHgfM9T +rZXl69mtfOjsK6A+RmFJNVfwXDMj4sknWlfG9IWAEosSNEFevXzvBsM7JNLfdY0 OdHr4EYjETQ14TOvHRoi92wXftInk7ivFN7TjB5P3VWMFTWCvDuuqPz8fmKXfXn3 +JytPH4hYcawNt180N4YN4qXRBUMIvmH7aRGb1mmqovhIvuCQYgDmQ3PxmPCtb9b Xg== Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id b8f6351b (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Wed, 29 May 2019 17:53:02 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Jason A. Donenfeld" , Masahiro Yamada , Russell King , Arnd Bergmann , Ard Biesheuvel Subject: [PATCH] arm: vdso: pass --be8 to linker if necessary Date: Wed, 29 May 2019 20:23:24 +0200 Message-Id: <20190529182324.8140-1-Jason@zx2c4.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit fe00e50b2db8 ("ARM: 8858/1: vdso: use $(LD) instead of $(CC) to link VDSO") removed the passing of CFLAGS, since ld doesn't take those directly. However, prior, big-endian ARM was relying on gcc to translate its -mbe8 option into ld's --be8 option. Lacking this, ld generated be32 code, making the VDSO generate SIGILL when called by userspace. This commit passes --be8 if CONFIG_CPU_ENDIAN_BE8 is enabled. Signed-off-by: Jason A. Donenfeld Cc: Masahiro Yamada Cc: Russell King Cc: Arnd Bergmann Cc: Ard Biesheuvel --- arch/arm/vdso/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.21.0 diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile index fadf554d9391..1f5ec9741e6d 100644 --- a/arch/arm/vdso/Makefile +++ b/arch/arm/vdso/Makefile @@ -10,9 +10,10 @@ obj-vdso := $(addprefix $(obj)/, $(obj-vdso)) ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector ccflags-y += -DDISABLE_BRANCH_PROFILING -ldflags-y = -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ +ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8 +ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ -z max-page-size=4096 -z common-page-size=4096 \ - -nostdlib -shared \ + -nostdlib -shared $(ldflags-y) \ $(call ld-option, --hash-style=sysv) \ $(call ld-option, --build-id) \ -T