aarch64: rename BTI error/warning message

The previous message for missing BTI feature in GNU properties was
not very clear. The new message explains that a missing GNU property
marking is lacking on this specific input.

diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
index 67824805fe7fac4b01dc4c64f51d8efa66db0d61..41ff2cae940954d0fe140cf960eee0d87b3e69dd 100644 (file)
--- a/bfd/elfxx-aarch64.c
+++ b/bfd/elfxx-aarch64.c
@@ -999,10 +999,10 @@ _bfd_aarch64_elf_check_bti_report (struct bfd_link_info *info, bfd *ebfd)
 
   const char *msg
     = (tdata->sw_protections.bti_report == MARKING_WARN)
-    ? _("%pB: warning: BTI turned on by -z force-bti on the output when all "
-       "inputs do not have BTI in NOTE section.\n")
-    : _("%X%pB: error: BTI turned on by -z force-bti on the output when all "
-       "inputs do not have BTI in NOTE section.\n");
+    ? _("%pB: warning: BTI is required by -z force-bti, but this input object "
+       "file lacks the necessary property note.\n")
+    : _("%X%pB: error: BTI is required by -z force-bti, but this input object "
+       "file lacks the necessary property note.\n");
 
   info->callbacks->einfo (msg, ebfd);
 }
\ No newline at end of file

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-1-c.d b/ld/testsuite/ld-aarch64/protections/bti-plt-1-c.d
index 2eba9944f40977c058bbbf67b5f8e71e5b5d96dd..2fd0dea08cd291cd9c89f6f32a07b5d14d1b8600 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-1-c.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-1-c.d
@@ -3,7 +3,7 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64
 #ld: -shared -z force-bti -T bti-plt.ld -L./tmpdir -lbti-plt-so
-#warning: .*bti-plt-1\.o: warning: BTI turned on by -z force-bti.*
+#warning: .*bti-plt-1\.o: warning: BTI is required by -z force-bti.*
 #objdump: -dr -j .plt
 
 [^:]*: *file format elf64-.*aarch64

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-i.d b/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-i.d
index 52fa96c221b5707200636037eecb355ed5cd40d1..26121691050463b956e0e5d9849764e79469b217 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-i.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-i.d
@@ -4,8 +4,8 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64
 #ld: -shared -z force-bti -T bti-plt.ld
-#warning: .*bti-plt-2\.o: warning: BTI turned on by -z force-bti.*
-#warning: .*bti-plt-1\.o: warning: BTI turned on by -z force-bti.*
+#warning: .*bti-plt-2\.o: warning: BTI is required by -z force-bti.*
+#warning: .*bti-plt-1\.o: warning: BTI is required by -z force-bti.*
 #readelf: -n
 
 # Should warn about the missing input BTI NOTE but should still mark

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-ii.d b/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-ii.d
index c1c6db6a5ca5469d9e8496c4196ed1bae3168a58..b3d69b8a91e95b8d7002571b95f2c36eccca795f 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-ii.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-ii.d
@@ -4,5 +4,5 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64
 #ld: -shared -z force-bti -z bti-report=error -T bti-plt.ld
-#error: .*bti-plt-2\.o: error: BTI turned on by -z force-bti.*
-#error: .*bti-plt-1\.o: error: BTI turned on by -z force-bti.*
+#error: .*bti-plt-2\.o: error: BTI is required by -z force-bti.*
+#error: .*bti-plt-1\.o: error: BTI is required by -z force-bti.*

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-iii.d b/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-iii.d
index 1bf038d28fd3ce2fd945952c50c9a5d17d679048..b7db350550035d1a299db8508e40685546e6d7ef 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-iii.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-iii.d
@@ -4,8 +4,8 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64
 #ld: -shared -z force-bti -z bti-report=warning -T bti-plt.ld
-#warning: .*bti-plt-2\.o: warning: BTI turned on by -z force-bti.*
-#warning: .*bti-plt-1\.o: warning: BTI turned on by -z force-bti.*
+#warning: .*bti-plt-2\.o: warning: BTI is required by -z force-bti.*
+#warning: .*bti-plt-1\.o: warning: BTI is required by -z force-bti.*
 #readelf: -n
 
 # Should warn about the missing input BTI NOTE but should still mark

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-v.d b/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-v.d
index 895d64e34998a68e5ab1c04a155e69f953ca0529..dddc1835d6e1ea21179ad4812ae1eab9df1b9ad5 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-v.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-2-a-v.d
@@ -4,8 +4,8 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64
 #ld: -shared -z force-bti -z bti-report -T bti-plt.ld
-#warning: .*bti-plt-2\.o: warning: BTI turned on by -z force-bti.*
-#warning: .*bti-plt-1\.o: warning: BTI turned on by -z force-bti.*
+#warning: .*bti-plt-2\.o: warning: BTI is required by -z force-bti.*
+#warning: .*bti-plt-1\.o: warning: BTI is required by -z force-bti.*
 #readelf: -n
 
 # Should warn about the missing input BTI NOTE but should still mark

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-i.d b/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-i.d
index ed85f967df0add2f0819f41b5f3a60c4a707a3f1..99fcd3ccffd056006160a4e41bbe2fb1caf7a3d7 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-i.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-i.d
@@ -3,7 +3,7 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64
 #ld: -z force-bti -e _start -T bti-plt.ld -L./tmpdir -lbti-plt-so
