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/amd64/1034-sunpro.config.amd64.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Mon, 16 Mar 2015 13:28:51 -0700
changeset 3955 4e310c8109a5
parent 402 94ae4d75524c
child 4498 ce7fc2376fb0
permissions -rw-r--r--
20461144 LIBSTDCXX should have some master test results to compare against 20021138 stdcxx fails to build with studio 12.4 fcs 20460634 NEON should have some master test results to compare against 20460896 OCAML has no tests and no master test results files 19931870 "gmake test" failures for libneon
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3955
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
     1
 
--- stdcxx-4.2.1-64/etc/config/sunpro.config	2008-04-24 17:25:50.000000000 -0700
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
     2
 
+++ stdcxx-4.2.1-64/etc/config/sunpro.config	2015-03-12 12:28:46.559559317 -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)
3955
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    12
 
@@ -59,10 +59,16 @@
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
3955
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    17
 
+
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    18
 
+ifeq ($(shell expr $(CCMAJOR) = 5 \& $(CCMINOR) \> 12),1)
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    19
 
+  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 -m64 -xarch=generic -xO3 -s +w2 -errtags -erroff=hidef
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    20
 
+else
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    21
 
+  CXXFLAGS        = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs -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 -m64 -xarch=generic -xO3 -s +w2 -errtags -erroff=hidef
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    22
 
+endif
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    23
 
+
402
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
 CXXPRELINK      =
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
-CPPFLAGS        =
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
-LDFLAGS         = -library=%none
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
+CPPFLAGS        = -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 
    28
 
+LDFLAGS         = -library=no%Cstd -library=Crun -m64 -xarch=generic -lpthread -lumem -lm -lc -z ignore
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
 LDSOFLAGS       = -G
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
 # use CC to invoke the compiler (needed to pick up template
3955
4e310c8109a5 20461144 LIBSTDCXX should have some master test results to compare against
Stefan Teleman <stefan.teleman@oracle.com>
parents: 402
diff changeset 
    32
 
@@ -77,7 +83,7 @@
402
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
 DEBUG_CXXFLAGS  = -g
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
 DEBUG_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
 
-OPTMZ_CXXFLAGS  = -O
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
+OPTMZ_CXXFLAGS  = -xO3
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
 OPTMZ_CPPFLAGS  =
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
94ae4d75524c 7064836 stdcxx to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
 # shared/static library options
upstream/oracle/userland-gate