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/stdcxx/isa_patches/i386/1034-sunpro.config.i386.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Wed, 29 Jul 2015 13:15:08 -0700
branchs11u2-sru
changeset 4713 0abeb3fa670c
parent 402 94ae4d75524c
permissions -rw-r--r--
19297051 libstdcxx incompatible with C++ mangle6 option
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4713
0abeb3fa670c 19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
     1
 
--- stdcxx-4.2.1/etc/config/sunpro.config	2008-04-24 17:25:50.000000000 -0700
0abeb3fa670c 19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
     2
 
+++ stdcxx-4.2.1/etc/config/sunpro.config	2015-06-18 07:31:34.524942817 -0700
402
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -26,7 +26,7 @@
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
 #
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
 ########################################################################
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
-CXX             = CC
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
+SHELL = /bin/bash
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
 # extract the "C++ m.n" substring from version string (whcih changes
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
 # from one release of the compiler to another)
4713
0abeb3fa670c 19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    12
 
@@ -59,10 +59,12 @@
402
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
 PICFLAGS        = -KPIC
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
 LDSOFLAGS       =
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
-CXXFLAGS        = -library=%none
4713
0abeb3fa670c 19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    17
 
+
0abeb3fa670c 19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    18
 
+CXXFLAGS        = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs,extdef -xlang=c99 $(XREGS) $(XMEMALIGN) -xlibmieee -xbuiltin=%none -norunpath -xinline= -Qoption ccfe +d2,-xgeninl=system -Qoption ccfe -expand=10000 -Qoption ccfe ++boolflag:sunwcch=false -mt -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -D_XPG5 -D_RWSTD_NO_REPLACEABLE_NEW_DELETE -D_RWSTD_NO_EXT_OPERATOR_NEW -D_IN_BUILD_STDCXX -m32 -xarch=generic -xO3 -s +w2 -errtags -erroff=hidef -Qoption ccfe -abiopt=mangle6
0abeb3fa670c 19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    19
 
+
402
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
 CXXPRELINK      =
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
-CPPFLAGS        =
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
-LDFLAGS         = -library=%none
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
+CPPFLAGS        =  -I$(BUILDDIR)/include/ansi -I$(BUILDDIR)/include/tr1 -I$(BUILDDIR)/include -I$(TOPDIR)/include/ansi -I$(TOPDIR)/include/tr1 -I$(TOPDIR)/include
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
+LDFLAGS         = -library=no%Cstd -library=Crun -m32 -xarch=generic -lpthread -lumem -lm -lc -z ignore
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
 LDSOFLAGS       = -G
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
 # use CC to invoke the compiler (needed to pick up template
4713
0abeb3fa670c 19297051 libstdcxx incompatible with C++ mangle6 option
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    28
 
@@ -77,7 +79,7 @@
402
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
 DEBUG_CXXFLAGS  = -g
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
 DEBUG_CPPFLAGS  =
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
-OPTMZ_CXXFLAGS  = -O
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
+OPTMZ_CXXFLAGS  = -xO3
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
 OPTMZ_CPPFLAGS  =
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
 # shared/static library options
upstream/oracle/userland-gate