x86: Add -z cet-report=[none|warning|error]

Add -z cet-report=[none|warning|error] to report the missing Intel
Indirect Branch Tracking (IBT) and Shadow Stack (SHSTK) properties
in input .note.gnu.property section.  -z cet-report=none, which is
the default, will make the linker not report missing properties in
input files.  -z cet-report=warning will make the linker issue a
warning for missing properties in input files.  -z cet-report=error
will make the linker issue an error for missing properties in input
files.  Note that -z ibt will turn off the missing IBT property report
and -z shstk will turn off the missing SHSTK property report.
Supported for Linux/i386 and Linux/x86_64.

bfd/

	* elf-linker-x86.h (elf_x86_cet_report): New.
	(elf_linker_x86_params): Add cet_report.
	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Report
	missing IBT and SHSTK properties if needed.

ld/

	* ld.texi: Document -z cet-report=[none|warning|error].
	* emulparams/cet.sh: Add -z cet-report=[none|warning|error].
	* testsuite/ld-i386/i386.exp: Run -z cet-report=[warning|error]
	tests.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.
	* testsuite/ld-i386/property-x86-cet1.d: New file.
	* testsuite/ld-i386/property-x86-cet2a.d: Likewise.
	* testsuite/ld-i386/property-x86-cet2b.d: Likewise.
	* testsuite/ld-i386/property-x86-cet3a.d: Likewise.
	* testsuite/ld-i386/property-x86-cet3b.d: Likewise.
	* testsuite/ld-i386/property-x86-cet4a.d: Likewise.
	* testsuite/ld-i386/property-x86-cet4b.d: Likewise.
	* testsuite/ld-i386/property-x86-cet5a.d: Likewise.
	* testsuite/ld-i386/property-x86-cet5b.d: Likewise.
	* testsuite/ld-i386/property-x86-cet6.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet.s: Likewise.
	* testsuite/ld-x86-64/property-x86-cet1-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet1.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet2a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet2a.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet2b-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet2b.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet3a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet3a.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet3b-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet3b.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet4a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet4a.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet4b-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet4b.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet5a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet5a.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet5b-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet5b.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet6-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-cet6.d: Likewise.

36 files changed, 355 insertions, 0 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d5f4435..8e6a2d4 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,44 @@
 2019-04-11  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* ld.texi: Document -z cet-report=[none|warning|error].
+	* emulparams/cet.sh: Add -z cet-report=[none|warning|error].
+	* testsuite/ld-i386/i386.exp: Run -z cet-report=[warning|error]
+	tests.
+	* testsuite/ld-x86-64/x86-64.exp: Likewise.
+	* testsuite/ld-i386/property-x86-cet1.d: New file.
+	* testsuite/ld-i386/property-x86-cet2a.d: Likewise.
+	* testsuite/ld-i386/property-x86-cet2b.d: Likewise.
+	* testsuite/ld-i386/property-x86-cet3a.d: Likewise.
+	* testsuite/ld-i386/property-x86-cet3b.d: Likewise.
+	* testsuite/ld-i386/property-x86-cet4a.d: Likewise.
+	* testsuite/ld-i386/property-x86-cet4b.d: Likewise.
+	* testsuite/ld-i386/property-x86-cet5a.d: Likewise.
+	* testsuite/ld-i386/property-x86-cet5b.d: Likewise.
+	* testsuite/ld-i386/property-x86-cet6.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet.s: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet1-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet1.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet2a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet2a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet2b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet2b.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet3a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet3a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet3b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet3b.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet4a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet4a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet4b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet4b.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet5a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet5a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet5b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet5b.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet6-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-cet6.d: Likewise.
+
+2019-04-11  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* testsuite/config/default.exp (STATIC_PIE_LDFLAGS): New.  Set
 	to "-static-pie" if target compiler supports it.
 	* testsuite/ld-elf/elf.exp: Run -static-pie tests if
diff --git a/ld/emulparams/cet.sh b/ld/emulparams/cet.sh
index 1d45b16..f9a83ec 100644
--- a/ld/emulparams/cet.sh
+++ b/ld/emulparams/cet.sh
@@ -5,6 +5,9 @@ PARSE_AND_LIST_OPTIONS_CET='
   -z ibt                      Generate GNU_PROPERTY_X86_FEATURE_1_IBT\n"));
   fprintf (file, _("\
   -z shstk                    Generate GNU_PROPERTY_X86_FEATURE_1_SHSTK\n"));