-#warning: .*bti-plt-1\.o: warning: BTI turned on by -z force-bti.*
+#warning: .*bti-plt-1\.o: warning: BTI is required by -z force-bti.*
 #readelf: -n
 
 # Should warn about the missing input BTI NOTE but should still mark

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-ii.d b/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-ii.d
index 2d8b9b5fefda17464adbaf4754fe393a066c61eb..91c138177056b88be874afa906acd621e71ffd0a 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-ii.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-ii.d
@@ -3,4 +3,4 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64
 #ld: -z force-bti -z bti-report=error -e _start -T bti-plt.ld -L./tmpdir -lbti-plt-so
-#error: .*bti-plt-1\.o: error: BTI turned on by -z force-bti.*
+#error: .*bti-plt-1\.o: error: BTI is required by -z force-bti.*

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-iii.d b/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-iii.d
index 1abd61b762019e35af50faec8af77def1d56e0be..8227dd0700b08d7297ac89ba8247db2f62ba96cb 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-iii.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-iii.d
@@ -3,7 +3,7 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64
 #ld: -z force-bti -z bti-report=warning -e _start -T bti-plt.ld -L./tmpdir -lbti-plt-so
-#warning: .*bti-plt-1\.o: warning: BTI turned on by -z force-bti.*
+#warning: .*bti-plt-1\.o: warning: BTI is required by -z force-bti.*
 #readelf: -n
 
 # Should warn about the missing input BTI NOTE but should still mark

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-v.d b/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-v.d
index 44b3276b53f197201d1449992fde6ed81f2aeaf6..99a49cd567ca8b443e3753eef764ae6e85d71503 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-v.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-4-a-v.d
@@ -3,7 +3,7 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64
 #ld: -z force-bti -z bti-report -e _start -T bti-plt.ld -L./tmpdir -lbti-plt-so
-#warning: .*bti-plt-1\.o: warning: BTI turned on by -z force-bti.*
+#warning: .*bti-plt-1\.o: warning: BTI is required by -z force-bti.*
 #readelf: -n
 
 # Should warn about the missing input BTI NOTE but should still mark

diff --git a/ld/testsuite/ld-aarch64/protections/bti-plt-6.d b/ld/testsuite/ld-aarch64/protections/bti-plt-6.d
index 6bbba57ff035a27460b2004b5b2cf5b552b14cd7..a28f84f7ec1b76476fc64e9b09f8f4b214316903 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/bti-plt-6.d
+++ b/ld/testsuite/ld-aarch64/protections/bti-plt-6.d
@@ -4,7 +4,7 @@
 #target: [check_shared_lib_support]
 #as: -mabi=lp64 -defsym __property_pac__=1
 #ld: -shared -z force-bti
-#warning: .*property-bti-pac2.*: warning: BTI turned on by -z force-bti.*$
+#warning: .*property-bti-pac2.*: warning: BTI is required by -z force-bti.*$
 #readelf: -n
 
 # Should warn about the missing input BTI NOTE but should still mark

diff --git a/ld/testsuite/ld-aarch64/protections/property-bti-pac4-a.d b/ld/testsuite/ld-aarch64/protections/property-bti-pac4-a.d
index d9aa5cfa44b832bdc0d8668cf72df5d30885487c..bd36d8f09b2ab7aad8f384370a70eec542b594ad 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/property-bti-pac4-a.d
+++ b/ld/testsuite/ld-aarch64/protections/property-bti-pac4-a.d
@@ -4,7 +4,7 @@
 #ld: -z force-bti -e main
 #readelf: -l --wide
 #target: *linux*
-#warning: .*property-bti-pac4.*: warning: BTI turned on by -z force-bti.*
+#warning: .*property-bti-pac4.*: warning: BTI is required by -z force-bti.*
 
 #...
   GNU_PROPERTY .* +0x8

diff --git a/ld/testsuite/ld-aarch64/protections/property-bti-pac4-b.d b/ld/testsuite/ld-aarch64/protections/property-bti-pac4-b.d
index 02f9fc5acaf861a331ec899663c1dad60371f996..0fbf414ebe68f84aa65be390e603c47f17dc9a84 100644 (file)
--- a/ld/testsuite/ld-aarch64/protections/property-bti-pac4-b.d
+++ b/ld/testsuite/ld-aarch64/protections/property-bti-pac4-b.d
@@ -4,7 +4,7 @@
 #ld: -m [aarch64_choose_ilp32_emul] -z force-bti -e main
 #readelf: -l --wide
 #target: *linux*
-#warning: .*property-bti-pac4.*: warning: BTI turned on by -z force-bti.*
+#warning: .*property-bti-pac4.*: warning: BTI is required by -z force-bti.*
 
 #...
   GNU_PROPERTY .* +0x4