From patchwork Mon Mar 4 08:13:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 1907414 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=1dQvTVmY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TpBKf6CRZz23l2 for ; Mon, 4 Mar 2024 19:13:42 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B6035385840B for ; Mon, 4 Mar 2024 08:13:40 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by sourceware.org (Postfix) with ESMTPS id 5A6103858D33 for ; Mon, 4 Mar 2024 08:13:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5A6103858D33 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=flex--maskray.bounces.google.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5A6103858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::b49 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709539994; cv=none; b=ValAexd2wlvzKCN8eacVjqvurzOkmbmlWUw8ESWPRBTPq9RvjrlRals2fzJlB1n2w5OvLsE2FpWBJgetRT6jz5zmysjhRdtnFfsfhw7fYJOiBwwH6+rJHuMjmfggqjMJTgnv2kjcKM5SHi4QmYygqw31yNfB4Vjgrc6sdqQoSDM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709539994; c=relaxed/simple; bh=g8LH414Qw8UpMBagOziShpWyg/OzW2UiV1Su3pbhcB0=; h=DKIM-Signature:Date:Mime-Version:Message-ID:Subject:From:To; b=AVTUvU+o5crF2f3MSvH0f5GNL5V7mucKwUGUj5DwmyMQglFWIgSKTCircc4hYlMPvWvSlPDDiuSzoJHGUGXbq22I65P3MKr4BagOoISTP66+dkr+uVEyToAfwnPeKH7pkzL2BpkNwbvI+KZ8BVzYwmxmKKUR7249lta6ZQIqb4Q= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-dc691f1f83aso1793303276.1 for ; Mon, 04 Mar 2024 00:13:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709539990; x=1710144790; darn=gcc.gnu.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=H0Lj+Hshis2vR0xYXhny6X16ImvdSmj+xmOTpU7DVKs=; b=1dQvTVmYqZbBsN88bvbMHFZ/6CVOhI07eQARXZB3YgXvoyumh6tnI1MX+l5yo8J3FH KHu9kpG8xYLBl3ZrBvAJvGwO+tTt8FPP9dv8bQOjXXRzMcQyIlD8JFfFmUYS0ui40Iz6 +WrgLO4+osDRbGBHeG+RDETpECE35NXnQs1mtLelaOxXDO4TQLieNRTi4BsSFaA7H9U/ jcvr8XpAf66Wk2QWQRTWMGBUd+9X7P0ouTWrXnXUxQavEjQB0vgXNqGMhJrGsZIPWg+k wf0H8Y4M76dP3Cd/lBZZRZq/9TMdItsNJqjWCIcXJC2KO0B9i8JrYWOi16yOe6gO1kgV zXzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709539990; x=1710144790; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=H0Lj+Hshis2vR0xYXhny6X16ImvdSmj+xmOTpU7DVKs=; b=ZrLHdHqy0+IoY1lgklvmLh2xxDZKl/rUf5O9N8/6R/4l/SElQ2a8dhO4t0QiBUlPCU mxu3niOW/6mFARXCum3THELnqvH/TiLze6Ba6H9GC3QUIWStdwV+P3QJ+TEHqcbBjTfO EyTX/A7uX94QS/aB0gE20OvyWWzFcAR7KhmSSVdyLurP4+nGSPrwt9zAnJWQNllWjNng Hp81ge918qc2pq1GXehbc6M5UVkZ7H6h7aELqRQZZRND+KTt4O9yGcs7wosmXfJ6wQlx k9yOXvaRmQ2CzfLgLuoMTfKm4EO4wTBQBYmg6PDcGeylDbYcm1xxUgq8uRvQuNS+TkSW u1ig== X-Gm-Message-State: AOJu0YytV4WqLHNXQdoL/eIKlwWH7CYARu+4iRMU27JNyW4IrLVmSfvd ILvbduNy+ZDEZskQKdkH+Jwxc3v67QoDP8jRcbGEyuSrsfHaaQEVJt6vtHMNAZfxmKdXWJjez3C f3T8omnH+tVI7uBqE23U86UweE64FoG7VoiA/1EL9hkTfF18LzQpweYW8Mzs62nQwZdxloRk6lW DJKcpRw3hxByQKzB7Y4+oghzaxEN8E5PNwh5DtYnw= X-Google-Smtp-Source: AGHT+IF4csGKvek4QDrYZ7qQ/zrSC+W+7uIcC45cnC8yXvzD1/o0ZMwJeHLoXmImYBjUv2EfYaOxGLIyChqU X-Received: from maskray.svl.corp.google.com ([2620:15c:2d3:205:ea55:ca02:adbf:ac1b]) (user=maskray job=sendgmr) by 2002:a05:6902:1507:b0:dbd:b4e8:1565 with SMTP id q7-20020a056902150700b00dbdb4e81565mr2975550ybu.4.1709539990212; Mon, 04 Mar 2024 00:13:10 -0800 (PST) Date: Mon, 4 Mar 2024 00:13:05 -0800 Mime-Version: 1.0 Message-ID: <20240304081305.420124-1-maskray@google.com> Subject: [PATCH] arm: Force flag_pic for FDPIC From: Fangrui Song To: gcc-patches@gcc.gnu.org Cc: Christophe Lyon , richard.earnshaw@arm.com, Fangrui Song X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Fangrui Song -fno-pic -mfdpic generated code is like regular -fno-pic, not suitable for FDPIC (absolute addressing for symbol references and no function descriptor). The sh port simply upgrades -fno-pic to -fpie by setting flag_pic. Let's follow suit. Link: https://inbox.sourceware.org/gcc-patches/20150913165303.GC17773@brightrain.aerifal.cx/ gcc/ChangeLog: * config/arm/arm.cc (arm_option_override): Set flag_pic if TARGET_FDPIC. gcc/testsuite/ChangeLog: * gcc.target/arm/fdpic-pie.c: New test. --- gcc/config/arm/arm.cc | 6 +++++ gcc/testsuite/gcc.target/arm/fdpic-pie.c | 30 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 gcc/testsuite/gcc.target/arm/fdpic-pie.c diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc index 1cd69268ee9..f2fd3cce48c 100644 --- a/gcc/config/arm/arm.cc +++ b/gcc/config/arm/arm.cc @@ -3682,6 +3682,12 @@ arm_option_override (void) arm_pic_register = FDPIC_REGNUM; if (TARGET_THUMB1) sorry ("FDPIC mode is not supported in Thumb-1 mode"); + + /* FDPIC code is a special form of PIC, and the vast majority of code + generation constraints that apply to PIC also apply to FDPIC, so we + set flag_pic to avoid the need to check TARGET_FDPIC everywhere + flag_pic is checked. */ + flag_pic = 2; } if (arm_pic_register_string != NULL) diff --git a/gcc/testsuite/gcc.target/arm/fdpic-pie.c b/gcc/testsuite/gcc.target/arm/fdpic-pie.c new file mode 100644 index 00000000000..909db8bce74 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/fdpic-pie.c @@ -0,0 +1,30 @@ +// { dg-do compile } +// { dg-options "-O2 -fno-pic -mfdpic" } +// { dg-skip-if "-mpure-code and -fPIC incompatible" { *-*-* } { "-mpure-code" } } + +__attribute__((visibility("hidden"))) void hidden_fun(void); +void fun(void); +__attribute__((visibility("hidden"))) extern int hidden_var; +extern int var; +__attribute__((visibility("hidden"))) const int ro_hidden_var = 42; + +// { dg-final { scan-assembler "hidden_fun\\(GOTOFFFUNCDESC\\)" } } +void *addr_hidden_fun(void) { return hidden_fun; } + +// { dg-final { scan-assembler "fun\\(GOTFUNCDESC\\)" } } +void *addr_fun(void) { return fun; } + +// { dg-final { scan-assembler "hidden_var\\(GOT\\)" } } +void *addr_hidden_var(void) { return &hidden_var; } + +// { dg-final { scan-assembler "var\\(GOT\\)" } } +void *addr_var(void) { return &var; } + +// { dg-final { scan-assembler ".LANCHOR0\\(GOT\\)" } } +const int *addr_ro_hidden_var(void) { return &ro_hidden_var; } + +// { dg-final { scan-assembler "hidden_var\\(GOT\\)" } } +int read_hidden_var(void) { return hidden_var; } + +// { dg-final { scan-assembler "var\\(GOT\\)" } } +int read_var(void) { return var; }