Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gcc49/patches/017-libstdc++-src-Makefile.in.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Fri, 08 Jan 2016 11:08:09 -0800
changeset 5248 6f0a9396a317
parent 5205 eaff9ab86216
permissions -rw-r--r--
22513774 gcc 4.9.3 libstdc++ causes Firefox to dump core
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5205
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Stefan Teleman <[email protected]>
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
# Messy patch for libstdc++'s ./configure:
5248
6f0a9396a317 22513774 gcc 4.9.3 libstdc++ causes Firefox to dump core
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 5205
diff changeset 
     3
 
# 1. libtool linking on Solaris is quirky
6f0a9396a317 22513774 gcc 4.9.3 libstdc++ causes Firefox to dump core
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 5205
diff changeset 
     4
 
# 2. We want LARGEFILE enabled in the libstdc++ binary.
5205
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
# Internal patch. Not submitted upstream yet.
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
--- libstdc++-v3/src/Makefile.in	2013-08-06 20:38:59.000000000 -0700
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
+++ libstdc++-v3/src/Makefile.in	2015-09-12 13:12:28.970889245 -0700
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
@@ -148,6 +148,8 @@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
 CNUMERIC_CC = @CNUMERIC_CC@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
 CPP = @CPP@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
 CPPFLAGS = @CPPFLAGS@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+CPPFLAGS += -D_REENTRANT=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
5248
6f0a9396a317 22513774 gcc 4.9.3 libstdc++ causes Firefox to dump core
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 5205
diff changeset 
    13
 
+CPPFLAGS += -D__EXTENSIONS__=1
5205
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
 CPU_DEFINES_SRCDIR = @CPU_DEFINES_SRCDIR@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
 CPU_OPT_BITS_RANDOM = @CPU_OPT_BITS_RANDOM@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
 CPU_OPT_EXT_RANDOM = @CPU_OPT_EXT_RANDOM@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
@@ -368,6 +370,11 @@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
 	$(top_builddir)/src/c++98/libc++98convenience.la \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
 	$(top_builddir)/src/c++11/libc++11convenience.la
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
+libstdc___la_SYMVER_LIBADD = \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
+	$(top_builddir)/libsupc++/libsupc++convenience.la \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
+	$(top_builddir)/src/c++98/libc++98convenience.la \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
+	$(top_builddir)/src/c++11/libc++11convenience.la
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
+
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
 libstdc___la_DEPENDENCIES = \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
 	${version_dep} \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
 	$(top_builddir)/libsupc++/libsupc++convenience.la \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
@@ -893,7 +900,7 @@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	perl $(toplevel_srcdir)/contrib/make_sunver.pl \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	  libstdc++-symbols.ver \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	  $(libstdc___la_OBJECTS:%.lo=.libs/%.o) \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
-@ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	 `echo $(libstdc___la_LIBADD) | \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
+@ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	 `echo $(libstdc___la_SYMVER_LIBADD) | \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	    sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@	 > $@ || (rm -f $@ ; exit 1)
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
 @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@libstdc++-symbols.explist : libstdc++-symbols.ver \
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
--- libstdc++-v3/src/c++11/Makefile.in	2013-09-21 19:04:13.000000000 -0700
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
+++ libstdc++-v3/src/c++11/Makefile.in	2015-09-12 13:13:41.967455191 -0700
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
@@ -115,6 +115,8 @@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    41
 
 CNUMERIC_CC = @CNUMERIC_CC@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    42
 
 CPP = @CPP@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    43
 
 CPPFLAGS = @CPPFLAGS@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    44
 
+CPPFLAGS += -D_REENTRANT=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
5248
6f0a9396a317 22513774 gcc 4.9.3 libstdc++ causes Firefox to dump core
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 5205
diff changeset 
    45
 
+CPPFLAGS += -D__EXTENSIONS__=1
5205
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    46
 
 CPU_DEFINES_SRCDIR = @CPU_DEFINES_SRCDIR@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    47
 
 CPU_OPT_BITS_RANDOM = @CPU_OPT_BITS_RANDOM@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    48
 
 CPU_OPT_EXT_RANDOM = @CPU_OPT_EXT_RANDOM@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    49
 
--- libstdc++-v3/src/c++98/Makefile.in	2013-08-06 20:38:59.000000000 -0700
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    50
 
+++ libstdc++-v3/src/c++98/Makefile.in	2015-09-12 13:14:37.711663788 -0700
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    51
 
@@ -130,6 +130,8 @@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    52
 
 CNUMERIC_CC = @CNUMERIC_CC@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    53
 
 CPP = @CPP@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    54
 
 CPPFLAGS = @CPPFLAGS@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    55
 
+CPPFLAGS += -D_REENTRANT=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    56
 
+CPPFLAGS += -D__EXTENSIONS__=1
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    57
 
 CPU_DEFINES_SRCDIR = @CPU_DEFINES_SRCDIR@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    58
 
 CPU_OPT_BITS_RANDOM = @CPU_OPT_BITS_RANDOM@
eaff9ab86216 21637184 integrate GCC 4.9.3 in Solaris
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    59
 
 CPU_OPT_EXT_RANDOM = @CPU_OPT_EXT_RANDOM@
upstream/oracle/userland-gate