From 99e1a2bc3a0ab78c53c45a886d46c370e1bf6bf0 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Wed, 11 Feb 2015 17:25:23 +0000
Subject: [PATCH] Fix ldscripts such that ld(1) collects the .fini_array
 section in the same order as the .init_array section.  Finalisation routines
 need to be called in the opposite order as their corresponding initialisation
 routines but rtld(1) handles that by calling the function pointers in
 .fini_array in reverse order.

Reviewed by:	kib
MFC after:	2 weeks
---
 contrib/binutils/ld/scripttempl/elf.sc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/binutils/ld/scripttempl/elf.sc b/contrib/binutils/ld/scripttempl/elf.sc
index 205d1624abc0..6060c3e1502d 100644
--- a/contrib/binutils/ld/scripttempl/elf.sc
+++ b/contrib/binutils/ld/scripttempl/elf.sc
@@ -402,8 +402,8 @@ cat <<EOF
   .fini_array   ${RELOCATING-0} :
   {
     ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}}
-    KEEP (*(.fini_array))
     KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array))
     ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}}
   }
   ${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}