diff options
| -rw-r--r-- | solenv/config/sdev300.ini | 8 | ||||
| -rw-r--r-- | solenv/inc/unxsoli4.mk | 12 | ||||
| -rw-r--r-- | solenv/inc/unxsols4.mk | 16 |
3 files changed, 24 insertions, 12 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index c23d01aabc5f..177591e86c2d 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -1603,11 +1603,11 @@ unxsoli4 { SOLAR_ENV_ROOT /so/env SOLAR_SOURCE_ROOT %DRIVE_O% - SOLAR_SYSBASE_ROOT /so/env/solaris_2.8_intel + SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel } common1 { - COMPATH /so/env/compilers/SUNWS8_p/intel/SUNWspro + COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro DEVROOT %SOLAR_ENV_ROOT% LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl @@ -1904,11 +1904,11 @@ unxsols4 SOLAR_ENV_ROOT /so/env SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1 SOLAR_SOURCE_ROOT %DRIVE_O% - SOLAR_SYSBASE_ROOT /so/env/solaris_2.8_sparc + SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc } common1 { - COMPATH /so/env/compilers/SUNWS8_p/sparc/SUNWspro + COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro DEVROOT %SOLAR_ENV_ROOT% LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index e168c37b18f4..4567453f29d0 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -95,8 +95,14 @@ CFLAGSOUTOBJ=-o # compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see # sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be # disabled globally +# - wnoretvalue: warning about the last statement of a function not +# returning a value. Unfortunately triggers on perfectly acceptable +# code, for example if the last statement in is a throw statement +# - anonnotype: Warns if a type is declared in an anonymous union. Temporary +# disabled until issue i97325 is fixed. Note: The compiler is actually +# right about this warning, the C++ standard is explicit about this. CFLAGSWARNCC= -CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn +CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype CFLAGSWALLCC=$(CFLAGSWARNCC) CFLAGSWALLCXX=$(CFLAGSWARNCXX) CFLAGSWERRCC=-errwarn=%all @@ -121,10 +127,10 @@ LINKC=$(CC) # link against set of baseline libraries .IF "$(SYSBASE)"!="" C_RESTRICTIONFLAGS*=-xc99=none -LD_OPTIONS+:=-L$(SYSBASE)$/usr/lib +#LD_OPTIONS+:=-L$(SYSBASE)$/usr$/lib CDEFS+=-DSYSBASE="$(SYSBASE)" CFLAGSCC+=$(C_RESTRICTIONFLAGS) -.EXPORT : LD_OPTIONS +#.EXPORT : LD_OPTIONS .ENDIF # "$(SYSBASE)"!="" # -z combreloc combines multiple relocation sections. Reduces overhead on startup diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index 06e9d50d78b6..c9c81dad2fb4 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -74,11 +74,11 @@ CFLAGSSLOCUIMT=-KPIC -mt CFLAGSPROF=-xpg CFLAGSDEBUG=-g CFLAGSDBGUTIL= -# -xarch=v8plus restrict target to v8plus (UltraSparc) +# -m32 -xarch=sparc restrict target to 32 bit sparc # -xO3 optimization level 3 # -xspace don't do optimizations which do increase binary size # -xprefetch=yes do prefetching (helps on UltraSparc III) -CFLAGSOPT=-xarch=v8plus -xO3 -xspace -xprefetch=yes +CFLAGSOPT=-m32 -xarch=sparc -xO3 -xspace -xprefetch=yes CFLAGSNOOPT= CFLAGSOUTOBJ=-o @@ -101,8 +101,14 @@ CFLAGSOUTOBJ=-o # compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see # sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be # disabled globally +# - wnoretvalue: warning about the last statement of a function not +# returning a value. Unfortunately triggers on perfectly acceptable +# code, for example if the last statement in is a throw statement +# - anonnotype: Warns if a type is declared in an anonymous union. Temporary +# disabled until issue i97325 is fixed. Note: The compiler is actually +# right about this warning, the C++ standard is explicit about this. CFLAGSWARNCC= -CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn +CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype CFLAGSWALLCC=$(CFLAGSWARNCC) CFLAGSWALLCXX=$(CFLAGSWARNCXX) CFLAGSWERRCC=-errwarn=%all @@ -127,10 +133,10 @@ LINKC=$(CC) # link against set of baseline libraries .IF "$(SYSBASE)"!="" C_RESTRICTIONFLAGS*=-xc99=none -LD_OPTIONS+=-L$(SYSBASE)$/usr$/lib +#LD_OPTIONS+:=-L$(SYSBASE)$/usr$/lib CDEFS+=-DSYSBASE="$(SYSBASE)" CFLAGSCC+=$(C_RESTRICTIONFLAGS) -.EXPORT : LD_OPTIONS +#.EXPORT : LD_OPTIONS .ENDIF # "$(SYSBASE)"!="" # -z combreloc combines multiple relocation sections. Reduces overhead on startup |