From patchwork Sun Apr 22 13:48:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 902622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-476701-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="aEL6SZ+k"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40TWCn1bN5z9s0q for ; Sun, 22 Apr 2018 23:49:06 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=l5Vl6h/P3dVy6jdaL9wfYM2SvCycEk2ynLEmOQeB2xBJtk3c0QYjy R/hIs1L8zE2X23PxvkTlcKN5gUT+NDpiy5d0mSDWPxKE1y7gzxguErQw7yfTayrJ GTmndAzkMn3nB5sv1f12bMgvE5FSQzoh5/9GxSkWB4hRYAcimofDL4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; s= default; bh=RmopvisLjaEfaN+rsdpPcjmVDJk=; b=aEL6SZ+k/8DwwOoVrpJp gJCKcnBxnsrcevXgh5tbtTbZn1QkH9xDvADqcemvIbT4D88dVoz9oLysZsDY0v0j gsV1yqF9z0h4pkC2fHDwvCppCzeCwTUGT6UAEz+f5elTE7kOYZxyZJtLh2TsZzc8 U1cAq65ooe9uySTuekrWygA= Received: (qmail 24819 invoked by alias); 22 Apr 2018 13:48:54 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 24603 invoked by uid 89); 22 Apr 2018 13:48:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=need, gol, UD:i386.opt, mmovdir64b X-HELO: mail-pf0-f181.google.com Received: from mail-pf0-f181.google.com (HELO mail-pf0-f181.google.com) (209.85.192.181) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 22 Apr 2018 13:48:39 +0000 Received: by mail-pf0-f181.google.com with SMTP id f15so7093319pfn.0 for ; Sun, 22 Apr 2018 06:48:32 -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:in-reply-to :references; bh=aYZr5VRwxY7lGqfaQ0QppNWN8HAqDOrSg0OmrszzcXw=; b=PHeM3BER2+f1hkR2x43qybiio/62c0/qMl4UlChu/eFc04LPkiuW/jQ71J31zeoc/m iag94bo7UTgxOW/B3Iih0bV0k0f0i0uH8XWHfX4ZNAqNf94mKTC3OvPqayS/JIt6gua4 p40iOm09nWpc2bg0dyQ8IIrck7kczbXuxcyYuzvaXL4TAxn27Wbfl3/l4NJ/5CBJSVth JCSvOQPOPrUQeBIulTnlVh6gm1vHRtr/azaKhOCeptN6YBdfmSg27eR0KXQoBjamuHVe tmOefcWVn4URWaXUKM2Qqcbc4FJN1aqGofllwQMF3bxgg1lP6PolU99aDuh7cpYSfFkn H3YQ== X-Gm-Message-State: ALQs6tDvcWuHFOKyXOFJUGvrVfffCTjG/OYgBDnnxV2C1mmiy/XCGvGa 1SqzIsQSX7NgcMCSxroLomFppg== X-Google-Smtp-Source: AIpwx4/8odoykIH21xtCwaW3hEePzcCRAwT2D31QIpFAYHPKvhJve+z8A08hiLAgE4GkTElZsDQ3LA== X-Received: by 10.101.97.8 with SMTP id z8mr9318861pgu.192.1524404910222; Sun, 22 Apr 2018 06:48:30 -0700 (PDT) Received: from gnu-tools-1.localdomain (c-73-93-86-59.hsd1.ca.comcast.net. [73.93.86.59]) by smtp.gmail.com with ESMTPSA id 186sm18582924pfe.109.2018.04.22.06.48.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Apr 2018 06:48:29 -0700 (PDT) Received: from gnu-tools-1.hsd1.ca.comcast.net. (localhost [IPv6:::1]) by gnu-tools-1.localdomain (Postfix) with ESMTP id 1C8F821FE3; Sun, 22 Apr 2018 06:48:26 -0700 (PDT) From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: Igor Tsimbalist , Uros Bizjak Subject: [PATCH 5/5] x86/CET: Remove the -mcet command-lint option Date: Sun, 22 Apr 2018 06:48:25 -0700 Message-Id: <20180422134825.7165-6-hjl.tools@gmail.com> In-Reply-To: <20180422134825.7165-1-hjl.tools@gmail.com> References: <20180422134825.7165-1-hjl.tools@gmail.com> X-IsSubscribed: yes With revision 259496: commit b1384095a7c1d06a44b70853372ebe037b2f7867 Author: hjl Date: Thu Apr 19 15:15:04 2018 +0000 x86: Enable -fcf-protection with multi-byte NOPs -fcf-protection no longer depens on -mcet and with revision 259522: commit d59cfa9a4064339cf2bd2da828c4c133f13e57f0 Author: hjl Date: Fri Apr 20 13:30:13 2018 +0000 Define __CET__ for -fcf-protection and remove -mibt -mcet becomes an alias for -mshstk. Since all usages of -mcet and -mno-cet have either been removed or replaced, we can remove the -mcet command-lint option. PR target/85485 * common/config/i386/i386-common.c (ix86_handle_option): Don't handle OPT_mcet. * config/i386/i386.opt (mcet): Removed. * doc/install.texi: Remove -mcet documentation. * doc/invoke.texi: Likewise. --- gcc/common/config/i386/i386-common.c | 1 - gcc/config/i386/i386.opt | 5 ----- gcc/doc/install.texi | 2 +- gcc/doc/invoke.texi | 10 ++-------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/gcc/common/config/i386/i386-common.c b/gcc/common/config/i386/i386-common.c index 74a3490f7a3..2629ae62a28 100644 --- a/gcc/common/config/i386/i386-common.c +++ b/gcc/common/config/i386/i386-common.c @@ -543,7 +543,6 @@ ix86_handle_option (struct gcc_options *opts, } return true; - case OPT_mcet: case OPT_mshstk: if (value) { diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt index 815eceb713d..d9bd909a885 100644 --- a/gcc/config/i386/i386.opt +++ b/gcc/config/i386/i386.opt @@ -1006,11 +1006,6 @@ mgeneral-regs-only Target Report RejectNegative Mask(GENERAL_REGS_ONLY) Var(ix86_target_flags) Save Generate code which uses only the general registers. -mcet -Target Report Var(flag_cet) Init(0) -Enable shadow stack built-in functions from Control-flow Enforcement -Technology (CET). - mshstk Target Report Mask(ISA_SHSTK) Var(ix86_isa_flags) Save Enable shadow stack built-in functions from Control-flow Enforcement diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 511e146f023..2f4f608e268 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -2107,7 +2107,7 @@ The option is disabled by default. When @code{--enable-cet=auto} is used, it is enabled on Linux/x86 if target binutils supports @code{Intel CET} instructions and disabled otherwise. In this case the target libraries are configured to get additional -@option{-fcf-protection} and @option{-mcet} options. +@option{-fcf-protection} option. @end table @subheading Cross-Compiler-Specific Options diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index b6784b75fa2..9c7fe187f48 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -1261,7 +1261,7 @@ See RS/6000 and PowerPC Options. -msse4a -m3dnow -m3dnowa -mpopcnt -mabm -mbmi -mtbm -mfma4 -mxop @gol -mlzcnt -mbmi2 -mfxsr -mxsave -mxsaveopt -mrtm -mlwp -mmpx @gol -mmwaitx -mclzero -mpku -mthreads -mgfni -mvaes @gol --mcet -mshstk -mforce-indirect-call -mavx512vbmi2 @gol +-mshstk -mforce-indirect-call -mavx512vbmi2 @gol -mvpclmulqdq -mavx512bitalg -mmovdiri -mmovdir64b -mavx512vpopcntdq @gol -mms-bitfields -mno-align-stringops -minline-all-stringops @gol -minline-stringops-dynamically -mstringop-strategy=@var{alg} @gol @@ -27300,9 +27300,6 @@ preferred alignment to @option{-mpreferred-stack-boundary=2}. @itemx -mpku @opindex mpku @need 200 -@itemx -mcet -@opindex mcet -@need 200 @itemx -mavx512vbmi2 @opindex mavx512vbmi2 @need 200 @@ -27447,12 +27444,9 @@ This option enables use of the @code{movbe} instruction to implement @code{__builtin_bswap32} and @code{__builtin_bswap64}. @item -mshstk -@itemx -mcet @opindex mshstk -@opindex mcet The @option{-mshstk} option enables shadow stack built-in functions -from x86 Control-flow Enforcement Technology (CET). The @option{-mcet} -option is an alias for the @option{-mshstk} option. +from x86 Control-flow Enforcement Technology (CET). @item -mcrc32 @opindex mcrc32