components/gcc49/patches/017-libstdc++-src-Makefile.in.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Wed, 16 Dec 2015 20:20:50 -0800
changeset 5205 eaff9ab86216
child 5248 6f0a9396a317
permissions -rw-r--r--
21637184 integrate GCC 4.9.3 in Solaris 21637193 enable CilkPlus support for SPARC in GCC 4.9.3

# Stefan Teleman <[email protected]>
# Messy patch for libstdc++'s ./configure:
# 1. We want -D_GLIBCXX_FULLY_DYNAMIC_STRING=1 (no COW strings in C++11)
# 2. libtool linking on Solaris is quirky
# 3. We want LARGEFILE enabled in the libstdc++ binary.
# Internal patch. Not submitted upstream yet.
--- libstdc++-v3/src/Makefile.in	2013-08-06 20:38:59.000000000 -0700
+++ libstdc++-v3/src/Makefile.in	2015-09-12 13:12:28.970889245 -0700
@@ -148,6 +148,8 @@
 CNUMERIC_CC = @CNUMERIC_CC@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPPFLAGS += -D_REENTRANT=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+CPPFLAGS += -D__EXTENSIONS__=1 -D_GLIBCXX_FULLY_DYNAMIC_STRING=1
 CPU_DEFINES_SRCDIR = @CPU_DEFINES_SRCDIR@
 CPU_OPT_BITS_RANDOM = @CPU_OPT_BITS_RANDOM@
 CPU_OPT_EXT_RANDOM = @CPU_OPT_EXT_RANDOM@
@@ -368,6 +370,11 @@
 	$(top_builddir)/src/c++98/libc++98convenience.la \
 	$(top_builddir)/src/c++11/libc++11convenience.la
 
+libstdc___la_SYMVER_LIBADD = \
+	$(top_builddir)/libsupc++/libsupc++convenience.la \
+	$(top_builddir)/src/c++98/libc++98convenience.la \
+	$(top_builddir)/src/c++11/libc++11convenience.la
+
 libstdc___la_DEPENDENCIES = \
 	${version_dep} \
 	$(top_builddir)/libsupc++/libsupc++convenience.la \
@@ -893,7 +900,7 @@
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	perl $(toplevel_srcdir)/contrib/make_sunver.pl \
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	  libstdc++-symbols.ver \
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	  $(libstdc___la_OBJECTS:%.lo=.libs/%.o) \
-@ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	 `echo $(libstdc___la_LIBADD) | \
+@ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	 `echo $(libstdc___la_SYMVER_LIBADD) | \
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	    sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	 > $@ || (rm -f $@ ; exit 1)
 @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@libstdc++-symbols.explist : libstdc++-symbols.ver \
--- libstdc++-v3/src/c++11/Makefile.in	2013-09-21 19:04:13.000000000 -0700
+++ libstdc++-v3/src/c++11/Makefile.in	2015-09-12 13:13:41.967455191 -0700
@@ -115,6 +115,8 @@
 CNUMERIC_CC = @CNUMERIC_CC@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPPFLAGS += -D_REENTRANT=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+CPPFLAGS += -D__EXTENSIONS__=1 -D_GLIBCXX_FULLY_DYNAMIC_STRING=1
 CPU_DEFINES_SRCDIR = @CPU_DEFINES_SRCDIR@
 CPU_OPT_BITS_RANDOM = @CPU_OPT_BITS_RANDOM@
 CPU_OPT_EXT_RANDOM = @CPU_OPT_EXT_RANDOM@
--- libstdc++-v3/src/c++98/Makefile.in	2013-08-06 20:38:59.000000000 -0700
+++ libstdc++-v3/src/c++98/Makefile.in	2015-09-12 13:14:37.711663788 -0700
@@ -130,6 +130,8 @@
 CNUMERIC_CC = @CNUMERIC_CC@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPPFLAGS += -D_REENTRANT=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+CPPFLAGS += -D__EXTENSIONS__=1
 CPU_DEFINES_SRCDIR = @CPU_DEFINES_SRCDIR@
 CPU_OPT_BITS_RANDOM = @CPU_OPT_BITS_RANDOM@
 CPU_OPT_EXT_RANDOM = @CPU_OPT_EXT_RANDOM@