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

--- stdcxx-4.2.1-64/etc/config/sunpro.config	2008-04-24 17:25:50.000000000 -0700
+++ stdcxx-4.2.1-64/etc/config/sunpro.config	2015-03-12 12:28:46.559559317 -0700
@@ -26,7 +26,7 @@
 #
 ########################################################################
 
-CXX             = CC
+SHELL           = /bin/bash
 
 # extract the "C++ m.n" substring from version string (whcih changes
 # from one release of the compiler to another)
@@ -59,10 +59,16 @@
 
 PICFLAGS        = -KPIC
 LDSOFLAGS       = 
-CXXFLAGS        = -library=%none
+
+ifeq ($(shell expr $(CCMAJOR) = 5 \& $(CCMINOR) \> 12),1)
+  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
+else
+  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
+endif
+
 CXXPRELINK      = 
-CPPFLAGS        =
-LDFLAGS         = -library=%none
+CPPFLAGS        = -I$(TOPDIR)/include/ansi -I$(TOPDIR)/include/tr1 -I$(TOPDIR)/include 
+LDFLAGS         = -library=no%Cstd -library=Crun -m64 -xarch=generic -lpthread -lumem -lm -lc -z ignore
 LDSOFLAGS       = -G
 
 # use CC to invoke the compiler (needed to pick up template
@@ -77,7 +83,7 @@
 DEBUG_CXXFLAGS  = -g
 DEBUG_CPPFLAGS  =
 
-OPTMZ_CXXFLAGS  = -O
+OPTMZ_CXXFLAGS  = -xO3
 OPTMZ_CPPFLAGS  =
 
 # shared/static library options