Message ID | 20230117162508.74789-1-jose.marchesi@oracle.com |
---|---|
State | Repeat Merge |
Headers |
Return-Path: <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1848960wrn; Tue, 17 Jan 2023 08:21:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXubHG0CPuVuOoN9Qzov9a10ITvaGyood8KD3JuPrTNtjO6Zb2wycLqzhcZj9UElO624tDug X-Received: by 2002:aa7:d701:0:b0:49a:d3c2:c76f with SMTP id t1-20020aa7d701000000b0049ad3c2c76fmr3962522edq.13.1673972506291; Tue, 17 Jan 2023 08:21:46 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id dz16-20020a0564021d5000b0049e00541168si11964309edb.304.2023.01.17.08.21.46 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 08:21:46 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=hPHUuoim; arc=fail (signature failed); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 13BD03858C52 for <ouuuleilei@gmail.com>; Tue, 17 Jan 2023 16:21:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 13BD03858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673972505; bh=vs06WsusFAja3Vo3nsKzFuy5fyW9wUR1oLzOS6igokA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hPHUuoimGjFz+WxeCNP9f5UCRIr1a86nIiJpxrWhMA0oJ8AT3cFkiahFo4o/xGQJB eaCCyDpq0dhM3B7A39QoOvgxmhaziwY6MtUCPPNt3N5ybZpxHzdrQuXYLVg+pxyYnw pOquVI6ctaaK+NBx4j8C5Gpy21xuLf7rwsxP/DNQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 48F993858D28 for <gcc-patches@gcc.gnu.org>; Tue, 17 Jan 2023 16:20:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 48F993858D28 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30HGCrJH024973 for <gcc-patches@gcc.gnu.org>; Tue, 17 Jan 2023 16:20:57 GMT Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n40mdcn6m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for <gcc-patches@gcc.gnu.org>; Tue, 17 Jan 2023 16:20:56 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30HG9QRf005006 for <gcc-patches@gcc.gnu.org>; Tue, 17 Jan 2023 16:20:55 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2046.outbound.protection.outlook.com [104.47.73.46]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n4qyyuc1k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for <gcc-patches@gcc.gnu.org>; Tue, 17 Jan 2023 16:20:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VypQa9P1BBKwE1SWz0h2vhXTGt7uIFz5epI/Ya+yN98pfeR1lDfnZKKojsE2EGx2rIV+g1o2CuRVF4eCbANE0fOOBMohJoVWSqEPYNCQlRjCXSAR63bI0b/NipHuxZ+HPfW3rc7UlBEVtiY4wP4uJZXDV1LCVNqZEjSvCENkaWrbzhj9TG9GvSvOa/SwxejhyDh4aGb3nukVway3JZbZw7E2DXkReZBZ0s2IgfuwmKRmmNiToe1V+JfeUb8I62fp6KVDtO9bJZ3JL/iXDN+hV9U065R9kxHuhw23nmXakXPA3Byy0wDl7mOEyurPw5rjCOCdR0DyEvplzKaYo/LGlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vs06WsusFAja3Vo3nsKzFuy5fyW9wUR1oLzOS6igokA=; b=nnYwb6vI42DPkBdXFC+dk1QqXL67oVUVkOtOuQER0mIYnC1H4KwExU2P3sVYEKdasfPccGlk0blNpjNidfDpI2wrP1zKELf/9I1HGhaNiktBaNYYtD3Yfeh8h+7N8DO9LHxw7snVHz2ewAciOAaPJCXbGhll3ZlWAjj/j6GJOTLeITfCkM4G3akcAE+TBcFYi2lpUYDKXpK1dXBINNc+X6f4tEmcZ+fH45oXIR0f/jfbgG3qk0dUVc4QeJCj7uPegOVGdMhaoftTlT4q/jZXl49rOhVJWGckT6qr7oYzqfw25UyzWu1LGOenfmLvE6fpQ0QhnZz8a66Rh/bGoa1Szw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) by MN0PR10MB5934.namprd10.prod.outlook.com (2603:10b6:208:3ce::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.11; Tue, 17 Jan 2023 16:20:53 +0000 Received: from BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::3cd3:9bef:83f:5a85]) by BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::3cd3:9bef:83f:5a85%3]) with mapi id 15.20.6002.009; Tue, 17 Jan 2023 16:20:53 +0000 To: gcc-patches@gcc.gnu.org Subject: [COMMITTED] bpf: disable -fstack-protector in BPF Date: Tue, 17 Jan 2023 17:25:08 +0100 Message-Id: <20230117162508.74789-1-jose.marchesi@oracle.com> X-Mailer: git-send-email 2.30.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO2P265CA0108.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:c::24) To BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR10MB2888:EE_|MN0PR10MB5934:EE_ X-MS-Office365-Filtering-Correlation-Id: c5ee3f64-0c3f-411f-8449-08daf8a6cdaf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YSQQPG/WMJAYG4LYwR4X0urnpQLe2qmzDOyRrIkucbChZu4wyCBy12Dwt2h7k2OjVr/VzjOI877qd3oHHFaoxc1a4YLYaD/oB4/qnUoZXdVgj7g1SbZxuqGvv2fbGBRgIjZq1a0PhdRFZg54LJbiJzBm1Prqmr3Y6Fra0Z+EWRJqtBu1z9fOMoYpEvrdCmOOFIUyMgzuPCxDenv16K8iQ1bd3VfLUyPDDmpnvF7GUlTqq0uiWrNAxuJUy+yvQJGhf2H0XWNMiPWr+W0xevMfokk8yx3QgYlKVSp6XN8RocttBNhb39mTkuUufoO6YDN8fqRV8XqwB6VpdfT6Si2fR8BNYbAaDeGgWt/z+WCtl7WSV+ACfjoWY3dFzgKyEnweC7pqn+9tRGQlAWhmpMHlS1KmT5Fen58C2NnskXN1NTdS2wu+zodH8xS1gFKTVZEe+U352T2/MyG0XM2H8lYonDYxTOPV7jyTUOikKSX81yXGeHivQdXsk9VrR9QhhhD7uPgXKsB2pTl7dmlUn8pVYArhF9fgMF+GmvmxCJenycMgOuJlm0RnxJULetVBdLAiv02Pk7PfgqgqjHC8rN6280u7bOCqlvldgMuQ89xlXc+3K5ebYlaS5823t/QPYWF1UnKk54u+6cwsfn5EPnmgpg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR10MB2888.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(376002)(136003)(366004)(39860400002)(346002)(451199015)(66556008)(38100700002)(66476007)(4744005)(86362001)(66946007)(6666004)(6916009)(316002)(6486002)(2906002)(8936002)(1076003)(6512007)(186003)(478600001)(26005)(2616005)(6506007)(8676002)(41300700001)(5660300002)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: v+YGlM8aGZR/DNHjfe7VU4KF62tm4BzFK2s18voDq3bR5Uv8ypMNHoJwtYAYFRB6Dja/lkAZWK91WOpk65/QsMLCRcr53WxKZsgnN+oorkZU2byANPFZqcoS+BNZDJVBEYXgtWpnKqMWQcb9zL+otopa9FdGhpQclVrmHTuPXiJQctu1wAGIHJvKLJdchxPEGrm+VrBkWhpFoQ35d1jgMjrZlkSPP+3TCkTcsHxPsCrTm3ocSro2D7uHfQmPjPUObT0X4lS2uOj+0dk/Tr+JSQfKSqFH8dQZ8XET2nkZrVbd602kJt5ih8E8NUte7qRi0WC3Le+sYb9tF84fWw/Fij8L1eEToZ1Q1QivP0/JIalB9cz1X7ZsqoZSC9oXyaYMvdDWWbipDPcc9OuDLl9SeQ/l3yO9vdXt/d5n7aRhI8jN0VJc/L6YV/waUHDSeaXS0J4HUDduxGaYONt+A3FuNxWgGIQvBb+F6Wl8u1CHn56C7EN3VmMQzyu3W6De7NbDLieCcVc2mHYAYLo08Z/E8+XlTZV8zqdz+lBjsbX63k+FX8LcWdfq7MNasSbfZnpC22SJOb6C2cysKkn98VrUrHZCglElgabxdu78rV/dmtsUHsSyOLrN7fhOBiiwoBggUyhfmAerzKrWswBU8EWCgGCkzQYPja2VtzGOtb+PbAUD9J2QZ2xpFxdmhsD96ME+R+caU07+mEyR+YBFJHTtgZrR+aBXrqnAfx9qeH/5DxOU5Gl85Gd26l1kW3WZ0RshEWAD347Zs+iTUE9Kqs7jtY32g72iULSb1pz+Zrvhcd6hUH7CR8tYqIUcBoERmCpESEWitpBW2a/UCo/vc7pLUMpnyddXDNVaSTk39kyj44tMwjljiJyBoGn3pCSagfFpW050DHryMFmodsEsd0Dn1iH3G0pTOK5VPEHICJUmx12RE/85GqKX0HlOLIzY1lfSCikMnk5VLPhy28Gbe1gcW8KsLWTy87P+qBLN8qjoHHnl7ndJwUkQscrJxUAY8ZGLdpRoz1kg9MaB6MHR0UIzrXc/DhtzRm8NfovfRMD5jEtimxxBeJkVF0i/kpHXELP6/3npUyMpVUnt7ij4jJo+MBPBkvEYSfKJJjr0YSj+yV4dZZuZVE1cisx5PhX6eaZcM0rSTZ61gnP9hKkTfNGwKbgazcT5i3/8Qu7i/RiNLbi1lS+dhttGgs6s9b1mDWsbbu9VLKG0RXoTF/IvzZUt3pMZf8KVwaUzNKklHeWjDDH9mXABqO1NeRFOR7XLU2l4Qroh7z00qh9FQGlQ3fC74/fMvgf66bOYjoe8twRZLAAYCQfaKHdUdoKJ36EYGZHCNSJ0s8+lj76XFfbH6+4/1dGtW04VZ+mjVXIBPE3mv5LtIuKhRKc6+NtGpaEY8Xu+kOwtd57rKmEsUdQ8bM19Cd6YfngmliJ3a8uypV582d0LwxF9Rc/Bhc2hwA1ynzb7n0IaG7PkeHD73MohHchyctiJ5GZh4jtxF58u9eVRp5uNg3W35o0owPQ5GweIAZBP0NkD70zUC9P786BbYNy18lVAWEFDHan8dma1FS2x5WNoA9UVaU5iV4rVPrcXcLf1s8ciOCGGwJM7iGjNlyq9yg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IOKiJxo3Y9EANEgMEydJXGQNoylpBRuhjO4R4wBVKHB3sYBA1eyGqHeBg3khdlwXI/TKpclr8/DN8KrY0eKoS0mKYQqtJX6w2QpKOZxO3yEmPbbkGlX2Mk2driM2XNvYEYy5dp9VuZwZLF/rKmAxb1A0nn8KXyZ28c8tbpitpDW99Ex95AcGdc/rRdcUq5gjfvHO88JdxC5pebVSgVzmTERGI+Gx9aDe4GNLz17pvSbvsFXCZAqrbGisuLxd3dfUfyKF5mMD3QfMgrYnwhwnvq2WhvjZG2HAuAZCgPgPOCENW9PKVa27OlIrRd1uwEuVFyzDVpaYfNqzspTvN6VoIw7GXgEhbm6REIjV2rlZISn6z5/aj8w4MshDnBdAm6LHGy8mZdVm2VmuFuAyg2ZzcM8sdVAfXOuKQOUapAkwhDuVYpLa7VuP3802/XIl6dPZ40D5hJMsnI9jcgWQTixhBxwcI7xzx1Rf7vUq2ZyWhaZx2gVroMI5aRsKqXLxXc4Diix0orckzd+riuX9D29rTa8VnkZbnhTvCImeahOi6TvsSI8jANplKNZHOWwQHgjcUTjh9VV2K9ONJ+UG1e2pegwN/zvzuSEFij7DqCsrI5zilm+b0YPC4pP7jEuM2uVYFpcjI09wcBLmoWRpIll1kN4cWrgDZLtt57rNPTrO7Aac0J496xePrct27qAcu3DNzX1KPaIKKGubhxHOSWq/FbfGnZNgzc2oPk151miA/zYErE4A3K6anKTHxSHjNzVl X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5ee3f64-0c3f-411f-8449-08daf8a6cdaf X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2888.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 16:20:52.7156 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Lq+LpUMTmerPZ6Eje+MdpH0ZqLPasZwzCx1o9YxHtUcUv8Uk4Vz484JPv2TjTWffV89W4CexI9/0NMaAt3ezrts5/kKtYUAACFeImSfRGf4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR10MB5934 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-17_07,2023-01-17_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 phishscore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxlogscore=876 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301170131 X-Proofpoint-ORIG-GUID: NqZQLWhi5xaUgWvHmJz5tRvFCRMu9Y0_ X-Proofpoint-GUID: NqZQLWhi5xaUgWvHmJz5tRvFCRMu9Y0_ X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP 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.29 Precedence: list List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> From: "Jose E. Marchesi via Gcc-patches" <gcc-patches@gcc.gnu.org> Reply-To: "Jose E. Marchesi" <jose.marchesi@oracle.com> Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755287394672047110?= X-GMAIL-MSGID: =?utf-8?q?1755287394672047110?= |
Series |
[COMMITTED] bpf: disable -fstack-protector in BPF
|
|
Checks
Context | Check | Description |
---|---|---|
snail/gcc-patch-check | warning | Git am fail log |
Commit Message
Jose E. Marchesi
Jan. 17, 2023, 4:25 p.m. UTC
The stack protector is not supported in BPF. This patch disables -fstack-protector in bpf-* targets, along with the emission of a note indicating that the feature is not supported in this platform. Regtested in bpf-unknown-none. gcc/ChangeLog: * config/bpf/bpf.cc (bpf_option_override): Disable -fstack-protector. --- gcc/config/bpf/bpf.cc | 8 ++++++++ 1 file changed, 8 insertions(+)
Comments
On Tue, 2023-01-17 17:25:08 +0100, Jose E. Marchesi via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > The stack protector is not supported in BPF. This patch disables > -fstack-protector in bpf-* targets, along with the emission of a note > indicating that the feature is not supported in this platform. [...] > diff --git a/gcc/config/bpf/bpf.cc b/gcc/config/bpf/bpf.cc > index 576a1fe8eab..b268801d00c 100644 > --- a/gcc/config/bpf/bpf.cc > +++ b/gcc/config/bpf/bpf.cc > @@ -253,6 +253,14 @@ bpf_option_override (void) > if (bpf_has_jmp32 == -1) > bpf_has_jmp32 = (bpf_isa >= ISA_V3); > > + /* Disable -fstack-protector as it is not supported in BPF. */ > + if (flag_stack_protect) > + { > + inform (input_location, > + "%<-fstack-protector%> does not work " > + " on this architecture"); > + flag_stack_protect = 0; > + } Building with a recent GCC with (noticed during a -Werror build), this results in a new warning: [all 2023-01-27 16:26:25] ../../gcc/gcc/config/bpf/bpf.cc: In function 'void bpf_option_override()': [all 2023-01-27 16:26:25] ../../gcc/gcc/config/bpf/bpf.cc:260:51: error: unquoted sequence of 2 consecutive space characters in format [-Werror=format-diag] [all 2023-01-27 16:26:25] 260 | "%<-fstack-protector%> does not work " [all 2023-01-27 16:26:25] | ^~ [all 2023-01-27 16:26:25] 261 | " on this architecture"); [all 2023-01-27 16:26:25] | ~~ [all 2023-01-27 16:26:27] cc1plus: all warnings being treated as errors MfG, JBG --
diff --git a/gcc/config/bpf/bpf.cc b/gcc/config/bpf/bpf.cc index 576a1fe8eab..b268801d00c 100644 --- a/gcc/config/bpf/bpf.cc +++ b/gcc/config/bpf/bpf.cc @@ -253,6 +253,14 @@ bpf_option_override (void) if (bpf_has_jmp32 == -1) bpf_has_jmp32 = (bpf_isa >= ISA_V3); + /* Disable -fstack-protector as it is not supported in BPF. */ + if (flag_stack_protect) + { + inform (input_location, + "%<-fstack-protector%> does not work " + " on this architecture"); + flag_stack_protect = 0; + } } #undef TARGET_OPTION_OVERRIDE