Re: [PATCH] Optionally use -mlong-double-128 by default on {powerpc{,64},s390{,x},sparc,alpha}-linux (take 3)

[Jakub Jelinek <jakub at redhat dot com>]

On Tue, Feb 07, 2006 at 03:34:58AM -0500, Jakub Jelinek wrote:
> I'll work on some patch for this.

Here it is, as incremental diff against the patch you posted:

--- libstdc++-v3/include/bits/c++config.jj	2006-02-07 10:06:26.000000000 +0100
+++ libstdc++-v3/include/bits/c++config	2006-02-07 11:33:35.000000000 +0100
@@ -129,6 +129,9 @@ namespace std
 #endif
 #endif
 
+/* Define if compatibility should be provided for -mlong-double-64. */
+#undef _GLIBCXX_LONG_DOUBLE_COMPAT
+
 // XXX GLIBCXX_ABI Deprecated
 // Namespace associations for long double 128 mode.
 _GLIBCXX_BEGIN_NAMESPACE(std)
--- libstdc++-v3/include/Makefile.am.jj	2006-01-31 14:06:38.000000000 +0100
+++ libstdc++-v3/include/Makefile.am	2006-02-07 11:50:34.000000000 +0100
@@ -844,13 +844,19 @@ ${host_builddir}/c++config.h: ${CONFIG_H
 			      stamp-namespace-version
 	@date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\
 	nsa_version=`cat stamp-namespace-version` ;\
+	ldbl_compat='' ;\
+	grep "^[ 	]*#[ 	]*define[ 	][ 	]*_GLIBCXX_LONG_DOUBLE_COMPAT[ 	][ 	]*1[ 	]*$$" \
+	${CONFIG_HEADER} > /dev/null 2>&1 \
+	&& ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\
 	sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
 	-e "s,define _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION, define _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION $$nsa_version," \
+	-e "$$ldbl_compat" \
             < ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
 	sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
 	    -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \
 	    -e 's/VERSION/_GLIBCXX_VERSION/g' \
 	    -e 's/WORDS_/_GLIBCXX_WORDS_/g' \
+	    -e '/[ 	]_GLIBCXX_LONG_DOUBLE_COMPAT[ 	]/d' \
 	    < ${CONFIG_HEADER} >> $@ ;\
 	echo "" >> $@ ;\
 	echo "#endif // _CXXCONFIG_" >> $@

	Jakub