aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog4
-rw-r--r--ld/ld.texi4
2 files changed, 6 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2339a40..a94be75 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-25 Jan Beulich <jbeulich@suse.com>
+
+ * ld.texi (PROVIDE): Downgrade "error" to "diagnostic".
+
2021-02-21 Alan Modra <amodra@gmail.com>
* ldexp.c (exp_fold_tree_1): Warn on script defining a symbol
diff --git a/ld/ld.texi b/ld/ld.texi
index bfe6c59..9643818 100644
--- a/ld/ld.texi
+++ b/ld/ld.texi
@@ -4447,8 +4447,8 @@ SECTIONS
@end smallexample
In this example, if the program defines @samp{_etext} (with a leading
-underscore), the linker will give a multiple definition error. If, on
-the other hand, the program defines @samp{etext} (with no leading
+underscore), the linker will give a multiple definition diagnostic. If,
+on the other hand, the program defines @samp{etext} (with no leading
underscore), the linker will silently use the definition in the program.
If the program references @samp{etext} but does not define it, the
linker will use the definition in the linker script.