Changeset 511ef83c in rtems for bsps/arm

Timestamp:

Oct 9, 2018, 9:59:48 AM (14 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

6dc0b5f

Parents:

acb53d5

git-author:

Sebastian Huber <sebastian.huber@…> (10/09/18 09:59:48)

git-committer:

Sebastian Huber <sebastian.huber@…> (10/09/18 10:01:27)

Message:

bsps/arm: Fix ctor/dtor invocation order

Remove obsolete .ctor and .dtor output sections.

File:

• bsps/arm/shared/start/linkcmds.base (modified) (1 diff)

bsps/arm/shared/start/linkcmds.base

@@ -136 +136 @@
         .init_array : ALIGN_WITH_INPUT {
                 PROVIDE_HIDDEN (__init_array_start = .);
-                KEEP (*(SORT(.init_array.*)))
-                KEEP (*(.init_array))
+                KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
+                KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
                 PROVIDE_HIDDEN (__init_array_end = .);
         } > REGION_RODATA AT > REGION_RODATA_LOAD
         .fini_array : ALIGN_WITH_INPUT {
                 PROVIDE_HIDDEN (__fini_array_start = .);
-                KEEP (*(.fini_array))
-                KEEP (*(SORT(.fini_array.*)))
+                KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
+                KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
                 PROVIDE_HIDDEN (__fini_array_end = .);
-        } > REGION_RODATA AT > REGION_RODATA_LOAD
-        .ctors : ALIGN_WITH_INPUT {
-                /* gcc uses crtbegin.o to find the start of
-                   the constructors, so we make sure it is
-                   first.  Because this is a wildcard, it
-                   doesn't matter if the user does not
-                   actually link against crtbegin.o; the
-                   linker won't look for a file to match a
-                   wildcard.  The wildcard also means that it
-                   doesn't matter which directory crtbegin.o
-                   is in.  */
-                KEEP (*crtbegin.o(.ctors))
-                KEEP (*crtbegin?.o(.ctors))
-                /* We don't want to include the .ctor section from
-                   the crtend.o file until after the sorted ctors.
-                   The .ctor section from the crtend file contains the
-                   end of ctors marker and it must be last */
-                KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
-                KEEP (*(SORT(.ctors.*)))
-                KEEP (*(.ctors))
-        } > REGION_RODATA AT > REGION_RODATA_LOAD
-        .dtors : ALIGN_WITH_INPUT {
-                KEEP (*crtbegin.o(.dtors))
-                KEEP (*crtbegin?.o(.dtors))
-                KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
-                KEEP (*(SORT(.dtors.*)))
-                KEEP (*(.dtors))
         } > REGION_RODATA AT > REGION_RODATA_LOAD
         .data.rel.ro : ALIGN_WITH_INPUT {