+  fprintf (file, _("\
+  -z cet-report=[none|warning|error] (default: none)\n\
+                              Report missing IBT and SHSTK properties\n"));
 '
 PARSE_AND_LIST_ARGS_CASE_Z_CET='
       else if (strcmp (optarg, "ibtplt") == 0)
@@ -13,6 +16,22 @@ PARSE_AND_LIST_ARGS_CASE_Z_CET='
 	params.ibt = TRUE;
       else if (strcmp (optarg, "shstk") == 0)
 	params.shstk = TRUE;
+      else if (strncmp (optarg, "cet-report=", 11) == 0)
+	{
+	  if (strcmp (optarg + 11, "none") == 0)
+	    params.cet_report = cet_report_none;
+	  else if (strcmp (optarg + 11, "warning") == 0)
+	    params.cet_report = (cet_report_warning
+				 | cet_report_ibt
+				 | cet_report_shstk);
+	  else if (strcmp (optarg + 11, "error") == 0)
+	    params.cet_report = (cet_report_error
+				 | cet_report_ibt
+				 | cet_report_shstk);
+	  else
+	    einfo (_("%F%P: invalid option for -z cet-report=: %s\n"),
+		   optarg + 11);
+	}
 '
 
 PARSE_AND_LIST_OPTIONS="$PARSE_AND_LIST_OPTIONS $PARSE_AND_LIST_OPTIONS_CET"
diff --git a/ld/ld.texi b/ld/ld.texi
index 0bcbec4..8e2ce86 100644
--- a/ld/ld.texi
+++ b/ld/ld.texi
@@ -1137,6 +1137,21 @@ to a locally defined function, foo, via its GOT slot.
 @option{call-nop=suffix-@var{byte}} generates @code{call foo @var{byte}}.
 Supported for i386 and x86_64.
 
+@item cet-report=none
+@itemx cet-report=warning
+@itemx cet-report=error
+Specify how to report the missing GNU_PROPERTY_X86_FEATURE_1_IBT and
+GNU_PROPERTY_X86_FEATURE_1_SHSTK properties in input .note.gnu.property
+section.  @option{cet-report=none}, which is the default, will make the
+linker not report missing properties in input files.
+@option{cet-report=warning} will make the linker issue a warning for
+missing properties in input files.  @option{cet-report=error} will make
+the linker issue an error for missing properties in input files.
+Note that @option{ibt} will turn off the missing
+GNU_PROPERTY_X86_FEATURE_1_IBT property report and @option{shstk} will
+turn off the missing GNU_PROPERTY_X86_FEATURE_1_SHSTK property report.
+Supported for Linux/i386 and Linux/x86_64.
+
 @item combreloc
 @itemx nocombreloc
 Combine multiple dynamic relocation sections and sort to improve
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 1a1a750..e9c2cfb 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -460,6 +460,16 @@ run_dump_test "property-x86-shstk3a"
 run_dump_test "property-x86-shstk3b"
 run_dump_test "property-x86-shstk4"
 run_dump_test "property-x86-shstk5"
+run_dump_test "property-x86-cet1"
+run_dump_test "property-x86-cet2a"
+run_dump_test "property-x86-cet2b"
+run_dump_test "property-x86-cet3a"
+run_dump_test "property-x86-cet3b"
+run_dump_test "property-x86-cet4a"
+run_dump_test "property-x86-cet4b"
+run_dump_test "property-x86-cet5a"
+run_dump_test "property-x86-cet5b"
+run_dump_test "property-x86-cet6"
 run_dump_test "pie1"
 run_dump_test "pie1-nacl"
 run_dump_test "pr21884"
