From patchwork Sun Apr 22 13:48:21 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: 902626 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-476705-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="GmnhGBQu"; 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 40TWDd1zJLz9s0q for ; Sun, 22 Apr 2018 23:49:52 +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=rFst5YVcgbL+AYjCYWIuJQAw7zmh9vSE+jFj8tgvnmtQKykBJdz6Q a2z5gMIjLswVfX7kLukIJiJ6VBEm3yJa7BGWAkiyEv+LckYGMEfYmweH3oO5CS3s QB377NnD7SDToBR1uB+6j7x+ZZ0T+YdkUP5eKLMpWssYx42c5NiN60= 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=p4mN28XJuoh3wyvix01OaKfS8Y0=; b=GmnhGBQu6tLbyCC9/5kR jvhK/uBXzFJvTk8Ng5ASkOgtGHZGAGVbN9DrRPFdjwplC8ql35eShQe233fcpuOI HWYjuF9F1kPq6uZgjW/8qWA07+XY7gyT3fJoCCnQdMrHs+U2x7XQ3NbeoD1hUyqO G3hlNChaXdzJNpkVA/L5hEo= Received: (qmail 25027 invoked by alias); 22 Apr 2018 13:48:58 -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 24602 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=HX-Received:10.98.69.142 X-HELO: mail-pg0-f44.google.com Received: from mail-pg0-f44.google.com (HELO mail-pg0-f44.google.com) (74.125.83.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 22 Apr 2018 13:48:39 +0000 Received: by mail-pg0-f44.google.com with SMTP id i6so6549052pgv.3 for ; Sun, 22 Apr 2018 06:48:29 -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=/e8+ufm7d/+HIe7BAwEMU9Qsa1yUep5cwutkK2ps2e0=; b=OFIkgFfqlrYlclDS77li+WskanAeaMYsmmR+NclOP57P7MDXHS+XdCTC2kHm4qt0uF MOb6jhpY9NChtVtzfIH5D0Chevip8dxZTDwsnBMLAHsZqoP6XCe/ZorQmHi1coRvxjGN XvdYKKuMkbcg390kalVlmBdA50Ry9ypa1aNv4cQbrHKNviHl78YGAZiHukKAXXRLCSqB EfA4Gg4+JFQ5U37d/5Q7krcMRcBBitAKvS6sd1JCknciJ8NARrmFkZyjvy8zioDxAVbZ P9KF3UbngCA6DQjnBBFbBjlJ45JixJRwO1EhC9nlIORI3LooWk6QZIsx3396Z4p2HPsg L7OA== X-Gm-Message-State: ALQs6tCXptFHCzPelSH6A+UOOhmdScnm/W4Cv5NVXCHEe0X6ntU0RsbL vNzXx9n3/RPtulUsSNstIajR9A== X-Google-Smtp-Source: AIpwx48tZGSKpc/t8JdrUzlqRfyUxzWeO/EgIeTSI0l2e0hLj1empeG+8bLz7pEPu4tYlejMhxuBxg== X-Received: by 10.98.69.142 with SMTP id n14mr16670252pfi.42.1524404907580; Sun, 22 Apr 2018 06:48:27 -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 r68sm11195109pfi.174.2018.04.22.06.48.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Apr 2018 06:48:26 -0700 (PDT) Received: from gnu-tools-1.hsd1.ca.comcast.net. (localhost [IPv6:::1]) by gnu-tools-1.localdomain (Postfix) with ESMTP id DE1D321FD6; Sun, 22 Apr 2018 06:48:25 -0700 (PDT) From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: Igor Tsimbalist , Uros Bizjak Subject: [PATCH 1/5] x86/CET: Build target libraries with -mshstk Date: Sun, 22 Apr 2018 06:48:21 -0700 Message-Id: <20180422134825.7165-2-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 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. PR target/85485 * cet.m4 (GCC_CET_FLAGS): Replace -mcet with -mshstk. --- config/cet.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cet.m4 b/config/cet.m4 index 04a0e05d2ff..b53c1bbd5cd 100644 --- a/config/cet.m4 +++ b/config/cet.m4 @@ -42,7 +42,7 @@ asm ("setssbsy"); ;; esac if test x$enable_cet = xyes; then - $1="-fcf-protection -mcet" + $1="-fcf-protection -mshstk" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) From patchwork Sun Apr 22 13:48:22 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: 902623 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-476702-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="smvhKJaw"; 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 40TWCw5Wxmz9s0q for ; Sun, 22 Apr 2018 23:49:16 +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=YD/3i+oe/Wziiy2kW/v/ZqCkH827b7ZH+hqBZK3r9cRyEY+ewpAxQ fIJA9OXKKAT9G8xfLBkrrqB+26yFD+zk5/qgAmD0P9ImvyGdd8X+oy8JGbC1Xf0D wyWU/rNmnWJO/jbevn6w2Yv8Y0tNhF4s7KfueH+NHKL6hLuOvNvVZo= 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=l3kdGRSR/6sI02hSHHOoWy1HkvY=; b=smvhKJaw/B0LLntYSq13 n7PlBVx+l9W6aqbCTW02t8ec1StNdPIPZ5UQqP1xPeq0DGBh4XTCQEvMHT6foG2o RtNgyuco1fWGL5iWx6vbi0tVwhV5RaStY65ofsTWnA2nxJd281WKq4jKsk3Yyjj5 /PEBXjl8g88ihBStYmiM0mM= Received: (qmail 24867 invoked by alias); 22 Apr 2018 13:48:55 -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 24604 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=libgfortran, libbacktrace, libobjc, libmpx X-HELO: mail-pf0-f179.google.com Received: from mail-pf0-f179.google.com (HELO mail-pf0-f179.google.com) (209.85.192.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 22 Apr 2018 13:48:39 +0000 Received: by mail-pf0-f179.google.com with SMTP id a26so2025224pfi.7 for ; Sun, 22 Apr 2018 06:48:29 -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=SpRFODGGvk4QAZwkRmWgEUL8MZpBvsqz6iMbt4bFKyY=; b=orsyeQSCub08nrNMAkXxf807PwVOpHvKHI/GcqeQZv45Oo/LpM9wowYsboyxgTIXod KLp4kUpRkzxpoBGFc9/mAtkK40rt8A4to807+BmRwdVtl9Kz9sA7ybZJ/CeAYdl186os 4ksM7ZpcXs6gfF+XDvoa90rXDqJMLzLK/m/xu7raQ2eyXj3T2IaYnVikShIMDvEn1Q6D 88NjJ8RUbt/uFXgHfvrkKHy1hJwAsOwx6tN6q8WomSJnY8PVbrSFU8ndXAs7w/Ed+F5N 1jx6yvbEkVZJvQGpI9j313gkb2Fgh//kH8mF/MCbbm/xOpBkG62ji0U3dUPG6peJlKm0 4y+Q== X-Gm-Message-State: ALQs6tC5jQJRfKjP8LchOKUB74f3JPQ9Izi1cFnd9WrlMhqfHDSteY9Y tFqQzQgqNZ4NGHtnPH7eJ/XSew== X-Google-Smtp-Source: AIpwx4/sys+RlYizvQohGoDzjsQDYAa3szEXdPkhgSR/BjEgk1Tqb0tMFR36kIQu4EHlkDFRZN6i4w== X-Received: by 10.101.77.199 with SMTP id q7mr14515427pgt.305.1524404907928; Sun, 22 Apr 2018 06:48:27 -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 e87sm20156531pfd.136.2018.04.22.06.48.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Apr 2018 06:48:26 -0700 (PDT) Received: from gnu-tools-1.hsd1.ca.comcast.net. (localhost [IPv6:::1]) by gnu-tools-1.localdomain (Postfix) with ESMTP id EB0B721FD9; Sun, 22 Apr 2018 06:48:25 -0700 (PDT) From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: Igor Tsimbalist , Uros Bizjak Subject: [PATCH 2/5] Regenerate configure of target libraries Date: Sun, 22 Apr 2018 06:48:22 -0700 Message-Id: <20180422134825.7165-3-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 * configure: Regenerated. --- libatomic/configure | 2 +- libbacktrace/configure | 2 +- libgcc/configure | 2 +- libgfortran/configure | 2 +- libgomp/configure | 2 +- libitm/configure | 2 +- libmpx/configure | 2 +- libobjc/configure | 2 +- libquadmath/configure | 2 +- libsanitizer/configure | 2 +- libssp/configure | 2 +- libstdc++-v3/configure | 2 +- libvtv/configure | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libatomic/configure b/libatomic/configure index 67a2c9269a3..b902e2c9606 100755 --- a/libatomic/configure +++ b/libatomic/configure @@ -15373,7 +15373,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libbacktrace/configure b/libbacktrace/configure index b1e3adedda0..87cadda6c8c 100755 --- a/libbacktrace/configure +++ b/libbacktrace/configure @@ -11861,7 +11861,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libgcc/configure b/libgcc/configure index fa024134668..b2f3f870844 100644 --- a/libgcc/configure +++ b/libgcc/configure @@ -4849,7 +4849,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libgfortran/configure b/libgfortran/configure index d3e323c11a7..91fce8fecd0 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -5863,7 +5863,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libgomp/configure b/libgomp/configure index 5d8412c5f19..ced7606b355 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -16692,7 +16692,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libitm/configure b/libitm/configure index 10db435d01c..dbf386db434 100644 --- a/libitm/configure +++ b/libitm/configure @@ -17662,7 +17662,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libmpx/configure b/libmpx/configure index 5a4d7f49e0e..70856596425 100644 --- a/libmpx/configure +++ b/libmpx/configure @@ -11657,7 +11657,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libobjc/configure b/libobjc/configure index 699f3773a21..d1a032fbf6a 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -3428,7 +3428,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libquadmath/configure b/libquadmath/configure index 4ad6e3d682b..14610d66238 100755 --- a/libquadmath/configure +++ b/libquadmath/configure @@ -12896,7 +12896,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libsanitizer/configure b/libsanitizer/configure index 5fdc5126478..4695bc7d4f7 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -16598,7 +16598,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libssp/configure b/libssp/configure index f60b7d70402..4e88e4916cc 100755 --- a/libssp/configure +++ b/libssp/configure @@ -4154,7 +4154,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 49d12887d52..ba094be6f15 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -81214,7 +81214,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else diff --git a/libvtv/configure b/libvtv/configure index cde00f9bd6c..a197f750453 100755 --- a/libvtv/configure +++ b/libvtv/configure @@ -15532,7 +15532,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else From patchwork Sun Apr 22 13:48:23 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: 902624 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-476703-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="tK8E0XeS"; 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 40TWD75sWvz9s0q for ; Sun, 22 Apr 2018 23:49:27 +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=ASpAA32h2khKQc6kj8U64CjIACqOREej7VZZ5xVohrB4WsOjOlVtE X3O9aNoTxW1khWbrBujFOUJEH84wY/Q8hXajgMmZaKJmFexCgFOsTVHP5/KcIUn7 glmakfM/2S5E5WZzJ5gbB0tgPNBJVd9q0Igw0DdDCqbwNVVUNYVlt4= 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=Q3a5scvhPobn6L0aCEEC/uUR8jg=; b=tK8E0XeSBEZNAzgZHZ/P ak4ayfFGO/np8E3HxMsEv0CaW7MoD8ZqVkwWKo7u86LWDZ/DlvCXqPvM/atb2BLR y4iQZS7xx6UK3NUL88eLSPXUcdKx8zXHeB40D02oD87TNVzOAsEDbwWE20ESqcH+ OtS/7EBJN8oBzggJbl+fJGk= Received: (qmail 24958 invoked by alias); 22 Apr 2018 13:48:57 -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 24601 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=H*RU:209.85.192.195, Hx-spam-relays-external:209.85.192.195 X-HELO: mail-pf0-f195.google.com Received: from mail-pf0-f195.google.com (HELO mail-pf0-f195.google.com) (209.85.192.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 22 Apr 2018 13:48:39 +0000 Received: by mail-pf0-f195.google.com with SMTP id o16so7077437pfk.9 for ; Sun, 22 Apr 2018 06:48:30 -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=LL0/efGLC98q3m+8icJzYn+tt5ym3RCpXOFfFylhvpk=; b=P5CDxIugQf2iJKEewEZZcKYvtlJIttSs7y3NyUrJYevcW1uEJNNW776QKHaq1vtM1d 1mu2vmsWb99J0GaiLJKtHyk6NWnHaZqu5BFbpzieCurZJlXdiMSFs18uRk1qwXJ+mbAL PL78B7o/Kp5oF5RD8/WcqPLt4taXuPegzZNO+dmhW5UiT+ve2YRI1QbxvzavDsh620q/ 5qrTggLYoz1gmJCX1lzQNRxy3D2KKeAofhO8rHWDWxHXu3QMaF2ybfd4n9iXY8Ipeubi InMfaxjd2uugtaY7WyNWhO1T8r9+hFjxq1Z4CK1ioao+NLYINjTfQfCd5STKDxMuxHgL /PPQ== X-Gm-Message-State: ALQs6tBpRqzgbNeMCWkI8nqWWa98rEIxuBQMbvrT6+k7UjShTLovtRLb jVtu439ugEON3+bR26mOrpA9yQ== X-Google-Smtp-Source: AIpwx48Ar3YY5wMt0BrOgQjiu8PgZFr6t3btCpsWBjkg75hqXiF9ZqPSmBegeDNGTsJ5BE2z4RVRuA== X-Received: by 10.99.7.86 with SMTP id 83mr14592461pgh.211.1524404909151; Sun, 22 Apr 2018 06:48:29 -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 v15sm23280404pfa.116.2018.04.22.06.48.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Apr 2018 06:48:27 -0700 (PDT) Received: from gnu-tools-1.hsd1.ca.comcast.net. (localhost [IPv6:::1]) by gnu-tools-1.localdomain (Postfix) with ESMTP id 02BF321FDC; 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 3/5] Don't bootstrap GCC with -mcet Date: Sun, 22 Apr 2018 06:48:23 -0700 Message-Id: <20180422134825.7165-4-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 requires -mcet. config/ PR target/85485 * bootstrap-cet.mk (STAGE2_CFLAGS): Remove -mcet. (STAGE3_CFLAGS): Likewise. gcc/ PR target/85485 * doc/install.texi: Remove -mcet from bootstrap-cet. --- config/bootstrap-cet.mk | 6 +++--- gcc/doc/install.texi | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/bootstrap-cet.mk b/config/bootstrap-cet.mk index f09193a6dea..b5dee601a3f 100644 --- a/config/bootstrap-cet.mk +++ b/config/bootstrap-cet.mk @@ -1,4 +1,4 @@ -# This option enables -fcf-protection -mcet for stage2 and stage3. +# This option enables -fcf-protection for stage2 and stage3. -STAGE2_CFLAGS += -fcf-protection -mcet -STAGE3_CFLAGS += -fcf-protection -mcet +STAGE2_CFLAGS += -fcf-protection +STAGE3_CFLAGS += -fcf-protection diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 73030a2281a..511e146f023 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -2519,7 +2519,7 @@ must be used along with @code{bootstrap-debug-lean} and @item @samp{bootstrap-cet} This option enables Intel CET for host tools during bootstrapping. @samp{BUILD_CONFIG=bootstrap-cet} is equivalent to adding -@option{-fcf-protection -mcet} to @samp{BOOT_CFLAGS}. This option +@option{-fcf-protection} to @samp{BOOT_CFLAGS}. This option assumes that the host supports Intel CET (e.g. GNU assembler version 2.30 or later). From patchwork Sun Apr 22 13:48:24 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: 902625 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-476704-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="W5lwopvw"; 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 40TWDN36SJz9s0q for ; Sun, 22 Apr 2018 23:49:40 +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=bgImKGhO0+fv4C9H7lykNunAViVQ8GjN71dVoPYbzavn4zy+LPmaC hlef4UENgfNFMu2ja1XYRnJ9m5FR+OJd/JSKBk5rkEe4ViffiHl9rgjLg/sw/50i UuEjTboQol62YExtmEiaoA83NcKdeAG47DgwQMGPrHsOemFtN4HD5o= 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=oXI0SIpbmrrH9NV0Q0UJXzHrGqI=; b=W5lwopvwnOqZp0gQaQlj t+wbkJ4vSlk4O2cDu3Z5gfQ5p/2/dcd5r6j97iRoaFS/yQsbtO6Bw6zbCXRUR3iH hF8RXYGRxxNuoONYScOb0Meq/ZPsnDv6Mxxc5/2v7SR2bGm2qpzT9BamnceypGOm u4DTle+mKGVQBIC/kMOma54= Received: (qmail 24972 invoked by alias); 22 Apr 2018 13:48:57 -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 24620 invoked by uid 89); 22 Apr 2018 13:48:47 -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=H*RU:209.85.192.193, Hx-spam-relays-external:209.85.192.193, jmp, t.*buf X-HELO: mail-pf0-f193.google.com Received: from mail-pf0-f193.google.com (HELO mail-pf0-f193.google.com) (209.85.192.193) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 22 Apr 2018 13:48:39 +0000 Received: by mail-pf0-f193.google.com with SMTP id a2so7089932pff.8 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=JjwS4HOMiUBhl0X2J0PDEC8PMLaMq1ouiBL7EwD4Blk=; b=ArAGiyC0i8l1U2Uh6b4ipmSxAHHkqp60w7z80yvDEZAz6wNJ9VUJt07zTaXEmvh45i sEYzZKBel9Nrl5yFQiKaPBqOwX5xARwEzYdYk7Fjlu/5IwbTHTe+bECzSXzO0vp1sngI lq92DJOMGbCgmrJ6jPlc6CRGo26iT+u053cBDpf89oLgA31JFlZrMhkAbAuMvyFOsSwu TjJ6Cc8yOX81OfX8E3gQeu8ZWiV432DyxZav8KncaoI9ButKJcaG6LHmuuWpy8+TmTdW jiZzlF7vlag8lCvuWzVTFtdgbyDyiSuyxohLq6RqEuEiQ5dIJu3TewYBmLtKXAySnY5F Av6Q== X-Gm-Message-State: ALQs6tDKlnu2WFIYzrCBfdqymktOWUCGsYzL1Jg5s0TvFUQOKm1wS0eE 5OxlOuqcahbuVKETya1qDUBH+g== X-Google-Smtp-Source: AIpwx4/n74U4YWm6FkKoT0UCXMCwRxAV06bD+WzQXVdRobkrNJpNsfFR4a/VERAUQnujOcBxPBy0fg== X-Received: by 10.98.16.142 with SMTP id 14mr16539252pfq.22.1524404909636; Sun, 22 Apr 2018 06:48:29 -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 x3sm25043808pff.87.2018.04.22.06.48.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Apr 2018 06:48:27 -0700 (PDT) Received: from gnu-tools-1.hsd1.ca.comcast.net. (localhost [IPv6:::1]) by gnu-tools-1.localdomain (Postfix) with ESMTP id 1045B21FE1; 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 4/5] x86/CET tests: Remove -mcet/-mno-cet or replace -mcet with -mshstk Date: Sun, 22 Apr 2018 06:48:24 -0700 Message-Id: <20180422134825.7165-5-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. We can remove -mcet/-mno-cet where they are unused and replace -mcet with -mshstk where -mcet is used as an alias for -mshstk. PR target/85485 * g++.dg/cet-notrack-1.C (dg-options): Remove -mcet. * g++.dg/torture/pr85334.C (dg-additional-options): Likwise. * gcc.dg/pr85388-1.c (dg-options): Likwise. * gcc.dg/pr85388-2.c (dg-options): Likwise. * gcc.dg/pr85388-3.c (dg-options): Likwise. * gcc.dg/pr85388-4.c (dg-options): Likwise. * gcc.dg/pr85388-5.c (dg-options): Likwise. * gcc.dg/pr85388-6.c (dg-options): Likwise. * gcc.dg/torture/pr85397-1.c (dg-additional-options): Likwise. * gcc.target/i386/attr-nocf-check-1a.c (dg-options): Likwise. * gcc.target/i386/attr-nocf-check-3a.c (dg-options): Likwise. * gcc.target/i386/cet-label.c (dg-options): Likwise. * gcc.target/i386/cet-label-2.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-1b.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-2a.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-2b.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-3.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-4b.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-5a.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-5b.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-6a.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-6b.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-7.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-icf-2.c (dg-options): Likwise. * gcc.target/i386/cet-notrack-icf-4.c (dg-options): Likwise. * gcc.target/i386/cet-property-1.c (dg-options): Likwise. * gcc.target/i386/cet-property-2.c (dg-options): Likwise. * gcc.target/i386/cet-sjlj-1.c (dg-options): Likwise. * gcc.target/i386/cet-sjlj-2.c (dg-options): Likwise. * gcc.target/i386/cet-sjlj-3.c (dg-options): Likwise. * gcc.target/i386/cet-sjlj-4.c (dg-options): Likwise. * gcc.target/i386/cet-sjlj-5.c (dg-options): Likwise. * gcc.target/i386/cet-sjlj-6a.c (dg-options): Likwise. * gcc.target/i386/cet-sjlj-6b.c (dg-options): Likwise. * gcc.target/i386/cet-switch-1.c (dg-options): Likwise. * gcc.target/i386/cet-switch-2.c (dg-options): Likwise. * gcc.target/i386/cet-switch-3.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-11.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-12.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-attr-12.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-attr-13.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-attr-14.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-attr-15.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-attr-16.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-extern-8.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-extern-9.c (dg-options): Likwise. * gcc.target/i386/indirect-thunk-extern-10.c (dg-options): Likwise. * gcc.target/i386/pr82659-1.c (dg-options): Likwise. * gcc.target/i386/pr82659-2.c (dg-options): Likwise. * gcc.target/i386/pr82659-3.c (dg-options): Likwise. * gcc.target/i386/pr82659-4.c (dg-options): Likwise. * gcc.target/i386/pr82659-5.c (dg-options): Likwise. * gcc.target/i386/pr82659-6.c (dg-options): Likwise. * gcc.target/i386/pr84146.c (dg-options): Likwise. * gcc.target/i386/pr85345.c (dg-options): Likwise. * gcc.target/i386/pr85403.c (dg-options): Likwise. * gcc.target/i386/pr85404.c (dg-options): Likwise. * gcc.target/i386/cet-intrin-3.c (dg-options): Replace -mcet with -mshstk. * gcc.target/i386/cet-intrin-5.c (dg-options): Likwise. * gcc.target/i386/cet-intrin-6.c (dg-options): Likwise. * gcc.target/i386/cet-intrin-7.c (dg-options): Likwise. * gcc.target/i386/cet-intrin-8.c (dg-options): Likwise. * gcc.target/i386/cet-intrin-9.c (dg-options): Likwise. * gcc.target/i386/cet-intrin-10.c (dg-options): Likwise. * gcc.target/i386/cet-rdssp-1.c (dg-options): Likwise. * (dg-options): Likwise. * gcc.target/i386/cet-notrack-1a.c (dg-options): Remove -mno-cet. * gcc.target/i386/cet-notrack-4a.c (dg-options): Likwise. * gcc.target/i386/cet-label-3.c: Removed. * gcc.target/i386/cet-property-3.c: Likwise. * gcc.target/i386/cet-sjlj-7.c: Likwise. --- gcc/testsuite/g++.dg/cet-notrack-1.C | 2 +- gcc/testsuite/g++.dg/torture/pr85334.C | 2 +- gcc/testsuite/gcc.dg/pr85388-1.c | 2 +- gcc/testsuite/gcc.dg/pr85388-2.c | 2 +- gcc/testsuite/gcc.dg/pr85388-3.c | 2 +- gcc/testsuite/gcc.dg/pr85388-4.c | 2 +- gcc/testsuite/gcc.dg/pr85388-5.c | 2 +- gcc/testsuite/gcc.dg/pr85388-6.c | 4 +- gcc/testsuite/gcc.dg/torture/pr85397-1.c | 2 +- gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c | 2 +- gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c | 2 +- gcc/testsuite/gcc.target/i386/cet-intrin-10.c | 2 +- gcc/testsuite/gcc.target/i386/cet-intrin-3.c | 2 +- gcc/testsuite/gcc.target/i386/cet-intrin-5.c | 2 +- gcc/testsuite/gcc.target/i386/cet-intrin-6.c | 2 +- gcc/testsuite/gcc.target/i386/cet-intrin-7.c | 2 +- gcc/testsuite/gcc.target/i386/cet-intrin-8.c | 2 +- gcc/testsuite/gcc.target/i386/cet-intrin-9.c | 2 +- gcc/testsuite/gcc.target/i386/cet-label-2.c | 2 +- gcc/testsuite/gcc.target/i386/cet-label-3.c | 16 -------- gcc/testsuite/gcc.target/i386/cet-label.c | 4 +- gcc/testsuite/gcc.target/i386/cet-notrack-1a.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-1b.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-2a.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-2b.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-3.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-4a.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-4b.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-5a.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-5b.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-6a.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-6b.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-7.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c | 2 +- gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c | 2 +- gcc/testsuite/gcc.target/i386/cet-property-1.c | 2 +- gcc/testsuite/gcc.target/i386/cet-property-2.c | 2 +- gcc/testsuite/gcc.target/i386/cet-property-3.c | 11 ----- gcc/testsuite/gcc.target/i386/cet-rdssp-1.c | 2 +- gcc/testsuite/gcc.target/i386/cet-sjlj-1.c | 2 +- gcc/testsuite/gcc.target/i386/cet-sjlj-2.c | 2 +- gcc/testsuite/gcc.target/i386/cet-sjlj-3.c | 2 +- gcc/testsuite/gcc.target/i386/cet-sjlj-4.c | 2 +- gcc/testsuite/gcc.target/i386/cet-sjlj-5.c | 2 +- gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c | 2 +- gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c | 2 +- gcc/testsuite/gcc.target/i386/cet-sjlj-7.c | 48 ---------------------- gcc/testsuite/gcc.target/i386/cet-switch-1.c | 2 +- gcc/testsuite/gcc.target/i386/cet-switch-2.c | 2 +- gcc/testsuite/gcc.target/i386/cet-switch-3.c | 2 +- gcc/testsuite/gcc.target/i386/indirect-thunk-11.c | 2 +- gcc/testsuite/gcc.target/i386/indirect-thunk-12.c | 2 +- .../gcc.target/i386/indirect-thunk-attr-12.c | 2 +- .../gcc.target/i386/indirect-thunk-attr-13.c | 2 +- .../gcc.target/i386/indirect-thunk-attr-14.c | 2 +- .../gcc.target/i386/indirect-thunk-attr-15.c | 2 +- .../gcc.target/i386/indirect-thunk-attr-16.c | 2 +- .../gcc.target/i386/indirect-thunk-extern-10.c | 2 +- .../gcc.target/i386/indirect-thunk-extern-8.c | 2 +- .../gcc.target/i386/indirect-thunk-extern-9.c | 2 +- gcc/testsuite/gcc.target/i386/pr82659-1.c | 2 +- gcc/testsuite/gcc.target/i386/pr82659-2.c | 2 +- gcc/testsuite/gcc.target/i386/pr82659-3.c | 2 +- gcc/testsuite/gcc.target/i386/pr82659-4.c | 2 +- gcc/testsuite/gcc.target/i386/pr82659-5.c | 2 +- gcc/testsuite/gcc.target/i386/pr82659-6.c | 2 +- gcc/testsuite/gcc.target/i386/pr84146.c | 2 +- gcc/testsuite/gcc.target/i386/pr85345.c | 2 +- gcc/testsuite/gcc.target/i386/pr85403.c | 2 +- gcc/testsuite/gcc.target/i386/pr85404.c | 2 +- 70 files changed, 69 insertions(+), 144 deletions(-) delete mode 100644 gcc/testsuite/gcc.target/i386/cet-label-3.c delete mode 100644 gcc/testsuite/gcc.target/i386/cet-property-3.c delete mode 100644 gcc/testsuite/gcc.target/i386/cet-sjlj-7.c diff --git a/gcc/testsuite/g++.dg/cet-notrack-1.C b/gcc/testsuite/g++.dg/cet-notrack-1.C index 43dbbd6a7f3..eab0946d477 100644 --- a/gcc/testsuite/g++.dg/cet-notrack-1.C +++ b/gcc/testsuite/g++.dg/cet-notrack-1.C @@ -1,5 +1,5 @@ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-options "-fcf-protection -mcet" } */ +/* { dg-options "-fcf-protection" } */ /* { dg-final { scan-assembler "endbr32|endbr64" } } */ /* { dg-final { scan-assembler-times "\tcall\[ \t]+puts" 2 } } */ /* { dg-final { scan-assembler-times "notrack call\[ \t]+" 1 } } */ diff --git a/gcc/testsuite/g++.dg/torture/pr85334.C b/gcc/testsuite/g++.dg/torture/pr85334.C index 080978143bd..a282edc88e9 100644 --- a/gcc/testsuite/g++.dg/torture/pr85334.C +++ b/gcc/testsuite/g++.dg/torture/pr85334.C @@ -1,6 +1,6 @@ // { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } // { dg-require-effective-target cet } -// { dg-additional-options "-fexceptions -fnon-call-exceptions -fcf-protection -mcet" } +// { dg-additional-options "-fexceptions -fnon-call-exceptions -fcf-protection" } #include #include diff --git a/gcc/testsuite/gcc.dg/pr85388-1.c b/gcc/testsuite/gcc.dg/pr85388-1.c index 86d4737e32b..8176118e71e 100644 --- a/gcc/testsuite/gcc.dg/pr85388-1.c +++ b/gcc/testsuite/gcc.dg/pr85388-1.c @@ -3,7 +3,7 @@ /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */ /* { dg-require-effective-target cet } */ /* { dg-require-effective-target split_stack } */ -/* { dg-options "-fsplit-stack -fcf-protection -mcet" } */ +/* { dg-options "-fsplit-stack -fcf-protection" } */ #include #include diff --git a/gcc/testsuite/gcc.dg/pr85388-2.c b/gcc/testsuite/gcc.dg/pr85388-2.c index fd13d984c50..075ab9ed563 100644 --- a/gcc/testsuite/gcc.dg/pr85388-2.c +++ b/gcc/testsuite/gcc.dg/pr85388-2.c @@ -2,7 +2,7 @@ /* { dg-require-effective-target cet } */ /* { dg-require-effective-target split_stack } */ /* { dg-require-effective-target pthread_h } */ -/* { dg-options "-pthread -fsplit-stack -fcf-protection -mcet" } */ +/* { dg-options "-pthread -fsplit-stack -fcf-protection" } */ #include #include diff --git a/gcc/testsuite/gcc.dg/pr85388-3.c b/gcc/testsuite/gcc.dg/pr85388-3.c index 730d2be9c22..232ef20acf0 100644 --- a/gcc/testsuite/gcc.dg/pr85388-3.c +++ b/gcc/testsuite/gcc.dg/pr85388-3.c @@ -3,7 +3,7 @@ /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */ /* { dg-require-effective-target cet } */ /* { dg-require-effective-target split_stack } */ -/* { dg-options "-fsplit-stack -fcf-protection -mcet" } */ +/* { dg-options "-fsplit-stack -fcf-protection" } */ #include #include diff --git a/gcc/testsuite/gcc.dg/pr85388-4.c b/gcc/testsuite/gcc.dg/pr85388-4.c index 03937d0e735..8a3cc14f205 100644 --- a/gcc/testsuite/gcc.dg/pr85388-4.c +++ b/gcc/testsuite/gcc.dg/pr85388-4.c @@ -3,7 +3,7 @@ /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */ /* { dg-require-effective-target cet } */ /* { dg-require-effective-target split_stack } */ -/* { dg-options "-fsplit-stack -fcf-protection -mcet" } */ +/* { dg-options "-fsplit-stack -fcf-protection" } */ #include #include diff --git a/gcc/testsuite/gcc.dg/pr85388-5.c b/gcc/testsuite/gcc.dg/pr85388-5.c index 7462a40892c..6c161b9c5ae 100644 --- a/gcc/testsuite/gcc.dg/pr85388-5.c +++ b/gcc/testsuite/gcc.dg/pr85388-5.c @@ -1,7 +1,7 @@ /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */ /* { dg-require-effective-target cet } */ /* { dg-require-effective-target split_stack } */ -/* { dg-options "-fsplit-stack -fcf-protection -mcet" } */ +/* { dg-options "-fsplit-stack -fcf-protection" } */ /* This test is like split-3.c, but tests with a smaller stack frame, since that uses a different prologue. */ diff --git a/gcc/testsuite/gcc.dg/pr85388-6.c b/gcc/testsuite/gcc.dg/pr85388-6.c index 23b5d8e3df6..b218dfc6144 100644 --- a/gcc/testsuite/gcc.dg/pr85388-6.c +++ b/gcc/testsuite/gcc.dg/pr85388-6.c @@ -1,8 +1,8 @@ /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */ /* { dg-require-effective-target cet } */ /* { dg-require-effective-target split_stack } */ -/* { dg-options "-fsplit-stack -O2 -fcf-protection -mcet" } */ -/* { dg-options "-fsplit-stack -O2 -mno-accumulate-outgoing-args -fcf-protection -mcet" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ +/* { dg-options "-fsplit-stack -O2 -fcf-protection" } */ +/* { dg-options "-fsplit-stack -O2 -mno-accumulate-outgoing-args -fcf-protection" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* A case that used to fail on 32-bit x86 when optimizing and not using -maccumulate-args. The stack adjustment of the alloca got diff --git a/gcc/testsuite/gcc.dg/torture/pr85397-1.c b/gcc/testsuite/gcc.dg/torture/pr85397-1.c index 65085240266..46e31d1790b 100644 --- a/gcc/testsuite/gcc.dg/torture/pr85397-1.c +++ b/gcc/testsuite/gcc.dg/torture/pr85397-1.c @@ -1,6 +1,6 @@ /* { dg-do run { target i?86-*-* x86_64-*-* } } */ /* { dg-require-effective-target cet } */ -/* { dg-additional-options "-fcf-protection -mcet" } */ +/* { dg-additional-options "-fcf-protection" } */ #define DEPTH 1000 diff --git a/gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c b/gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c index 9549e697658..f2751e8c814 100644 --- a/gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c +++ b/gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fcf-protection -mcet" } */ +/* { dg-options "-fcf-protection" } */ int func (int) __attribute__ ((nocf_check)); int (*fptr) (int) __attribute__ ((nocf_check)); diff --git a/gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c b/gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c index 1a833012409..9924cdc80f0 100644 --- a/gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c +++ b/gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fcf-protection -mcet" } */ +/* { dg-options "-fcf-protection" } */ int foo (void) __attribute__ ((nocf_check)); void (*foo1) (void) __attribute__((nocf_check)); diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-10.c b/gcc/testsuite/gcc.target/i386/cet-intrin-10.c index 695dc5edc34..76326c31c8e 100644 --- a/gcc/testsuite/gcc.target/i386/cet-intrin-10.c +++ b/gcc/testsuite/gcc.target/i386/cet-intrin-10.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -mcet" } */ +/* { dg-options "-O2 -mshstk" } */ /* { dg-final { scan-assembler-times "clrssbsy" 1 } } */ #include diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-3.c b/gcc/testsuite/gcc.target/i386/cet-intrin-3.c index b98c1e928d5..e1080d76753 100644 --- a/gcc/testsuite/gcc.target/i386/cet-intrin-3.c +++ b/gcc/testsuite/gcc.target/i386/cet-intrin-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection -mshstk" } */ /* { dg-final { scan-assembler-times "endbr32" 2 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 4 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler "rdsspd|incsspd\[ \t]+(%|)eax" { target ia32 } } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-5.c b/gcc/testsuite/gcc.target/i386/cet-intrin-5.c index 8a1b637905c..59ba1bc0761 100644 --- a/gcc/testsuite/gcc.target/i386/cet-intrin-5.c +++ b/gcc/testsuite/gcc.target/i386/cet-intrin-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -mcet" } */ +/* { dg-options "-O2 -mshstk" } */ /* { dg-final { scan-assembler-times "saveprevssp" 1 } } */ #include diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-6.c b/gcc/testsuite/gcc.target/i386/cet-intrin-6.c index dfa6d20ca26..7874288d1f5 100644 --- a/gcc/testsuite/gcc.target/i386/cet-intrin-6.c +++ b/gcc/testsuite/gcc.target/i386/cet-intrin-6.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -mcet" } */ +/* { dg-options "-O2 -mshstk" } */ /* { dg-final { scan-assembler-times "rstorssp" 1 } } */ #include diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-7.c b/gcc/testsuite/gcc.target/i386/cet-intrin-7.c index ecd1825a303..40770efdb4e 100644 --- a/gcc/testsuite/gcc.target/i386/cet-intrin-7.c +++ b/gcc/testsuite/gcc.target/i386/cet-intrin-7.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -mcet" } */ +/* { dg-options "-O2 -mshstk" } */ /* { dg-final { scan-assembler-times "wrssd" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "wrss\[d|q]" 2 { target lp64 } } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-8.c b/gcc/testsuite/gcc.target/i386/cet-intrin-8.c index 2188876cca5..85633b0440b 100644 --- a/gcc/testsuite/gcc.target/i386/cet-intrin-8.c +++ b/gcc/testsuite/gcc.target/i386/cet-intrin-8.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -mcet" } */ +/* { dg-options "-O2 -mshstk" } */ /* { dg-final { scan-assembler-times "wrussd" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "wruss\[d|q]" 2 { target lp64 } } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-9.c b/gcc/testsuite/gcc.target/i386/cet-intrin-9.c index 569931a9492..22c3fc0baf2 100644 --- a/gcc/testsuite/gcc.target/i386/cet-intrin-9.c +++ b/gcc/testsuite/gcc.target/i386/cet-intrin-9.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -mcet" } */ +/* { dg-options "-O2 -mshstk" } */ /* { dg-final { scan-assembler-times "setssbsy" 1 } } */ #include diff --git a/gcc/testsuite/gcc.target/i386/cet-label-2.c b/gcc/testsuite/gcc.target/i386/cet-label-2.c index c7f79819079..8058117b036 100644 --- a/gcc/testsuite/gcc.target/i386/cet-label-2.c +++ b/gcc/testsuite/gcc.target/i386/cet-label-2.c @@ -1,6 +1,6 @@ /* Verify that CET works. */ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 3 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 3 { target { ! ia32 } } } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-label-3.c b/gcc/testsuite/gcc.target/i386/cet-label-3.c deleted file mode 100644 index 5e0892e5b4d..00000000000 --- a/gcc/testsuite/gcc.target/i386/cet-label-3.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Verify that -fcf-protection works without -mcet. */ -/* { dg-do compile } */ -/* { dg-options "-O -fcf-protection" } */ -/* { dg-final { scan-assembler-times "endbr32" 3 { target ia32 } } } */ -/* { dg-final { scan-assembler-times "endbr64" 3 { target { ! ia32 } } } } */ - -int func (int arg) -{ - static void *array[] = { &&foo, &&bar }; - - goto *array[arg]; -foo: - return arg*111; -bar: - return arg*777; -} diff --git a/gcc/testsuite/gcc.target/i386/cet-label.c b/gcc/testsuite/gcc.target/i386/cet-label.c index 8fb8d420349..ea48f4161eb 100644 --- a/gcc/testsuite/gcc.target/i386/cet-label.c +++ b/gcc/testsuite/gcc.target/i386/cet-label.c @@ -1,6 +1,6 @@ -/* Verify that CET works. */ +/* Verify that -fcf-protection works. */ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 3 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 3 { target { ! ia32 } } } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-1a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-1a.c index ab0bd3ba9b2..d8d2e5a6d15 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-1a.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-1a.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O0 -fcf-protection=none -mno-cet" } */ +/* { dg-options "-O0 -fcf-protection=none" } */ /* { dg-final { scan-assembler-not "endbr" } } */ /* { dg-final { scan-assembler-not "notrack call\[ \t]+" } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-1b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-1b.c index 6faf88fdf04..d1a3337ac21 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-1b.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-1b.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "notrack call\[ \t]+" 2 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-2a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-2a.c index 6f441e49edf..76b0e2d5611 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-2a.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-2a.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "notrack call\[ \t]+" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-2b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-2b.c index 0df46450e88..8b4952d40bb 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-2b.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-2b.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "notrack jmp\[ \t]+" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-3.c b/gcc/testsuite/gcc.target/i386/cet-notrack-3.c index 5e124c7f95c..709eda6b77e 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-3.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "notrack call\[ \t]+" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-4a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-4a.c index 34cfd9098c2..c8ff6de1cc8 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-4a.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-4a.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fcf-protection=none -mno-cet" } */ +/* { dg-options "-fcf-protection=none" } */ int var1 __attribute__((nocf_check)); /* { dg-warning "'nocf_check' attribute only applies to function types" } */ int *var2 __attribute__((nocf_check)); /* { dg-warning "'nocf_check' attribute only applies to function types" } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-4b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-4b.c index 6065ef69c25..68226b7d0da 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-4b.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-4b.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ int var1 __attribute__((nocf_check)); /* { dg-warning "'nocf_check' attribute only applies to function types" } */ int *var2 __attribute__((nocf_check)); /* { dg-warning "'nocf_check' attribute only applies to function types" } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-5a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-5a.c index d23968e58d1..50fe0db7d0c 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-5a.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-5a.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-not "\tcall\[ \t]+" } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-5b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-5b.c index 42d9d07b19d..222ff62d670 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-5b.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-5b.c @@ -1,6 +1,6 @@ /* Check the attribute do not proparate through assignment. */ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "\tcall\[ \t]+" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-6a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-6a.c index e0fb4f90aaf..8bbe6e48796 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-6a.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-6a.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "\t(?:call|jmp)\[ \t]+.*foo" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-6b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-6b.c index 1c47c9f7d20..f27088c7283 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-6b.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-6b.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O0 -fcf-protection -mcet" } */ +/* { dg-options "-O0 -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-not "\tcall\[ \t]+" } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-7.c b/gcc/testsuite/gcc.target/i386/cet-notrack-7.c index f2e31d0258a..ddfa950ec0c 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-7.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-7.c @@ -1,6 +1,6 @@ /* Check the notrack prefix is not generated for direct call. */ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "notrack call\[ \t]+.*foo" 0 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c b/gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c index db0b0a44237..08132a3e7ac 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c @@ -1,6 +1,6 @@ /* Verify nocf_check functions are not ICF optimized. */ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler "endbr" } } */ /* { dg-final { scan-assembler "fn3:" } } */ /* { dg-final { scan-assembler "set\[ \t]+fn2,fn1" } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c b/gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c index e4e96aaf0dc..b5f07876b52 100644 --- a/gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c +++ b/gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c @@ -1,6 +1,6 @@ /* Verify nocf_check function calls are not ICF optimized. */ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler "endbr" } } */ /* { dg-final { scan-assembler "fn2:" } } */ /* { dg-final { scan-assembler "set\[ \t]+fn3,fn1" } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-property-1.c b/gcc/testsuite/gcc.target/i386/cet-property-1.c index df243efc574..3e211c970aa 100644 --- a/gcc/testsuite/gcc.target/i386/cet-property-1.c +++ b/gcc/testsuite/gcc.target/i386/cet-property-1.c @@ -1,5 +1,5 @@ /* { dg-do compile { target *-*-linux* } } */ -/* { dg-options "-fcf-protection -mcet" } */ +/* { dg-options "-fcf-protection" } */ /* { dg-final { scan-assembler ".note.gnu.property" } } */ extern void foo (void); diff --git a/gcc/testsuite/gcc.target/i386/cet-property-2.c b/gcc/testsuite/gcc.target/i386/cet-property-2.c index bca6f6cdeb7..fae3db5f63f 100644 --- a/gcc/testsuite/gcc.target/i386/cet-property-2.c +++ b/gcc/testsuite/gcc.target/i386/cet-property-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-mcet -fcf-protection=none" } */ +/* { dg-options "-fcf-protection=none" } */ /* { dg-final { scan-assembler-not ".note.gnu.property" } } */ extern void foo (void); diff --git a/gcc/testsuite/gcc.target/i386/cet-property-3.c b/gcc/testsuite/gcc.target/i386/cet-property-3.c deleted file mode 100644 index 3e211c970aa..00000000000 --- a/gcc/testsuite/gcc.target/i386/cet-property-3.c +++ /dev/null @@ -1,11 +0,0 @@ -/* { dg-do compile { target *-*-linux* } } */ -/* { dg-options "-fcf-protection" } */ -/* { dg-final { scan-assembler ".note.gnu.property" } } */ - -extern void foo (void); - -void -bar (void) -{ - foo (); -} diff --git a/gcc/testsuite/gcc.target/i386/cet-rdssp-1.c b/gcc/testsuite/gcc.target/i386/cet-rdssp-1.c index 6cd24f63384..481a0e78a10 100644 --- a/gcc/testsuite/gcc.target/i386/cet-rdssp-1.c +++ b/gcc/testsuite/gcc.target/i386/cet-rdssp-1.c @@ -1,5 +1,5 @@ /* { dg-do run { target cet } } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection -mshstk" } */ void _exit(int status) __attribute__ ((__noreturn__)); diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-1.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-1.c index d80ab051c37..5e34810babc 100644 --- a/gcc/testsuite/gcc.target/i386/cet-sjlj-1.c +++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 4 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 4 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "rdssp\[dq]" 2 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-2.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-2.c index c97094a19c9..49c9dc2ccec 100644 --- a/gcc/testsuite/gcc.target/i386/cet-sjlj-2.c +++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-2.c @@ -1,4 +1,4 @@ /* { dg-do run { target cet } } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ #include "cet-sjlj-1.c" diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-3.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-3.c index 585f4d7ae89..25117cc0c9f 100644 --- a/gcc/testsuite/gcc.target/i386/cet-sjlj-3.c +++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 4 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 4 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "call _?setjmp" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-4.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-4.c index 6a57cede208..329a592f4b2 100644 --- a/gcc/testsuite/gcc.target/i386/cet-sjlj-4.c +++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-4.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 3 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 3 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "rdssp\[dq]" 2 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-5.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-5.c index 8e54b4bfec8..1b624327d0f 100644 --- a/gcc/testsuite/gcc.target/i386/cet-sjlj-5.c +++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 2 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 2 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "call _?setjmp" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c index 87fe2e6dc67..040b297aeb0 100644 --- a/gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c +++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c @@ -1,6 +1,6 @@ /* { dg-do compile { target { ! ia32 } } } */ /* { dg-require-effective-target maybe_x32 } */ -/* { dg-options "-O -maddress-mode=short -fcf-protection -mcet -mx32" } */ +/* { dg-options "-O -maddress-mode=short -fcf-protection -mx32" } */ /* { dg-final { scan-assembler-times "endbr64" 2 } } */ /* { dg-final { scan-assembler-times "movq\t.*buf\\+8" 1 } } */ /* { dg-final { scan-assembler-times "subq\tbuf\\+8" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c index b3866d52946..6ec4b834bfb 100644 --- a/gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c +++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c @@ -1,5 +1,5 @@ /* { dg-do compile { target { ! ia32 } } } */ -/* { dg-options "-O -maddress-mode=long -fcf-protection -mcet -mx32" } */ +/* { dg-options "-O -maddress-mode=long -fcf-protection -mx32" } */ /* { dg-final { scan-assembler-times "endbr64" 2 } } */ /* { dg-final { scan-assembler-times "movq\t.*buf\\+16" 1 } } */ /* { dg-final { scan-assembler-times "subq\tbuf\\+16" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-7.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-7.c deleted file mode 100644 index 1b624327d0f..00000000000 --- a/gcc/testsuite/gcc.target/i386/cet-sjlj-7.c +++ /dev/null @@ -1,48 +0,0 @@ -/* { dg-do compile } */ -/* { dg-options "-O -fcf-protection" } */ -/* { dg-final { scan-assembler-times "endbr32" 2 { target ia32 } } } */ -/* { dg-final { scan-assembler-times "endbr64" 2 { target { ! ia32 } } } } */ -/* { dg-final { scan-assembler-times "call _?setjmp" 1 } } */ -/* { dg-final { scan-assembler-times "call longjmp" 1 } } */ - -#include -#include - -jmp_buf buf; -static int bar (int); - -__attribute__ ((noinline, noclone)) -static int -foo (int i) -{ - int j = i * 11; - - if (!setjmp (buf)) - { - j += 33; - printf ("After setjmp: j = %d\n", j); - bar (j); - } - - return j + i; -} - -__attribute__ ((noinline, noclone)) -static int -bar (int i) -{ - int j = i; - - j -= 111; - printf ("In longjmp: j = %d\n", j); - longjmp (buf, 1); - - return j; -} - -int -main () -{ - foo (10); - return 0; -} diff --git a/gcc/testsuite/gcc.target/i386/cet-switch-1.c b/gcc/testsuite/gcc.target/i386/cet-switch-1.c index 7a75857fcb1..afe5adc2f3d 100644 --- a/gcc/testsuite/gcc.target/i386/cet-switch-1.c +++ b/gcc/testsuite/gcc.target/i386/cet-switch-1.c @@ -1,6 +1,6 @@ /* Verify that CET works. */ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet" } */ +/* { dg-options "-O -fcf-protection" } */ /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "notrack jmp\[ \t]+\[*]" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-switch-2.c b/gcc/testsuite/gcc.target/i386/cet-switch-2.c index e620b837a3c..69ddc6fd5b7 100644 --- a/gcc/testsuite/gcc.target/i386/cet-switch-2.c +++ b/gcc/testsuite/gcc.target/i386/cet-switch-2.c @@ -1,6 +1,6 @@ /* Verify that CET works. */ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet -mcet-switch" } */ +/* { dg-options "-O -fcf-protection -mcet-switch" } */ /* { dg-final { scan-assembler-times "endbr32" 12 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 12 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "\[ \t]+jmp\[ \t]+\[*]" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/cet-switch-3.c b/gcc/testsuite/gcc.target/i386/cet-switch-3.c index 9b1b4369582..0d9ed4488dd 100644 --- a/gcc/testsuite/gcc.target/i386/cet-switch-3.c +++ b/gcc/testsuite/gcc.target/i386/cet-switch-3.c @@ -1,6 +1,6 @@ /* Verify that CET works. */ /* { dg-do compile } */ -/* { dg-options "-O -fcf-protection -mcet -mcet-switch" } */ +/* { dg-options "-O -fcf-protection -mcet-switch" } */ /* { dg-final { scan-assembler-times "endbr32" 12 { target ia32 } } } */ /* { dg-final { scan-assembler-times "endbr64" 12 { target { ! ia32 } } } } */ /* { dg-final { scan-assembler-times "\[ \t]+jmp\[ \t]+\[*]" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-11.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-11.c index afa89ff227b..b6bd51be63a 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-11.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-11.c @@ -1,5 +1,5 @@ /* { dg-do compile { target { ! x32 } } } */ -/* { dg-options "-O2 -mindirect-branch=thunk-extern -fcf-protection -mcet -fcheck-pointer-bounds -mmpx" } */ +/* { dg-options "-O2 -mindirect-branch=thunk-extern -fcf-protection -fcheck-pointer-bounds -mmpx" } */ void bar (void) diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-12.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-12.c index d456973ee6d..2c3848e1fb0 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-12.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-12.c @@ -1,5 +1,5 @@ /* { dg-do compile { target { ! x32 } } } */ -/* { dg-options "-O2 -mindirect-branch=thunk -fcf-protection -mcet -fcheck-pointer-bounds -mmpx" } */ +/* { dg-options "-O2 -mindirect-branch=thunk -fcf-protection -fcheck-pointer-bounds -mmpx" } */ void bar (void) diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-12.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-12.c index 24a1a08a3ca..5da515690d4 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-12.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-12.c @@ -1,5 +1,5 @@ /* { dg-do compile { target { ! x32 } } } */ -/* { dg-options "-O2 -mindirect-branch=keep -fcf-protection -mcet -fcheck-pointer-bounds -mmpx" } */ +/* { dg-options "-O2 -mindirect-branch=keep -fcf-protection -fcheck-pointer-bounds -mmpx" } */ __attribute__ ((indirect_branch("thunk-extern"))) void diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-13.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-13.c index ff2fccae935..a671e460098 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-13.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-13.c @@ -1,5 +1,5 @@ /* { dg-do compile { target { ! x32 } } } */ -/* { dg-options "-O2 -mindirect-branch=keep -fcf-protection -mcet -fcheck-pointer-bounds -mmpx" } */ +/* { dg-options "-O2 -mindirect-branch=keep -fcf-protection -fcheck-pointer-bounds -mmpx" } */ __attribute__ ((indirect_branch("thunk-inline"))) void diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c index 669e56d7726..eb25139da6d 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c @@ -1,5 +1,5 @@ /* { dg-do compile { target *-*-linux* } } */ -/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection -mcet" } */ +/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection" } */ extern void (*bar) (void); diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c index c033fb23879..1ad459e3b19 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c @@ -1,5 +1,5 @@ /* { dg-do compile { target *-*-linux* } } */ -/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection -mcet" } */ +/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection" } */ extern void (*bar) (void); diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c index 0244edf53b7..86fe035bc9a 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c @@ -1,5 +1,5 @@ /* { dg-do compile { target *-*-linux* } } */ -/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection -mcet" } */ +/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection" } */ extern void (*bar) (void) __attribute__((nocf_check)); diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c index 2a982ab69f8..95731d6f365 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c @@ -1,5 +1,5 @@ /* { dg-do compile { target *-*-linux* } } */ -/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection -mcet" } */ +/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection" } */ extern void (*bar) (void) __attribute__((nocf_check)); diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c index 30d12cc0711..0c61516732a 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c @@ -1,5 +1,5 @@ /* { dg-do compile { target *-*-linux* } } */ -/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection -mcet" } */ +/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection" } */ extern void (*bar) (void); diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c index d714b0155df..731d4c4e6e9 100644 --- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c +++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c @@ -1,5 +1,5 @@ /* { dg-do compile { target *-*-linux* } } */ -/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection -mcet" } */ +/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection" } */ extern void (*bar) (void); diff --git a/gcc/testsuite/gcc.target/i386/pr82659-1.c b/gcc/testsuite/gcc.target/i386/pr82659-1.c index 485771d0f38..62898cfdeb6 100644 --- a/gcc/testsuite/gcc.target/i386/pr82659-1.c +++ b/gcc/testsuite/gcc.target/i386/pr82659-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler-times {\mendbr} 1 } } */ extern int x; diff --git a/gcc/testsuite/gcc.target/i386/pr82659-2.c b/gcc/testsuite/gcc.target/i386/pr82659-2.c index 7afffa440aa..574a0b60ab4 100644 --- a/gcc/testsuite/gcc.target/i386/pr82659-2.c +++ b/gcc/testsuite/gcc.target/i386/pr82659-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler-times {\mendbr} 2 } } */ extern int x; diff --git a/gcc/testsuite/gcc.target/i386/pr82659-3.c b/gcc/testsuite/gcc.target/i386/pr82659-3.c index 5f97b314092..3bb83e309e7 100644 --- a/gcc/testsuite/gcc.target/i386/pr82659-3.c +++ b/gcc/testsuite/gcc.target/i386/pr82659-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler-times {\mendbr} 2 } } */ extern int x; diff --git a/gcc/testsuite/gcc.target/i386/pr82659-4.c b/gcc/testsuite/gcc.target/i386/pr82659-4.c index c3cacaccbef..ea5b2a16a50 100644 --- a/gcc/testsuite/gcc.target/i386/pr82659-4.c +++ b/gcc/testsuite/gcc.target/i386/pr82659-4.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler-times {\mendbr} 2 } } */ static void diff --git a/gcc/testsuite/gcc.target/i386/pr82659-5.c b/gcc/testsuite/gcc.target/i386/pr82659-5.c index 95413671d5c..4ba4fab755e 100644 --- a/gcc/testsuite/gcc.target/i386/pr82659-5.c +++ b/gcc/testsuite/gcc.target/i386/pr82659-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler-times {\mendbr} 1 } } */ static void diff --git a/gcc/testsuite/gcc.target/i386/pr82659-6.c b/gcc/testsuite/gcc.target/i386/pr82659-6.c index 51fc1a9f5c9..99ed68959d0 100644 --- a/gcc/testsuite/gcc.target/i386/pr82659-6.c +++ b/gcc/testsuite/gcc.target/i386/pr82659-6.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler-times {\mendbr} 2 } } */ extern int x; diff --git a/gcc/testsuite/gcc.target/i386/pr84146.c b/gcc/testsuite/gcc.target/i386/pr84146.c index a14baa47532..e0da81833a0 100644 --- a/gcc/testsuite/gcc.target/i386/pr84146.c +++ b/gcc/testsuite/gcc.target/i386/pr84146.c @@ -1,6 +1,6 @@ /* PR target/84146 */ /* { dg-do compile } */ -/* { dg-options "-O2 -g -mcet -fcf-protection=full -fcompare-debug" } */ +/* { dg-options "-O2 -g -fcf-protection=full -fcompare-debug" } */ int __setjmp (void **); void *buf[64]; diff --git a/gcc/testsuite/gcc.target/i386/pr85345.c b/gcc/testsuite/gcc.target/i386/pr85345.c index 63f771294ad..ceb94e4b940 100644 --- a/gcc/testsuite/gcc.target/i386/pr85345.c +++ b/gcc/testsuite/gcc.target/i386/pr85345.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fcf-protection -mcet" } */ +/* { dg-options "-O2 -fcf-protection" } */ /* { dg-final { scan-assembler-times {\mendbr} 4 } } */ int resolver_fn = 0; diff --git a/gcc/testsuite/gcc.target/i386/pr85403.c b/gcc/testsuite/gcc.target/i386/pr85403.c index 0bbd7ca5610..d74b545e3ba 100644 --- a/gcc/testsuite/gcc.target/i386/pr85403.c +++ b/gcc/testsuite/gcc.target/i386/pr85403.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fcf-protection -mcet" } */ +/* { dg-options "-fcf-protection" } */ /* { dg-require-ifunc "" } */ __attribute__((target_clones("avx","arch=slm","arch=core-avx2","default"))) diff --git a/gcc/testsuite/gcc.target/i386/pr85404.c b/gcc/testsuite/gcc.target/i386/pr85404.c index 0194f7b7edd..882d8ab7875 100644 --- a/gcc/testsuite/gcc.target/i386/pr85404.c +++ b/gcc/testsuite/gcc.target/i386/pr85404.c @@ -1,5 +1,5 @@ /* { dg-do assemble { target cet } } */ -/* { dg-options "-fleading-underscore -mcet -fcf-protection" } */ +/* { dg-options "-fleading-underscore -fcf-protection" } */ void func(void) __asm("_func"); void _func(int x) {} 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