From ead6c9b861d6f0eaf0d1e9263843b63a14cad7fd Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 13 Aug 2011 00:05:51 +0200
Subject: libc/uClibc: force use of ctor/dtor

Although ctor/dtor do not seem strictly required, missing them proves
rather inconvenient, as ld can't link binaries.

Reported-by: John Spencer <maillist-uclibc@barfooze.de> (sh4rm4 on IRC)
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from fac4018427d2920607e8f924672458be1b366551)

diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index abcbab2..87de620 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -365,6 +365,11 @@ mungeuClibcConfig() {
             ;;
     esac
 
+    # We always want ctor/dtor
+    cat <<-ENDSED
+		s/^# (UCLIBC_CTOR_DTOR) is not set/\\1=y/
+		ENDSED
+
     # Change paths to work with crosstool-NG
     # From http://www.uclibc.org/cgi-bin/viewcvs.cgi?rev=16846&view=rev
     #  " we just want the kernel headers, not the whole kernel source ...
@@ -443,7 +448,6 @@ mungeuClibcConfig() {
     if [ "${CT_CC_LANG_CXX}" = "y" ]; then
         cat <<-ENDSED
 			s/^# DO_C99_MATH is not set/DO_C99_MATH=y/
-			s/^# UCLIBC_CTOR_DTOR is not set/UCLIBC_CTOR_DTOR=y/
 			s/^# UCLIBC_HAS_GNU_GETOPT is not set/UCLIBC_HAS_GNU_GETOPT=y/
 			ENDSED
     fi
-- 
cgit v0.10.2-6-g49f6