Explain what happens for PE targeted linkers in the case where the user actually...

	* scripttempl/pe.sc: Improve the comment about overriding
	__CTOR_LIST__ and __DTOR_LIST__ symbols.
	* scripttemp/pep.sc: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 99a4f7e53a577ec7707aa780c74c4eb8a32d8290..98af46881209d257b05cdc204ca409387734f547 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-07  Martin Storsjo  <martin@martin.st>
+
+       * scripttempl/pe.sc: Improve the comment about overriding
+       __CTOR_LIST__ and __DTOR_LIST__ symbols.
+       * scripttemp/pep.sc: Likewise.
+
 2018-08-07  Nick Clifton  <nickc@redhat.com>
 
        * po/bg.po: Updated Bulgarian translation.

diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc
index f56d783ea035309a1b5d2138ec629e7c08e91984..8fdeaff60eeda0aff304da1e9711297ca4136043 100644 (file)
--- a/ld/scripttempl/pe.sc
+++ b/ld/scripttempl/pe.sc
@@ -106,10 +106,12 @@ SECTIONS
          overridden and global constructors will not be run.
          
          This does mean that it is not possible for a user to define
-         their own __CTOR_LIST__ and __DTOR_LIST__ symbols.  If that
-         ability is needed a custom linker script will have to be
-         used.  (The custom script can just be a copy of this script
-         with the PROVIDE() qualifiers added).
+         their own __CTOR_LIST__ and __DTOR_LIST__ symbols; if they do,
+         the content from those variables are included but the symbols
+         defined here silently take precedence.  If they truly need to
+         be redefined, a custom linker script will have to be used.
+         (The custom script can just be a copy of this script with the
+         PROVIDE() qualifiers added).
 
          See PR 22762 for more details.  */
        ___CTOR_LIST__ = .;

diff --git a/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc
index 3c6c84da9bf2ad5daaaf3b19019a5f762cb4eb31..a7157dcdcc23affbe24bc9ee63cbf006593aa2ef 100644 (file)
--- a/ld/scripttempl/pep.sc
+++ b/ld/scripttempl/pep.sc
@@ -107,10 +107,12 @@ SECTIONS
          overridden and global constructors will not be run.
          
          This does mean that it is not possible for a user to define
-         their own __CTOR_LIST__ and __DTOR_LIST__ symbols.  If that
-         ability is needed a custom linker script will have to be
-         used.  (The custom script can just be a copy of this script
-         with the PROVIDE() qualifiers added).
+         their own __CTOR_LIST__ and __DTOR_LIST__ symbols; if they do,
+         the content from those variables are included but the symbols
+         defined here silently take precedence.  If they truly need to
+         be redefined, a custom linker script will have to be used.
+         (The custom script can just be a copy of this script with the
+         PROVIDE() qualifiers added).
 
          See PR 22762 for more details.  */
        ___CTOR_LIST__ = .;