diff --git a/ld/testsuite/ld-i386/property-x86-cet1.d b/ld/testsuite/ld-i386/property-x86-cet1.d
new file mode 100644
index 0000000..ed95d53
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet1.d
@@ -0,0 +1,11 @@
+#source: ../ld-x86-64/property-x86-cet.s
+#as: --32 -mx86-used-note=yes
+#ld: -r -m elf_i386 -z cet-report=error
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: IBT, SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-i386/property-x86-cet2a.d b/ld/testsuite/ld-i386/property-x86-cet2a.d
new file mode 100644
index 0000000..e049244
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet2a.d
@@ -0,0 +1,15 @@
+#source: property-x86-empty.s
+#source: property-x86-ibt.s
+#source: property-x86-shstk.s
+#source: property-x86-3.s
+#as: --32 -mx86-used-note=yes
+#ld: -r -m elf_i386 -z cet-report=warning
+#warning: .*: warning: missing IBT and SHSTK properties.*: warning: missing SHSTK property.*: warning: missing IBT property.*: warning: missing IBT and SHSTK properties
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA needed: SSE, SSE3, SSE4_1, AVX
+	x86 ISA used: CMOV, SSE, SSSE3, SSE4_1
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-i386/property-x86-cet2b.d b/ld/testsuite/ld-i386/property-x86-cet2b.d
new file mode 100644
index 0000000..fb3295d
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet2b.d
@@ -0,0 +1,7 @@
+#source: property-x86-empty.s
+#source: property-x86-ibt.s
+#source: property-x86-shstk.s
+#source: property-x86-3.s
+#as: --32 -mx86-used-note=yes
+#ld: -r -m elf_i386 -z cet-report=error
+#error: .*: error: missing IBT and SHSTK properties.*: error: missing SHSTK property.*: error: missing IBT property.*: error: missing IBT and SHSTK properties
diff --git a/ld/testsuite/ld-i386/property-x86-cet3a.d b/ld/testsuite/ld-i386/property-x86-cet3a.d
new file mode 100644
index 0000000..d535953
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet3a.d
@@ -0,0 +1,4 @@
+#source: property-x86-ibt.s
+#as: --32 -mx86-used-note=yes
+#ld: -r -m elf_i386 -z cet-report=error
+#error: .*: error: missing SHSTK property
diff --git a/ld/testsuite/ld-i386/property-x86-cet3b.d b/ld/testsuite/ld-i386/property-x86-cet3b.d
new file mode 100644
index 0000000..0d5aa99
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet3b.d
@@ -0,0 +1,4 @@
+#source: property-x86-ibt.s
+#as: --32 -mx86-used-note=yes
+#ld: -r -m elf_i386 -z cet-report=error -z ibt
+#error: .*: error: missing SHSTK property
diff --git a/ld/testsuite/ld-i386/property-x86-cet4a.d b/ld/testsuite/ld-i386/property-x86-cet4a.d
new file mode 100644
index 0000000..f4de75e
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet4a.d
@@ -0,0 +1,4 @@
+#source: property-x86-shstk.s
+#as: --32 -mx86-used-note=yes
+#ld: -r -m elf_i386 -z cet-report=error
+#error: .*: error: missing IBT property
diff --git a/ld/testsuite/ld-i386/property-x86-cet4b.d b/ld/testsuite/ld-i386/property-x86-cet4b.d
new file mode 100644
index 0000000..9bec35a
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet4b.d
@@ -0,0 +1,4 @@
+#source: property-x86-shstk.s
+#as: --32 -mx86-used-note=yes
+#ld: -r -m elf_i386 -z cet-report=error -z shstk
+#error: .*: error: missing IBT property
diff --git a/ld/testsuite/ld-i386/property-x86-cet5a.d b/ld/testsuite/ld-i386/property-x86-cet5a.d
new file mode 100644
index 0000000..a809a53
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet5a.d
@@ -0,0 +1,10 @@
+#source: property-x86-empty.s
+#as: --32 -mx86-used-note=yes
+#ld: -r -m elf_i386 -z cet-report=error -z cet-report=none
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-i386/property-x86-cet5b.d b/ld/testsuite/ld-i386/property-x86-cet5b.d
new file mode 100644
index 0000000..cce37df
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet5b.d
@@ -0,0 +1,11 @@
+#source: property-x86-empty.s
+#as: --32 -mx86-used-note=yes
+#ld: -r -m elf_i386 -z cet-report=error -z ibt -z shstk
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: IBT, SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-i386/property-x86-cet6.d b/ld/testsuite/ld-i386/property-x86-cet6.d
new file mode 100644
index 0000000..bb4974d
--- /dev/null
+++ b/ld/testsuite/ld-i386/property-x86-cet6.d
@@ -0,0 +1,5 @@
+#source: start.s
+#as: --32 -mx86-used-note=no
+#ld: -r -m elf_i386 -z cet-report=warning
+#warning: .*: warning: missing IBT and SHSTK properties
+#readelf: -n
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet.s b/ld/testsuite/ld-x86-64/property-x86-cet.s
new file mode 100644
index 0000000..15989d6
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet.s
@@ -0,0 +1,27 @@
+	.section ".note.gnu.property", "a"
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+	.long 1f - 0f		/* name length */
+	.long 5f - 2f		/* data length */
+	.long 5			/* note type */
+0:	.asciz "GNU"		/* vendor name */
+1:
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+2:	.long 0xc0000002	/* pr_type.  */
+	.long 4f - 3f		/* pr_datasz.  */
+3:
+	.long 0x3
+4:
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+5:
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet1-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet1-x32.d
new file mode 100644
index 0000000..c317bff
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet1-x32.d
@@ -0,0 +1,11 @@
+#source: property-x86-cet.s
+#as: --x32 -mx86-used-note=yes
+#ld: -r -m elf32_x86_64 -z cet-report=error
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: IBT, SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet1.d b/ld/testsuite/ld-x86-64/property-x86-cet1.d
new file mode 100644
index 0000000..0645177
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet1.d
@@ -0,0 +1,11 @@
+#source: property-x86-cet.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -r -melf_x86_64 -z cet-report=error
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000030	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: IBT, SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet2a-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet2a-x32.d
new file mode 100644
index 0000000..b070f52
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet2a-x32.d
@@ -0,0 +1,15 @@
+#source: property-x86-empty.s
+#source: property-x86-ibt.s
+#source: property-x86-shstk.s
+#source: property-x86-3.s
+#as: --x32 -mx86-used-note=yes
+#ld: -r -m elf32_x86_64 -z cet-report=warning
+#warning: .*: warning: missing IBT and SHSTK properties.*: warning: missing SHSTK property.*: warning: missing IBT property
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+	x86 ISA used: SSE, SSE3, SSE4_1, AVX
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet2a.d b/ld/testsuite/ld-x86-64/property-x86-cet2a.d
new file mode 100644
index 0000000..18d24b6
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet2a.d
@@ -0,0 +1,15 @@
+#source: property-x86-empty.s
+#source: property-x86-ibt.s
+#source: property-x86-shstk.s
+#source: property-x86-3.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -r -melf_x86_64 -z cet-report=warning
+#warning: .*: warning: missing IBT and SHSTK properties.*: warning: missing SHSTK property.*: warning: missing IBT property.*: warning: missing IBT and SHSTK properties
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000030	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+	x86 ISA used: SSE, SSE3, SSE4_1, AVX
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet2b-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet2b-x32.d
new file mode 100644
index 0000000..9e986c2
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet2b-x32.d
@@ -0,0 +1,7 @@
+#source: property-x86-empty.s
+#source: property-x86-ibt.s
+#source: property-x86-shstk.s
+#source: property-x86-3.s
+#as: --x32 -mx86-used-note=yes
+#ld: -r -m elf32_x86_64 -z cet-report=error
+#error: .*: error: missing IBT and SHSTK properties.*: error: missing SHSTK property.*: error: missing IBT property.*: error: missing IBT and SHSTK properties
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet2b.d b/ld/testsuite/ld-x86-64/property-x86-cet2b.d
new file mode 100644
index 0000000..97095b3
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet2b.d
@@ -0,0 +1,7 @@
+#source: property-x86-empty.s
+#source: property-x86-ibt.s
+#source: property-x86-shstk.s
+#source: property-x86-3.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -r -melf_x86_64 -z cet-report=error
+#error: .*: error: missing IBT and SHSTK properties.*: error: missing SHSTK property.*: error: missing IBT property.*: error: missing IBT and SHSTK properties
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet3a-x32.d
new file mode 100644
index 0000000..91de5a0
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet3a-x32.d
@@ -0,0 +1,4 @@
+#source: property-x86-ibt.s
+#as: --x32 -mx86-used-note=yes
+#ld: -r -m elf32_x86_64 -z cet-report=error
+#error: .*: error: missing SHSTK property
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet3a.d b/ld/testsuite/ld-x86-64/property-x86-cet3a.d
new file mode 100644
index 0000000..3e085f5
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet3a.d
@@ -0,0 +1,4 @@
+#source: property-x86-ibt.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -r -melf_x86_64 -z cet-report=error
+#error: .*: error: missing SHSTK property
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet3b-x32.d
new file mode 100644
index 0000000..f56ce82
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet3b-x32.d
@@ -0,0 +1,4 @@
+#source: property-x86-ibt.s
+#as: --x32 -mx86-used-note=yes
+#ld: -r -m elf32_x86_64 -z cet-report=error -z ibt
+#error: .*: error: missing SHSTK property
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet3b.d b/ld/testsuite/ld-x86-64/property-x86-cet3b.d
new file mode 100644
index 0000000..812c27e
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet3b.d
@@ -0,0 +1,4 @@
+#source: property-x86-ibt.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -r -melf_x86_64 -z cet-report=error -z ibt
+#error: .*: error: missing SHSTK property
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet4a-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet4a-x32.d
new file mode 100644
index 0000000..371d4b5
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet4a-x32.d
@@ -0,0 +1,4 @@
+#source: property-x86-shstk.s
+#as: --x32 -mx86-used-note=yes
+#ld: -r -m elf32_x86_64 -z cet-report=error
+#error: .*: error: missing IBT property
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet4a.d b/ld/testsuite/ld-x86-64/property-x86-cet4a.d
new file mode 100644
index 0000000..c199017
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet4a.d
@@ -0,0 +1,4 @@
+#source: property-x86-shstk.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -r -melf_x86_64 -z cet-report=error
+#error: .*: error: missing IBT property
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet4b-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet4b-x32.d
new file mode 100644
index 0000000..e25791b
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet4b-x32.d
@@ -0,0 +1,4 @@
+#source: property-x86-shstk.s
+#as: --x32 -mx86-used-note=yes
+#ld: -r -m elf32_x86_64 -z cet-report=error -z shstk
+#error: .*: error: missing IBT property
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet4b.d b/ld/testsuite/ld-x86-64/property-x86-cet4b.d
new file mode 100644
index 0000000..9796116
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet4b.d
@@ -0,0 +1,4 @@
+#source: property-x86-shstk.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -r -melf_x86_64 -z cet-report=error -z shstk
+#error: .*: error: missing IBT property
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet5a-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet5a-x32.d
new file mode 100644
index 0000000..dbbc68c
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet5a-x32.d
@@ -0,0 +1,10 @@
+#source: property-x86-empty.s
+#as: --x32 -mx86-used-note=yes
+#ld: -r -m elf32_x86_64 -z cet-report=error -z cet-report=none
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet5a.d b/ld/testsuite/ld-x86-64/property-x86-cet5a.d
new file mode 100644
index 0000000..6870340
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet5a.d
@@ -0,0 +1,10 @@
+#source: property-x86-empty.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -r -melf_x86_64 -z cet-report=error -z cet-report=none
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet5b-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet5b-x32.d
new file mode 100644
index 0000000..576ba22
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet5b-x32.d
@@ -0,0 +1,11 @@
+#source: property-x86-empty.s
+#as: --x32 -mx86-used-note=yes
+#ld: -r -m elf32_x86_64 -z cet-report=error -z ibt -z shstk
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: IBT, SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet5b.d b/ld/testsuite/ld-x86-64/property-x86-cet5b.d
new file mode 100644
index 0000000..9f9d96e
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet5b.d
@@ -0,0 +1,11 @@
+#source: property-x86-empty.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -r -melf_x86_64 -z cet-report=error -z ibt -z shstk
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000030	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: IBT, SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet6-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet6-x32.d
new file mode 100644
index 0000000..4b74e59
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet6-x32.d
@@ -0,0 +1,5 @@
+#source: start.s
+#as: --x32 -mx86-used-note=no
+#ld: -r -m elf32_x86_64 -z cet-report=warning
+#warning: .*: warning: missing IBT and SHSTK properties
+#readelf: -n
diff --git a/ld/testsuite/ld-x86-64/property-x86-cet6.d b/ld/testsuite/ld-x86-64/property-x86-cet6.d
new file mode 100644
index 0000000..632cbc7
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-cet6.d
@@ -0,0 +1,5 @@
+#source: start.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=no
+#ld: -r -melf_x86_64 -z cet-report=warning
+#warning: .*: warning: missing IBT and SHSTK properties
+#readelf: -n
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 47d92c9..408e52a 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -387,6 +387,26 @@ run_dump_test "property-x86-shstk4"
 run_dump_test "property-x86-shstk4-x32"
 run_dump_test "property-x86-shstk5"
 run_dump_test "property-x86-shstk5-x32"
+run_dump_test "property-x86-cet1"
+run_dump_test "property-x86-cet1-x32"
+run_dump_test "property-x86-cet2a"
+run_dump_test "property-x86-cet2a-x32"
+run_dump_test "property-x86-cet2b"
+run_dump_test "property-x86-cet2b-x32"
+run_dump_test "property-x86-cet3a"
+run_dump_test "property-x86-cet3a-x32"
+run_dump_test "property-x86-cet3b"
+run_dump_test "property-x86-cet3b-x32"
+run_dump_test "property-x86-cet4a"
+run_dump_test "property-x86-cet4a-x32"
+run_dump_test "property-x86-cet4b"
+run_dump_test "property-x86-cet4b-x32"
+run_dump_test "property-x86-cet5a"
+run_dump_test "property-x86-cet5a-x32"
+run_dump_test "property-x86-cet5b"
+run_dump_test "property-x86-cet5b-x32"
+run_dump_test "property-x86-cet6"
+run_dump_test "property-x86-cet6-x32"
 run_dump_test "pr21884"
 run_dump_test "pr21884-nacl"
 run_dump_test "pr22071"