diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-10-01 09:16:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-10-01 09:16:17 +0000 |
| commit | 41faa44b020686a511625a4bb92a2edc3c63bf12 (patch) | |
| tree | 9e2156864a4df7249f49bec576838f06dbe7ede4 | |
| parent | 0f8d27d4b47a2a96061aefa9f5ebf755794e3259 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes62
2009-09-22 21:19:24 +0200 cmc r276365 : #i100000# that's the most plausible explanation, -D$(CVER) is needed by scp2 under windows
2009-09-19 16:10:36 +0200 cmc r276303 : #i100000# revert this for no partically good reason
2009-09-18 14:16:47 +0200 cmc r276279 : remove extra build depend
2009-09-18 08:56:15 +0200 cmc r276265 : #i100000# rerun autoconf
2009-09-17 14:59:38 +0200 cmc r276245 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@276192 (milestone: DEV300:m59)
2009-09-10 16:40:49 +0200 pl r276041 : fix warning
2009-09-10 11:34:55 +0200 pl r276026 : disable warning from system header
2009-09-09 19:30:45 +0200 pl r276013 : use osl_getAsciiFunctionSymbol instead of strange cast
2009-09-09 19:25:32 +0200 pl r276012 : add some casting hacks to make compile on solaris cc
2009-09-09 19:10:48 +0200 pl r276009 : add missing Configure option for solaris sparce 32bit
2009-09-09 18:37:05 +0200 pl r276008 : merge fix for #i104525# into moved code
2009-09-07 13:28:08 +0200 cmc r275894 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275801 (milestone: DEV300:m57)
2009-08-28 12:36:27 +0200 cmc r275523 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275331 (milestone: DEV300:m56)
2009-08-26 12:56:18 +0200 cmc r275413 : #i104088# use the right headers in the right place
2009-08-25 17:07:50 +0200 cmc r275372 : #i104500# make openssl build on linux that isn't x86 or x86_64
2009-08-25 13:08:48 +0200 cmc r275347 : #i89237# pretty picswitch up
2009-08-25 10:58:09 +0200 cmc r275342 : #i104489# remove last unused code in starmath
2009-08-25 10:23:33 +0200 cmc r275338 : #i104088# clean up the define post-move
2009-08-24 13:46:57 +0200 cmc r275310 : #i104088# 64bit odbc api changes
2009-08-24 13:42:52 +0200 cmc r275309 : #i89237# unify linux platform mks under a generic parent
2009-08-24 13:19:52 +0200 cmc r275307 : #i104455# remove unused code
2009-08-24 13:10:56 +0200 cmc r275306 : #i104088# 64bit odbc api changes
2009-08-24 10:07:50 +0200 cmc r275293 : #i104306# move recent-used to vcl
2009-08-24 09:32:08 +0200 cmc r275291 : #i104306# move recent-used to vcl
2009-08-23 22:01:07 +0200 cmc r275286 : #i104306# move recently-used to vcl
2009-08-22 15:25:25 +0200 cmc r275285 : #i104088# 64bit odbc api changes
2009-08-21 17:52:40 +0200 cmc r275268 : #i104306# move recently-used to vcl
2009-08-21 14:38:26 +0200 cmc r275257 : #i104408 make these headers ready for c++0x
2009-08-21 14:20:19 +0200 cmc r275251 : #i104406# avoid overlapping strcpy to avoid bustage on recent toolchains
2009-08-21 14:14:25 +0200 cmc r275250 : #i104385# silence 64bit warnings
40 files changed, 320 insertions, 2602 deletions
diff --git a/dmake/dag.c b/dmake/dag.c index ab5f7d9400c7..c10c12c18f1e 100644 --- a/dmake/dag.c +++ b/dmake/dag.c @@ -369,14 +369,17 @@ int flags; /* initial ht_flags */ /* strip out any \<nl> combinations where \ is the current * CONTINUATION char */ for(p=q; (p=strchr(p,CONTINUATION_CHAR))!=NIL(char); ) - if( p[1] == '\n' ) - strcpy( p, p+2 ); + if( p[1] == '\n' ) { + size_t len = strlen(p+2)+1; + memmove ( p, p+2, len ); + } else p++; p = DmStrSpn(q ," \t"); /* Strip white space before ... */ if( p != q ) { - strcpy( q, p); + size_t len = strlen(p)+1; + memmove( q, p, len ); p = q; } diff --git a/dmake/expand.c b/dmake/expand.c index f3db8ed02fd3..b7232303177e 100644 --- a/dmake/expand.c +++ b/dmake/expand.c @@ -230,6 +230,7 @@ Map_esc( tok )/* char *tok; { if( strchr( "\"\\vantbrf01234567", tok[1] ) ) { + size_t len; switch( tok[1] ) { case 'a' : *tok = 0x07; break; case 'b' : *tok = '\b'; break; @@ -246,13 +247,15 @@ char *tok; register int j = 0; for( ; i<2 && isdigit(tok[2]); i++ ) { j = (j << 3) + (tok[1] - '0'); - strcpy( tok+1, tok+2 ); + len = strlen(tok+2)+1; + memmove( tok+1, tok+2, len ); } j = (j << 3) + (tok[1] - '0'); *tok = j; } } - strcpy( tok+1, tok+2 ); + len = strlen(tok+2)+1; + memmove( tok+1, tok+2, len ); } } @@ -365,7 +368,8 @@ char *src; if( (e = Basename(s)) != s) { if( !(mod & DIRECTORY_FLAG) ) { /* Move the basename to the start. */ - strcpy(s, e); + size_t len = strlen(e)+1; + memmove(s, e, len); } else s = e; @@ -382,7 +386,8 @@ char *src; if( !(mod & FILE_FLAG) ) { /* Move the suffix to the start. */ - strcpy( s, e ); + size_t len = strlen(e)+1; + memmove(s, e, len); } else s = e; @@ -725,8 +730,10 @@ int doexpand; /* If TRUE enables macro expansion */ done = !lev; break; } else { + size_t len; s[1] = ' '; - strcpy( s, s+1 ); + len = strlen(s+1)+1; + memmove( s, s+1, len ); } /*FALLTHRU*/ case ' ': @@ -835,8 +842,10 @@ int doexpand; /* If TRUE enables macro expansion */ * converted them to a real space. Let's verify this. */ for( p=s; *p && *p != edelim && *p; p++ ) { if( p[0] == '\\' && p[1] == '\n' ) { + size_t len; p[1] = ' '; - strcpy( p, p+1 ); + len = strlen(p+1)+1; + memmove( p, p+1, len ); } } if( !*p ) @@ -1120,7 +1129,10 @@ int *flag; *flag = 1; res = Expand( start ); - if( (t = DmStrSpn( res, " \t" )) != res ) strcpy( res, t ); + if( (t = DmStrSpn( res, " \t" )) != res ) { + size_t len = strlen(t)+1; + memmove( res, t, len ); + } } FREE( start ); /* this is ok! start is assigned a DmSubStr above */ diff --git a/dmake/getinp.c b/dmake/getinp.c index d736f50320a2..5445193d1a90 100644 --- a/dmake/getinp.c +++ b/dmake/getinp.c @@ -169,7 +169,8 @@ do_again: * text lines on input. The maximum size of this is governened by * Buffer_size */ if( q != p && q[-1] == CONTINUATION_CHAR ) { - strcpy( q, q+1 ); + size_t len = strlen(q+1)+1; + memmove( q, q+1, len ); q--; cont = FALSE; } @@ -290,7 +291,8 @@ int keep; while( (c = strchr(c, COMMENT_CHAR)) != NIL(char) ) { if( Comment || State == NORMAL_SCAN ) if( c != str && c[-1] == ESCAPE_CHAR ) { - strcpy( c-1, c ); /* copy it left, due to \# */ + size_t len = strlen(c)+1; + memmove( c-1, c, len ); /* copy it left, due to \# */ if( pend ) (*pend)--; /* shift tail pointer left */ } else { diff --git a/dmake/make.c b/dmake/make.c index c8f5eea7f48d..0f7ab644627f 100644 --- a/dmake/make.c +++ b/dmake/make.c @@ -1352,8 +1352,10 @@ CELLPTR cp; * Nothing in Expand() should be able to change dynamic macros. */ cmnd = Expand( rp->st_string ); - if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) - strcpy(cmnd,p); + if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) { + size_t len = strlen(p)+1; + memmove(cmnd,p,len); + } /* COMMAND macro is set to "$(CMNDNAME) $(CMNDARGS)" by default, it is * possible for the user to reset it to, for example @@ -1381,8 +1383,10 @@ CELLPTR cp; shell = ((l_attr & A_SHELL) != 0); /* clean up the attributes that we may have just added. */ - if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) - strcpy(cmnd,p); + if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) { + size_t len = strlen(p)+1; + memmove(cmnd,p,len); + } } #if defined(MSDOS) @@ -1477,8 +1481,9 @@ int map; for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\0'; ) /* Remove the \<nl> sequences. */ if(*n == CONTINUATION_CHAR && n[1] == '\n') { + size_t len = strlen(n+2)+1; DB_PRINT( "make", ("fixing [%s]", p) ); - strcpy( n, n+2 ); + memmove( n, n+2, len ); p = n; } /* Look for an escape sequence and replace it by it's corresponding diff --git a/dmake/path.c b/dmake/path.c index d5dea553afb6..ead163394175 100644 --- a/dmake/path.c +++ b/dmake/path.c @@ -172,6 +172,7 @@ char *path; char *tpath; int hasdriveletter = 0; int delentry; + size_t len; DB_ENTER( "Clean_path" ); @@ -231,14 +232,16 @@ char *path; p++; } while( *p == *DirSepStr); - strcpy(t+1,p); + len = strlen(p)+1; + memmove(t+1,p,len); continue; } /* Remove './'. If OOODMAKEMODE is set do this only if it is not at * the start of the path. */ if ( p-q == 1 && *q == '.' && (q != path || !STOBOOL(OOoDmMode)) ) { - strcpy(q,p+1); + len = strlen(p+1)+1; + memmove(q,p+1,len); q = tpath; continue; } @@ -268,7 +271,8 @@ char *path; } while( *t == *DirSepStr); /* q points to first letter of the current directory/file. */ - strcpy(q,t); + len = strlen(t)+1; + memmove(q,t,len); q = tpath; } else diff --git a/dmake/rulparse.c b/dmake/rulparse.c index 338e77e8ad09..af7915fb129b 100644 --- a/dmake/rulparse.c +++ b/dmake/rulparse.c @@ -897,7 +897,7 @@ CELLPTR prereq; /* list of prerequisites */ /* Handle %-targets. */ CELLPTR cur; CELLPTR tpq = NIL(CELL); - CELLPTR nprq; + CELLPTR nprq = NULL; #ifdef DBUG DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]", @@ -915,7 +915,8 @@ CELLPTR prereq; /* list of prerequisites */ if( *name == '\'' && name[len-1]=='\'' ){ name[len-1] = '\0'; - strcpy(name,name+1); + len = strlen(name+1)+1; + memmove(name,name+1,len); /* add indirect prerequisite */ _add_indirect_prereq( cur ); } diff --git a/set_soenv.in b/set_soenv.in index 1a7fdc7d0da8..71f6d6bf90df 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -355,7 +355,7 @@ elsif ( $platform =~ m/freebsd/ ) elsif ( $platform =~ m/linux/ ) { # General Linux settings: - $CVER = "C300"; + $CVER = "C341"; $BIG_SVX = "TRUE"; $COM = "GCC"; $COMPATH = '@COMPATH@'; @@ -390,20 +390,13 @@ elsif ( $platform =~ m/linux/ ) $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; } - if( @GCCVER@ >= 30401 ) { - $OUTPATH = "unxlngi6"; - $CVER = "C341"; - } - else { - $OUTPATH = "unxlngi4"; - } + $OUTPATH = "unxlngi6"; } elsif ($platform =~ m/^x86_64/) { print "Setting Linux x86-64 specific values... "; $outfile = "LinuxX86-64Env.Set"; $CPU = "X"; $CPUNAME = "X86_64"; - $CVER = "C341"; $OUTPATH = "unxlngx6"; # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1 $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64"; @@ -416,7 +409,6 @@ elsif ( $platform =~ m/linux/ ) $outfile = "LinuxIA64Env.Set"; $CPU = "A"; $CPUNAME = "IA64"; - $CVER = "C341"; $OUTPATH = "unxlnga"; $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64"; $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64".$ds."server"; @@ -499,7 +491,6 @@ elsif ( $platform =~ m/linux/ ) $outfile = "LinuxM68KEnv.Set"; $CPU = "6"; $CPUNAME = "M68K"; - $CVER = "C341"; $OUTPATH = "unxlngm68k"; $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k"; $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."server"; diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index fb94c450b0f7..8b65e8b111e9 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -397,7 +397,6 @@ unxfbsdi CPUNAME INTEL CVER C300 ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin - GLIBC GLIBC GUI UNX GUIBASE unx GVER VCL @@ -704,7 +703,6 @@ unxlngi6 ENABLE_KDE TRUE ENABLE_EVOAB2 TRUE ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin - GLIBC 2SUSE90 GUI UNX GUIBASE unx GVER VCL @@ -1030,7 +1028,6 @@ unxlngx6 ENABLE_KAB TRUE ENABLE_KDE TRUE ENV_TOOLS %SOLARROOT%/et_linux_libc2.11/%WORK_STAMP%/bin - GLIBC 2REDHAT60 GUI UNX GUIBASE unx GUIENV sal @@ -1360,7 +1357,6 @@ unxmacxi CPUNAME INTEL CVER C341 ENV_TOOLS %SOLARROOT%/et_macosx_intel/%WORK_STAMP%/bin - GLIBC unknown GUI UNX GUIBASE aqua GVER VCL @@ -2560,7 +2556,6 @@ unxubti8 CPU I CPUNAME INTEL CVER C341 - GLIBC 2REDHAT60 GUI UNX GUIBASE unx GVER VCL diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index 51786eb57972..dca20cc902b1 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -116,7 +116,6 @@ common GCRINC GCRLIB GCRPATH - GLIBC GNUCOPY GXX_INCLUDE_PATH HBTOOLKIT diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 0d46f3ff9102..e93b23c54af0 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -262,7 +262,6 @@ ISCLIB=-lsc$(DLLPOSTFIX) ISDLIB=-lsd$(DLLPOSTFIX) PKGCHKLIB=-lpkgchk$(DLLPOSTFIX) HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX) -SYSSHELLLIB=-lsysshell .IF "$(GUI)$(COM)"=="WNTGCC" JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID) .ELSE # "$(GUI)$(COM)"=="WNTGCC" @@ -472,7 +471,6 @@ SVXLLIB=svxl.lib FREETYPELIB=freetype.lib PKGCHKLIB=ipkgchk.lib HELPLINKERLIB=ihelplinker.lib -SYSSHELLLIB=sysshell.lib JVMACCESSLIB = ijvmaccess.lib CPPUNITLIB = cppunit.lib XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 9b18ad94bb65..4771e6da0771 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -238,7 +238,6 @@ STDSLO= STDLIB= STDSHL= -LIBMGR= LIBFLAGS= IMPLIBMGR= @@ -296,6 +295,7 @@ cap= #CC= #CXX= #LINK= +#LIBMGR= # avoid confusion with CUE PROFILE variable... @@ -908,10 +908,6 @@ CDEFS+=$(CDEFS_PRESET) CDEFS+=-DTIMELOG .ENDIF -.IF "$(GUI)"=="UNX" -CDEFS+=-DCVER=$(CVER) -.ENDIF - CDEFSCXX= CDEFSOBJ= CDEFSSLO=-DSHAREDLIB -D_DLL_ diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk index 6e1d789d8845..607e1076a28c 100644 --- a/solenv/inc/tg_wntx64.mk +++ b/solenv/inc/tg_wntx64.mk @@ -515,6 +515,4 @@ $(SLO_X64)/%.obj : %.c .ENDIF # "$(BUILD_X64)"!="" - - - +BUILD64=1 diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index ff5349f62496..718e23c01b4e 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -83,67 +83,39 @@ .INCLUDE : unxscoi.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXI" -.INCLUDE : unxlnxi.mk -.ENDIF - -.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXP2" -.INCLUDE : unxlngp.mk -.ENDIF - .IF "$(COM)$(OS)$(CPU)" == "GCCLINUXS" .INCLUDE : unxlngs.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC295LINUXI2REDHAT60" -.INCLUDE : unxlngi3.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUXI2REDHAT60" -.INCLUDE : unxlngi4.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC322LINUXI2REDHAT60" -.INCLUDE : unxlngi5.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC341LINUXI2REDHAT60" -.INCLUDE : unxlngi6.mk +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXI" +.INCLUDE : unxlngi.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC432LINUXI2SUSE90" -.INCLUDE : unxlngi6.mk +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXX" +.INCLUDE : unxlngx.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC341LINUXX2REDHAT60" -.INCLUDE : unxlngx6.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC295LINUXP2REDHAT60" +.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC" .INCLUDE : unxlngppc.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUXP2REDHAT60POWERPC" -.INCLUDE : unxlngppc4.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUXP2REDHAT60POWERPC64" +.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC64" .INCLUDE : unxlngppc64.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUX32REDHAT60S390" -.INCLUDE : unxlngs3904.mk +.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390" +.INCLUDE : unxlngs390.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUX32REDHAT60S390X" +.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390X" .INCLUDE : unxlngs390x.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXR2REDHAT60" +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXR" .INCLUDE : unxlngr.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXA2REDHAT60" +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA" .INCLUDE : unxlnga.mk .ENDIF diff --git a/solenv/inc/unxlngi6.mk b/solenv/inc/unxlng.mk index be55ef608a33..a79d3e47c6cf 100644 --- a/solenv/inc/unxlngi6.mk +++ b/solenv/inc/unxlng.mk @@ -29,11 +29,17 @@ # #************************************************************************* -# mk file for unxlngi6 -ASM= -AFLAGS= - +# generic mk file for unxlng (unix linux glibc) +ASM*= +AFLAGS*= SOLAR_JAVA*= +# default optimization level for product code +CDEFAULTOPT*=-O2 +# architecture dependent flags for the C and C++ compiler that can be changed by +# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build +ARCH_FLAGS*= +# position independent code switch +PICSWITCH*:=-fpic JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker @@ -41,7 +47,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) +CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) # enable visibility define in "sal/types.h" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" @@ -58,16 +64,12 @@ JAVA_RUNTIME=-ljava_g .ENDIF .ENDIF -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*=-mtune=pentiumpro - # name of C++ Compiler CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include +CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -90,14 +92,13 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible CFLAGSCXX= -pipe $(ARCH_FLAGS) -PICSWITCH:=-fpic .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGSCXX += -fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS -CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch -CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch # Compiler flags for compiling static object in multi threaded environment with graphical user interface CFLAGSOBJGUIMT= @@ -114,7 +115,7 @@ CFLAGSDEBUG=-g CFLAGSDBGUTIL= # Compiler flags for enabling optimizations .IF "$(PRODUCT)"!="" -CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products +CFLAGSOPT=$(CDEFAULTOPT) -fno-strict-aliasing # optimizing for products .ELSE # "$(PRODUCT)"!="" CFLAGSOPT= # no optimizing for non products .ENDIF # "$(PRODUCT)"!="" @@ -188,7 +189,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)/salmain.o +STDOBJVCL=$(L)$/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= @@ -207,14 +208,12 @@ LINKFLAGS += -Wl,-zdynsort .ENDIF # libraries for linking applications -STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed +STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed # libraries for linking shared libraries -STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed +STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed -X11LINK_DYNAMIC = -lX11 -lXext - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive .IF "$(USE_STLP_DEBUG)" != "" @@ -238,7 +237,7 @@ LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) # name of library manager -LIBMGR=ar +LIBMGR*=ar LIBFLAGS=-r # tool for generating import libraries @@ -255,8 +254,6 @@ RCLINKFLAGS= RCSETVERSION= # platform specific identifier for shared libs -DLLPOSTFIX=li DLLPRE=lib DLLPOST=.so PCHPOST=.gch - diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk index a777c2a1bd67..6baf600fee35 100644 --- a/solenv/inc/unxlnga.mk +++ b/solenv/inc/unxlnga.mk @@ -29,202 +29,9 @@ # #************************************************************************* -# mk file for unxlnga -ASM= -AFLAGS= +# mk file for Unix Linux Itanium using gcc, please make generic modifications to unxlng.mk -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DIA64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc -.IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include -CXX+:=$(CFLAGS_SYSBASE) -CC+:=$(CFLAGS_SYSBASE) -.ENDIF # "$(SYSBASE)"!="" -CFLAGS+=-Wreturn-type -fmessage-length=0 -c -# flags to enable build with symbols; required for crashdump feature -.IF "$(ENABLE_SYMBOLS)"=="SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta - -.ENDIF -.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" -LINKFLAGS += -Wl,--hash-style=both -.ELSE -LINKFLAGS += -Wl,-zdynsort -.ENDIF - -# flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -# -fpermissive should be removed as soon as possible -CFLAGSCXX= -pipe $(ARCH_FLAGS) -CFLAGSCXX+= -Wno-ctor-dtor-privacy -CFLAGSCXX+= -fno-use-cxa-atexit -PICSWITCH:=-fpic -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGSCXX += -fvisibility-inlines-hidden -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products -CFLAGSOPT+=-Wuninitialized # not supported without optimization -.ELSE # "$(PRODUCT)"!="" -CFLAGSOPT= # no optimizing for non products -.ENDIF # "$(PRODUCT)"!="" -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWARNCC=-Wall -Wextra -Wendif-labels -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor -CFLAGSWALLCC=$(CFLAGSWARNCC) -CFLAGSWALLCXX=$(CFLAGSWARNCXX) -CFLAGSWERRCC=-Werror - -# Once all modules on this platform compile without warnings, set -# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see -# settings.mk): - -MODULES_WITH_WARNINGS := \ - extensions \ - soldep \ - slideshow \ - svtools \ - svx - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) - -# default linker flags -LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec - -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -# linker flags for optimization (symbol hashtable) -# for now, applied to symbol scoped libraries, only -LINKFLAGSOPTIMIZE*=-Wl,-O1 -LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT+=-lX11 -ldl -lpthread -lm -STDLIBCUIMT+=-ldl -lpthread -lm -# libraries for linking shared libraries -STDSHLGUIMT+=-lX11 -lXext -ldl -lpthread -lm -STDSHLCUIMT+=-ldl -lpthread -lm - -LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs +.INCLUDE : unxlng.mk +CFLAGS+=-DIA64 +CFLAGSCXX+=-fno-use-cxa-atexit DLLPOSTFIX=la -DLLPRE=lib -DLLPOST=.so -PCHPOST=.gch - diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk new file mode 100644 index 000000000000..dcc2addcd46c --- /dev/null +++ b/solenv/inc/unxlngi.mk @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: unxlngi6.mk,v $ +# +# $Revision: 1.48 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk +CDEFAULTOPT=-Os +ARCH_FLAGS*=-mtune=pentiumpro +.INCLUDE : unxlng.mk +CDEFS+=-DX86 +DLLPOST=.so +DLLPOSTFIX=li diff --git a/solenv/inc/unxlngi4.mk b/solenv/inc/unxlngi4.mk deleted file mode 100644 index 6b192b84fb74..000000000000 --- a/solenv/inc/unxlngi4.mk +++ /dev/null @@ -1,223 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxlngi4.mk,v $ -# -# $Revision: 1.49 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -# mk file for unxlngi4 -ASM= -AFLAGS= - -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*=-mcpu=pentiumpro - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc -# flags for C and C++ Compiler -CFLAGS+=-fmessage-length=0 -c - -# flags to enable build with symbols; required for crashdump feature -.IF "$(ENABLE_SYMBOLS)"=="SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g -.ENDIF - -# flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -CFLAGSCXX= -pipe $(ARCH_FLAGS) - -# HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers -.IF "$(BUILD_SPECIAL)"=="" -CFLAGSCXX+=-include preinclude.h -.ENDIF -PICSWITCH:=-fpic - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -# CFLAGSOPT=-O2 -# reduce to -O1 to avoid optimization problems -CFLAGSOPT=-O1 -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC= -.IF "$(PRODUCT)"!="" -CFLAGSWARNCC+=-Wuninitialized # not supported without optimization -.ENDIF -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWALLCC=-Wall -Wextra -Wendif-labels -CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy -CFLAGSWERRCC=-Werror - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) - -# default linker flags -LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec - -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -# linker flags for optimization (symbol hashtable) -# for now, applied to symbol scoped libraries, only -LINKFLAGSOPTIMIZE*=-Wl,-O1 -LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -.IF "$(ALLOC)" == "TCMALLOC" -STDLIBGUIMT+=-ltcmalloc -STDLIBCUIMT+=-ltcmalloc -STDSHLGUIMT+=-ltcmalloc -STDSHLCUIMT+=-ltcmalloc -.ENDIF - -# libraries for linking applications -STDLIBGUIMT+=-lX11 -ldl -lpthread -lm -STDLIBCUIMT+=-ldl -lpthread -lm -# libraries for linking shared libraries -STDSHLGUIMT+=-lX11 -lXext -ldl -lpthread -lm -STDSHLCUIMT+=-ldl -lpthread -lm - -LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -lstdc++ -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF - -#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs -DLLPOSTFIX=li -DLLPRE=lib -DLLPOST=.so - diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk index 91c0a24c2304..a206d61543b2 100644 --- a/solenv/inc/unxlngm68k.mk +++ b/solenv/inc/unxlngm68k.mk @@ -29,194 +29,13 @@ # #************************************************************************* -# mk file for unxlngm68k -ASM= -AFLAGS= +# mk file for Unix Linux m68k using GCC, please make generic modifications to unxlng.mk -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DM68K -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc -.IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include -CXX+:=$(CFLAGS_SYSBASE) -CC+:=$(CFLAGS_SYSBASE) -.ENDIF # "$(SYSBASE)"!="" -CFLAGS+=-Wreturn-type -fmessage-length=0 -c -# flags to enable build with symbols; required for crashdump feature -.IF "$(ENABLE_SYMBOLS)"=="SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta - -.ENDIF - -CFLAGS+=-fsigned-char -fno-omit-frame-pointer -# flags for the C++ Compiler -CFLAGSCC= -fsigned-char -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -CFLAGSCXX= -fsigned-char -pipe $(ARCH_FLAGS) -CFLAGSCXX+= -Wno-ctor-dtor-privacy -CFLAGSCXX+= -fno-use-cxa-atexit +CDEFAULTOPT=-Os PICSWITCH:=-fPIC -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGSCXX += -fvisibility-inlines-hidden -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products -CFLAGSOPT+=-Wuninitialized # not supported without optimization -.ELSE # "$(PRODUCT)"!="" -CFLAGSOPT= # no optimizing for non products -.ENDIF # "$(PRODUCT)"!="" -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o -# Enable all warnings -CFLAGSWALL=-Wall -# Set default warn level -CFLAGSDFLTWARN= - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) - -# default linker flags -#LINKFLAGSDEFS*=-Wl,-z,defs -#but got some undefined unwind problem with defs -LINKFLAGSDEFS!= -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -# linker flags for optimization (symbol hashtable) -# for now, applied to symbol scoped libraries, only -LINKFLAGSOPTIMIZE*=-Wl,-O1 -LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT=-lX11 -ldl -lpthread -lm -STDLIBCUIMT=-ldl -lpthread -lm -# libraries for linking shared libraries -STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm -STDSHLCUIMT=-ldl -lpthread -lm - -LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -.IF "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug -LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) -.ELSE # "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF -.ENDIF # "$(USE_STLP_DEBUG)" != "" - -#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs +.INCLUDE : unxlng.mk +CDEFS+=-DM68K +CFLAGS+=-fsigned-char -fno-omit-frame-pointer +CFLAGSCC+=-fsigned-char +CFLAGSCXX+=-fsigned-char -fno-use-cxa-atexit DLLPOSTFIX=lm -DLLPRE=lib -DLLPOST=.so diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk index 258d0677267c..c4510ecb5738 100644 --- a/solenv/inc/unxlngmips.mk +++ b/solenv/inc/unxlngmips.mk @@ -29,237 +29,9 @@ # #************************************************************************* -# mk file for unxlngmips -ASM= -AFLAGS= +# mk file for Unix Linux Mips using GCC, please make generic modifications to unxlng.mk -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DMIPS -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -#ARCH_FLAGS*=-mtune=pentiumpro - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc -.IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include -CXX+:=$(CFLAGS_SYSBASE) -CC+:=$(CFLAGS_SYSBASE) -.ENDIF # "$(SYSBASE)"!="" -CFLAGS+=-fmessage-length=0 -c - -# flags to enable build with symbols; required for crashdump feature -.IF "$(ENABLE_SYMBOLS)"=="SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta - -.ENDIF - -# flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -# -fpermissive should be removed as soon as possible -CFLAGSCXX= -pipe $(ARCH_FLAGS) -PICSWITCH:=-fpic -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGSCXX += -fvisibility-inlines-hidden -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# Compiler flags for compiling static object in single threaded environment with graphical user interface -CFLAGSOBJGUIST= -# Compiler flags for compiling static object in single threaded environment with character user interface -CFLAGSOBJCUIST= -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products -.ELSE # "$(PRODUCT)"!="" -CFLAGSOPT= # no optimizing for non products -.ENDIF # "$(PRODUCT)"!="" -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWARNCC=-Wall -Wextra -Wendif-labels -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor -CFLAGSWALLCC=$(CFLAGSWARNCC) -CFLAGSWALLCXX=$(CFLAGSWARNCXX) -CFLAGSWERRCC=-Werror - -# Once all modules on this platform compile without warnings, set -# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see -# settings.mk): -MODULES_WITH_WARNINGS := \ - b_server \ - basctl \ - basebmp \ - chart2 \ - cppcanvas \ - desktop \ - devtools \ - dxcanvas \ - extensions \ - filter \ - glcanvas \ - lingu \ - r_tools \ - sc \ - sd \ - slideshow \ - starmath \ - svx \ - sw \ - writerperfect \ - xmlsecurity - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) - -# default linker flags -LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec - -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -# linker flags for optimization (symbol hashtable) -# for now, applied to symbol scoped libraries, only -LINKFLAGSOPTIMIZE*=-Wl,-O1 -LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -.IF "$(ALLOC)" == "TCMALLOC" -STDLIBCUIST+=-ltcmalloc -STDLIBGUIMT+=-ltcmalloc -STDLIBCUIMT+=-ltcmalloc -STDLIBGUIST+=-ltcmalloc -STDSHLGUIMT+=-ltcmalloc -STDSHLCUIMT+=-ltcmalloc -STDSHLGUIST+=-ltcmalloc -STDSHLCUIST+=-ltcmalloc -.ENDIF - -# libraries for linking applications -STDLIBCUIST+=-ldl -lm -STDLIBGUIMT+=-lX11 -lXau -ldl -lpthread -lm -STDLIBCUIMT+=-ldl -lpthread -lm -STDLIBGUIST+=-lX11 -lXau -ldl -lm -# libraries for linking shared libraries -STDSHLGUIMT+=-lX11 -lXau -lXext -ldl -lpthread -lm -STDSHLCUIMT+=-ldl -lpthread -lm -STDSHLGUIST+=-lX11 -lXau -lXext -ldl -lm -STDSHLCUIST+=-ldl -lm - -LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -.IF "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug -LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) -.ELSE # "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF # "$(USE_STLP_DEBUG)" != "" - -#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs +CDEFAULTOPT=-Os +.INCLUDE : unxlng.mk +CDEFS+=-DMIPS DLLPOSTFIX=lm -DLLPRE=lib -DLLPOST=.so - diff --git a/solenv/inc/unxlngp.mk b/solenv/inc/unxlngp.mk deleted file mode 100644 index 9ab0dbab9944..000000000000 --- a/solenv/inc/unxlngp.mk +++ /dev/null @@ -1,157 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxlngp.mk,v $ -# -# $Revision: 1.13 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# mak file for unxlngp -ASM= -AFLAGS= - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DGLIBC=2 -CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -CDEFS+=-DNO_INET_ON_DEMAND -DX86 -DNEW_SOLAR - -# kann c++ was c braucht?? - -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -CXX*=g++ -CC*=gcc -CFLAGS=-nostdinc -c -CFLAGSCC= -pipe $(ARCH_FLAGS) -CFLAGSCXX= -pipe -fguiding-decls -fno-rtti -fno-exceptions $(ARCH_FLAGS) - -# Exceptions increase the size of shared libraries by 50% !! -.IF "$(PRJNAME)"=="usr" || "$(PRJNAME)"=="uno" || "$(PRJNAME)"=="starone" || "$(PRJNAME)"=="schedule" || "$(PRJNAME)"=="one" || "$(SET_EXEPTIONS)"!="" -CFLAGSCXX += -fexceptions -.ENDIF -PICSWITCH:=-fPIC -#STDOBJVCL=$(L)/salmain.o -CFLAGSOBJGUIMT= -CFLAGSOBJCUIMT= -CFLAGSSLOGUIMT=$(PICSWITCH) -CFLAGSSLOCUIMT=$(PICSWITCH) -CFLAGSPROF= -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -CFLAGSOPT=-O2 -CFLAGSNOOPT= -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC= -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWALLCC=-Wall -Wextra -Wendif-labels -CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy -CFLAGSWERRCC=-Werror - -STATIC = -Bstatic -DYNAMIC = -Bdynamic - -LINK=ld -LINKFLAGS=-melf_i386 -z nodefs -dynamic-linker /lib/ld-linux.so.2 /nw386/dev/s/solenv/unxlngp/usr/lib/crti.o /nw386/dev/s/solenv/unxlngp/lib/gcc-lib/i586-pc-linux-gnu/egcs-2.90.29/crtbegin.o -LINKFLAGSAPPGUI=/usr/lib/crt1.o -LINKFLAGSSHLGUI=-noinhibit-exec -warn-once -G -LINKFLAGSAPPCUI=/usr/lib/crt1.o -LINKFLAGSSHLCUI=-noinhibit-exec -warn-once -G -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -.IF "$(NO_BSYMBOLIC)"=="" -.IF "$(PRJNAME)" != "envtest" -LINKFLAGSSHLGUI+=-Bsymbolic -LINKFLAGSSHLCUI+=-Bsymbolic -.ENDIF -.ENDIF # "$(NO_BSYMBOLIC)"=="" - -SONAME_SWITCH=-Wl,-h - -# reihenfolge der libs NICHT egal! - -# standard C++ Library -# -# das statische dazulinken der libstdc++ macht jede shared library um 50k -# (ungestrippt) oder so groesser, auch wenn sie ueberhaupt nicht gebraucht -# wird. Da muessen wir uns was besseres ueberlegen. -# -# Da mit der neuen libc.so.6 (libc-2.0.5.so) sowieso eine System-Library -# ausgeliefert werden muss, linken wir auch die libstdc++.so dynamisch. - -STDLIBCPP=-lstdc++ - -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -STDLIBGUIMT=-Bdynamic -lcrypt -ldl -lpthread -lm -lgcc -lc /nw386/dev/s/solenv/unxlngp/lib/gcc-lib/i586-pc-linux-gnu/egcs-2.90.29/crtend.o /nw386/dev/s/solenv/unxlngp/usr/lib/crtn.o -STDLIBCUIMT=-Bdynamic -lcrypt -ldl -lpthread -lm -lgcc -lc /nw386/dev/s/solenv/unxlngp/lib/gcc-lib/i586-pc-linux-gnu/egcs-2.90.29/crtend.o /nw386/dev/s/solenv/unxlngp/usr/lib/crtn.o -STDSHLGUIMT=-Bdynamic -lX11 -lXext -lcrypt -ldl -lpthread -lm -lgcc -lc /nw386/dev/s/solenv/unxlngp/lib/gcc-lib/i586-pc-linux-gnu/egcs-2.90.29/crtend.o /nw386/dev/s/solenv/unxlngp/usr/lib/crtn.o -STDSHLCUIMT=-Bdynamic -lcrypt -ldl -lpthread -lm -lgcc -lc /nw386/dev/s/solenv/unxlngp/lib/gcc-lib/i586-pc-linux-gnu/egcs-2.90.29/crtend.o /nw386/dev/s/solenv/unxlngp/usr/lib/crtn.o - -LIBMGR=ar -LIBFLAGS=-r -# LIBEXT=.so - -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -.IF "$(WORK_STAMP)"!="LVM364" -.IF "$(WORK_STAMP)"!="MIX364" -DLLPOSTFIX=li -.ENDIF -.ENDIF -DLLPRE=lib -DLLPOST=.so - -LDUMP=cppfilt /b /n /o /p - diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk index b1ec2b7ae33a..3a7a8058498c 100644 --- a/solenv/inc/unxlngppc.mk +++ b/solenv/inc/unxlngppc.mk @@ -6,9 +6,9 @@ # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: unxlngppc.mk,v $ +# $RCSfile: unxlngppc4.mk,v $ # -# $Revision: 1.30 $ +# $Revision: 1.34 $ # # This file is part of OpenOffice.org. # @@ -29,181 +29,13 @@ # #************************************************************************* -# Makefile for linux-ppc -# Christer Gustavsson <cg@nocrew.org> -ASM= -AFLAGS= +# mk file for Unix Linux PowerPC using GCC, please make generic modifications to unxlng.mk -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DPOWERPC -DPPC - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc - -.IF "$(ENABLE_SYMBOLS)" == "SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g -.ENDIF -.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" -LINKFLAGS += -Wl,--hash-style=both -.ELSE -LINKFLAGS += -Wl,-zdynsort -.ENDIF - -# source code is still not signed versus unsigned char clean -CFLAGS=-fsigned-char -nostdinc -c -CFLAGSCC=-fsigned-char $(ARCH_FLAGS) - -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -CFLAGSCXX= -pipe -frtti $(ARCH_FLAGS) +DEFAULTOPT=-Os PICSWITCH:=-fPIC - -#Note: the build is not consistent in that it links static librtaries -# libraries into dynamic libraries in places, so use -fPIC throughout -# until fixed. - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT=$(PICSWITCH) -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) - -# Compiler flags for profiling -CFLAGSPROF= - -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= - -# Compiler flags for enabling optimizations -CFLAGSOPT=-O2 -fno-schedule-insns -fno-strict-aliasing -fno-schedule-insns2 - -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 - -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC= -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWALLCC=-Wall -Wextra -Wendif-labels -CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy -CFLAGSWERRCC=-Werror - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) -# default linker flags -LINKFLAGS=-Wl,-rpath,\''$$ORIGIN'\' - - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -LINKFLAGSAPPCUI= -Wl,-export-dynamic -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -.IF "$(NO_BSYMBOLIC)"=="" -.IF "$(PRJNAME)" != "envtest" -LINKFLAGSSHLGUI+=-Wl,-Bsymbolic -LINKFLAGSSHLCUI+=-Wl,-Bsymbolic -.ENDIF -.ENDIF # "$(NO_BSYMBOLIC)"=="" - -LINKVERSIONMAPFLAG=-Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT=-lX11 -ldl -lpthread -lm -STDLIBCUIMT=-ldl -lpthread -lm -# libraries for linking shared libraries -STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm -STDSHLCUIMT=-ldl -lpthread -lm - -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs +.INCLUDE : unxlng.mk +CDEFS+=-DPOWERPC -DPPC +CFLAGS+=-fsigned-char +CFLAGSCC+=-fsigned-char +CFLAGSCXX+=-fsigned-char DLLPOSTFIX=lp -DLLPRE=lib -DLLPOST=.so diff --git a/solenv/inc/unxlngppc4.mk b/solenv/inc/unxlngppc4.mk deleted file mode 100644 index a9788c75aba5..000000000000 --- a/solenv/inc/unxlngppc4.mk +++ /dev/null @@ -1,214 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxlngppc4.mk,v $ -# -# $Revision: 1.34 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -# mk file for linux ppc using gcc 3.X -ASM= -AFLAGS= - -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DPOWERPC -DPPC - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc - -CFLAGS+=-fsigned-char -fmessage-length=0 -c - -# flags for the C++ Compiler -CFLAGSCC= -fsigned-char -pipe $(ARCH_FLAGS) - -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs - -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -CFLAGSCXX= -fsigned-char -pipe -frtti $(ARCH_FLAGS) -PICSWITCH:=-fPIC - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT=$(PICSWITCH) -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) - -# Compiler flags for profiling -CFLAGSPROF= - -# Compiler flags for debugging -CFLAGSDEBUG=-g -.IF "$(ENABLE_SYMBOLS)" == "SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g -.ENDIF -CFLAGSDBGUTIL= - -# Compiler flags for enabling optimizations -CFLAGSOPT=-Os -fno-strict-aliasing - -# Compiler flags for disabling optimizations -# don't change - required to work around optimization bugs -CFLAGSNOOPT=-O0 - -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC= -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWALLCC=-Wall -Wextra -Wendif-labels -CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy -CFLAGSWERRCC=-Werror - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) - -# default linker flags - -LINKFLAGSDEFS*= -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_NONE= -LINKFLAGS= $(LINKFLAGSDEFS) - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec - -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -.IF "$(NO_BSYMBOLIC)"=="" -.IF "$(PRJNAME)" != "envtest" -LINKFLAGSSHLGUI+=-Wl,-Bsymbolic -LINKFLAGSSHLCUI+=-Wl,-Bsymbolic -.ENDIF -.ENDIF # "$(NO_BSYMBOLIC)"=="" - -LINKVERSIONMAPFLAG=-Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT=-lX11 -ldl -lpthread -lm -STDLIBCUIMT=-ldl -lpthread -lm -# libraries for linking shared libraries -STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm -STDSHLCUIMT=-ldl -lpthread -lm - -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -lstdc++ -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF - -#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs -DLLPOSTFIX=lp -DLLPRE=lib -DLLPOST=.so diff --git a/solenv/inc/unxlngppc64.mk b/solenv/inc/unxlngppc64.mk index 08d99211a360..1fa6b8f30e90 100644 --- a/solenv/inc/unxlngppc64.mk +++ b/solenv/inc/unxlngppc64.mk @@ -28,9 +28,11 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -# mk file for linux ppc64, inherit from ppc and add some flags -.INCLUDE : unxlngppc4.mk +# mk file for Unix Linux 64Bit PowerPC using GCC, inherit from ppc and add some flags + +.INCLUDE : unxlngppc.mk CDEFS+=-DPOWERPC64 CFLAGSCXX+=-mminimal-toc +BUILD64=1 diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk index 0022f36f3027..8a82cefb0b14 100644 --- a/solenv/inc/unxlngr.mk +++ b/solenv/inc/unxlngr.mk @@ -29,196 +29,11 @@ # #************************************************************************* -# unxlngr.mk for armv4l - -# mk file for unxlngr -ASM= -AFLAGS= - -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DARM32 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc -.IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include -CXX+:=$(CFLAGS_SYSBASE) -CC+:=$(CFLAGS_SYSBASE) -.ENDIF # "$(SYSBASE)"!="" -CFLAGS+=-Wreturn-type -fmessage-length=0 -c -# flags to enable build with symbols; required for crashdump feature -.IF "$(ENABLE_SYMBOLS)"=="SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta - -.ENDIF +# mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk +CDEFAULTOPT=-Os +.INCLUDE : unxlng.mk +CDEFS+=-DARM32 CFLAGS+=-fno-omit-frame-pointer -# flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -CFLAGSCXX= -pipe $(ARCH_FLAGS) -CFLAGSCXX+= -Wno-ctor-dtor-privacy -CFLAGSCXX+= -fno-use-cxa-atexit -PICSWITCH:=-fpic -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGSCXX += -fvisibility-inlines-hidden -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products -CFLAGSOPT+=-Wuninitialized # not supported without optimization -.ELSE # "$(PRODUCT)"!="" -CFLAGSOPT= # no optimizing for non products -.ENDIF # "$(PRODUCT)"!="" -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o -# Enable all warnings -CFLAGSWALL=-Wall -# Set default warn level -CFLAGSDFLTWARN= - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) - -# default linker flags -LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -# linker flags for optimization (symbol hashtable) -# for now, applied to symbol scoped libraries, only -LINKFLAGSOPTIMIZE*=-Wl,-O1 -LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT=-lX11 -ldl -lpthread -lm -STDLIBCUIMT=-ldl -lpthread -lm -# libraries for linking shared libraries -STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm -STDSHLCUIMT=-ldl -lpthread -lm - -LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -.IF "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug -LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) -.ELSE # "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF -.ENDIF # "$(USE_STLP_DEBUG)" != "" - -#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs +CFLAGSCXX+=-fno-use-cxa-atexit DLLPOSTFIX=lr -DLLPRE=lib -DLLPOST=.so - diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk index 96c64b20632b..1286179659ae 100644 --- a/solenv/inc/unxlngs.mk +++ b/solenv/inc/unxlngs.mk @@ -29,190 +29,12 @@ # #************************************************************************* -# mk file for unxlngs +# mk file for Unix Linux Sparc using GCC, please make generic modifications to unxlng.mk + ASM=$(CC) AFLAGS=-Wa,-K,PIC -c $(CDEFS) - -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DSPARC -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# name of C++ Compiler -#CXX*=g++ -#name of C Compiler -#CC*=gcc - -CFLAGS+=-fmessage-length=0 -c - -# flags to enable build with symbols; required for crashdump feature -.IF "$(ENABLE_SYMBOLS)"=="SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g -.ENDIF -.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" -LINKFLAGS += -Wl,--hash-style=both -.ELSE -LINKFLAGS += -Wl,-zdynsort -.ENDIF - -# flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -CFLAGSCXX= -pipe $(ARCH_FLAGS) - +CDEFAULTOPT=-Os PICSWITCH:=-fPIC - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products -.ELSE # "$(PRODUCT)"!="" -CFLAGSOPT= # no optimizing for non products -.ENDIF # "$(PRODUCT)"!="" -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC=-Wreturn-type -.IF "$(PRODUCT)"!="" -CFLAGWARNCC+=-Wuninitialized # not supported without optimization -.ENDIF -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWALLCC=-Wall -Wextra -Wendif-labels -CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy -CFLAGSWERRCC=-Werror - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) - -# default linker flags -LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec - -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -# linker flags for optimization (symbol hashtable) -# for now, applied to symbol scoped libraries, only -LINKFLAGSOPTIMIZE*=-Wl,-O1 -LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT=-lX11 -ldl -lpthread -lm -STDLIBCUIMT=-ldl -lpthread -lm -# libraries for linking shared libraries -STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm -STDSHLCUIMT=-ldl -lpthread -lm - -LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport $(STDLIBCPP) -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF - -#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs +.INCLUDE : unxlng.mk +CDEFS+=-DSPARC DLLPOSTFIX=ls -DLLPRE=lib -DLLPOST=.so diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk new file mode 100644 index 000000000000..303542dc7619 --- /dev/null +++ b/solenv/inc/unxlngs390.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: unxlngs3904.mk,v $ +# +# $Revision: 1.22 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# mk file for Unix Linux s390 using GCC, please make generic modifications to unxlng.mk + +PICSWITCH:=-fPIC +.INCLUDE : unxlng.mk +CDEFS+=-DS390 +CFLAGS+=-fsigned-char -fno-omit-frame-pointer +CFLAGSCC+=-fsigned-char +CFLAGSCXX+=-fsigned-char +DLLPOSTFIX=l3 diff --git a/solenv/inc/unxlngs3904.mk b/solenv/inc/unxlngs3904.mk deleted file mode 100644 index d23b23c4a546..000000000000 --- a/solenv/inc/unxlngs3904.mk +++ /dev/null @@ -1,221 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxlngs3904.mk,v $ -# -# $Revision: 1.22 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# mk file for linux s390 -ASM= -AFLAGS= - -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DS390 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc -.IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include -CXX+:=$(CFLAGS_SYSBASE) -CC+:=$(CFLAGS_SYSBASE) -.ENDIF # "$(SYSBASE)"!="" -CFLAGS+=-Wreturn-type -fmessage-length=0 -c -# flags to enable build with symbols; required for crashdump feature -.IF "$(ENABLE_SYMBOLS)"=="SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta - -.ENDIF - -CFLAGS+=-fsigned-char -fno-omit-frame-pointer -# flags for the C++ Compiler -CFLAGSCC= -fsigned-char -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -CFLAGSCXX= -fsigned-char -pipe $(ARCH_FLAGS) -CFLAGSCXX+= -Wno-ctor-dtor-privacy -CFLAGSCXX+= -fno-use-cxa-atexit -PICSWITCH:=-fPIC -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGSCXX += -fvisibility-inlines-hidden -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products -CFLAGSOPT+=-Wuninitialized # not supported without optimization -.ELSE # "$(PRODUCT)"!="" -CFLAGSOPT= # no optimizing for non products -.ENDIF # "$(PRODUCT)"!="" -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o -# Enable all warnings -CFLAGSWALL=-Wall -# Set default warn level -CFLAGSDFLTWARN= - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) - -# default linker flags -LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -# linker flags for optimization (symbol hashtable) -# for now, applied to symbol scoped libraries, only -LINKFLAGSOPTIMIZE*=-Wl,-O1 -LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT=-lX11 -ldl -lpthread -lm -STDLIBCUIMT=-ldl -lpthread -lm -# libraries for linking shared libraries -STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm -STDSHLCUIMT=-ldl -lpthread -lm - -LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -.IF "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug -LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) -.ELSE # "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF -.ENDIF # "$(USE_STLP_DEBUG)" != "" - -#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs -DLLPOSTFIX=l3 -DLLPRE=lib -DLLPOST=.so diff --git a/solenv/inc/unxlngs390x.mk b/solenv/inc/unxlngs390x.mk index 00556d2aa68e..6a0dfab905c7 100644 --- a/solenv/inc/unxlngs390x.mk +++ b/solenv/inc/unxlngs390x.mk @@ -28,8 +28,10 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -# mk file for linux s390x, inherit from s390 and add some flags -.INCLUDE : unxlngs3904.mk +# mk file for Unix Linux 64bit s390x using GCC, inherit from s390 and add some flags + +.INCLUDE : unxlngs390.mk CDEFS+=-DS390X +BUILD64=1 diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk new file mode 100644 index 000000000000..5bb9f5b198b2 --- /dev/null +++ b/solenv/inc/unxlngx.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: unxlngx6.mk,v $ +# +# $Revision: 1.19.12.1 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# mk file for Linux Unix X86-64 using GCC, please make generic modifications to unxlng.mk + +.INCLUDE : unxlng.mk +CDEFS+=-DX86_64 +CFLAGSCXX+=-fno-use-cxa-atexit +MODULES_WITH_WARNINGS+=\ + svx +DLLPOSTFIX=lx +BUILD64=1 diff --git a/solenv/inc/unxlngx6.mk b/solenv/inc/unxlngx6.mk deleted file mode 100644 index c49e1c4526c5..000000000000 --- a/solenv/inc/unxlngx6.mk +++ /dev/null @@ -1,254 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxlngx6.mk,v $ -# -# $Revision: 1.19.12.1 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# mk file for unxlngx6 -ASM= -AFLAGS= - -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc -.IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include -CXX+:=$(CFLAGS_SYSBASE) -CC+:=$(CFLAGS_SYSBASE) -.ENDIF # "$(SYSBASE)"!="" -CFLAGS+=-Wreturn-type -fmessage-length=0 -c -# flags to enable build with symbols; required for crashdump feature -.IF "$(ENABLE_SYMBOLS)"=="SMALL" -CFLAGSENABLESYMBOLS=-g1 -.ELSE -CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta -.ENDIF - -# flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -# Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -# -fpermissive should be removed as soon as possible -CFLAGSCXX= -pipe $(ARCH_FLAGS) -CFLAGSCXX+= -Wno-ctor-dtor-privacy -CFLAGSCXX+= -fno-use-cxa-atexit -PICSWITCH:=-fpic -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGSCXX += -fvisibility-inlines-hidden -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products -CFLAGSOPT+=-Wuninitialized # not supported without optimization -.ELSE # "$(PRODUCT)"!="" -CFLAGSOPT= # no optimizing for non products -.ENDIF # "$(PRODUCT)"!="" -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWARNCC=-Wall -Wextra -Wendif-labels -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor -CFLAGSWALLCC=$(CFLAGSWARNCC) -CFLAGSWALLCXX=$(CFLAGSWARNCXX) -CFLAGSWERRCC=-Werror - -# Once all modules on this platform compile without warnings, set -# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see -# settings.mk): - -MODULES_WITH_WARNINGS := \ - soldep \ - svx - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) - -# default linker flags -LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) -.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" -LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -.ENDIF - -.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" -LINKFLAGS += -Wl,--hash-style=both -.ELSE -LINKFLAGS += -Wl,-zdynsort -.ENDIF - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ - -Wl,-rpath-link,$(LB):$(SOLARLIBDIR) -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ - -Wl,-rpath-link,$(LB):$(SOLARLIBDIR) - -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -# linker flags for optimization (symbol hashtable) -# for now, applied to symbol scoped libraries, only -LINKFLAGSOPTIMIZE*=-Wl,-O1 -LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed -STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed -# libraries for linking shared libraries -STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed -STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed - -X11LINK_DYNAMIC = -lX11 - -LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -.IF "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlportstlg -LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug -LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) -.ENDIF -.ELSE # "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF -.ENDIF # "$(USE_STLP_DEBUG)" != "" - -#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -# platform specific identifier for shared libs -DLLPOSTFIX=lx -DLLPRE=lib -DLLPOST=.so -PCHPOST=.gch - diff --git a/solenv/inc/unxlnxi.mk b/solenv/inc/unxlnxi.mk deleted file mode 100644 index 07b136fde663..000000000000 --- a/solenv/inc/unxlnxi.mk +++ /dev/null @@ -1,177 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: unxlnxi.mk,v $ -# -# $Revision: 1.13 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -# mak file fuer unxlnxi -ASM= -AFLAGS= - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -CDEFS+=-DNO_INET_ON_DEMAND -DX86 -DNEW_SOLAR - -# kann c++ was c braucht?? - -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF -.ENDIF - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*=-mpentium - -CXX*=g++ -CC*=gcc -.IF "$(GLIBC)"=="2" -CFLAGS=-c -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -.ELSE -CFLAGS=-c -I. -I/usr/solar/inc/pthread_provenzano -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -.ENDIF -CFLAGSCC=-pipe -fguiding-decls $(ARCH_FLAGS) -CFLAGSCXX=-pipe -fguiding-decls $(ARCH_FLAGS) -PICSWITCH:=-fpic -#STDOBJVCL=$(L)/salmain.o -CFLAGSOBJGUIMT= -CFLAGSOBJCUIMT= -CFLAGSSLOGUIMT=$(PICSWITCH) -CFLAGSSLOCUIMT=$(PICSWITCH) -CFLAGSPROF= -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -CFLAGSOPT=-O2 -CFLAGSNOOPT=-O2 -CFLAGSOUTOBJ=-o - -CFLAGSWARNCC= -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWALLCC=-Wall -Wextra -Wendif-labels -CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy -CFLAGSWERRCC=-Werror - -STATIC = -Bstatic -DYNAMIC = -Bdynamic - -LINK=ld -.IF "$(GLIBC)"=="2" -LINKFLAGS=-melf_i386 -z nodefs -dynamic-linker /lib/ld-linux.so.2 /usr/lib/crti.o /usr/lib/gcc-lib/i586-pc-linux-gnu/2.8.1/crtbegin.o -.ELSE -LINKFLAGS=-melf_i386 -z nodefs -dynamic-linker /lib/ld-linux.so.1 /usr/lib/crti.o /usr/lib/crtbegin.o -lpthread_init -.ENDIF -LINKFLAGSAPPGUI=/usr/lib/crt1.o -LINKFLAGSSHLGUI=-noinhibit-exec -warn-once -Bsymbolic -G -LINKFLAGSAPPCUI=/usr/lib/crt1.o -LINKFLAGSSHLCUI=/usr/lib/crt1.o -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -SONAME_SWITCH=-Wl,-h - -# reihenfolge der libs NICHT egal! - -# standard C++ Library -# -# das statische dazulinken der libstdc++ macht jede shared library um 50k -# (ungestrippt) oder so groesser, auch wenn sie ueberhaupt nicht gebraucht -# wird. Da muessen wir uns was besseres ueberlegen. -# -# Da mit der neuen libc.so.6 (libc-2.0.5.so) sowieso eine System-Library -# ausgeliefert werden muss, linken wir auch die libstdc++.so dynamisch. - -.IF "$(GLIBC)"=="2" -STDLIBCPP=-lstdc++ -.ELSE -STDLIBCPP=-Bstatic -lstdc++ -Bdynamic -.ENDIF - -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -.IF "$(WORK_STAMP)=="MIX364" -.IF "$(GLIBC)"=="2" -STDLIBGUIMT=-Bdynamic -lgcc -lm -lc -ldl /usr/lib/gcc-lib/i586-pc-linux-gnu/2.8.1/crtend.o /usr/lib/crtn.o -STDLIBCUIMT=-Bdynamic -lgcc -lm -lc -ldl /usr/lib/gcc-lib/i586-pc-linux-gnu/2.8.1/crtend.o /usr/lib/crtn.o -STDSHLGUIMT=-Bdynamic -lX11 -lgcc -lm -lc -ldl /usr/lib/gcc-lib/i586-pc-linux-gnu/2.8.1/crtend.o /usr/lib/crtn.o -STDSHLCUIMT=-Bdynamic -lgcc -lm -lc -ldl /usr/lib/gcc-lib/i586-pc-linux-gnu/2.8.1/crtend.o /usr/lib/crtn.o -.ELSE -STDLIBGUIMT=-Bdynamic -lpthread -lgcc -lm -lc -ldl /usr/lib/crtend.o /usr/lib/crtn.o -STDLIBCUIMT=-Bdynamic -lpthread -lgcc -lm -lc -ldl /usr/lib/crtend.o /usr/lib/crtn.o -STDSHLGUIMT=-Bdynamic -lX11 -lpthread -lgcc -lm -lc -ldl /usr/lib/crtend.o /usr/lib/crtn.o -STDSHLCUIMT=-Bdynamic -lpthread -lgcc -lm -lc -ldl /usr/lib/crtend.o /usr/lib/crtn.o -.ENDIF -.ELSE -.IF "$(GLIBC)"=="2" -STDLIBGUIMT=-Bdynamic -lgcc -lm -lc -ldl /usr/lib/gcc-lib/i586-pc-linux-gnu/2.8.1/crtend.o /usr/lib/crtn.o -STDLIBCUIMT=-Bdynamic -lgcc -lm -lc -ldl /usr/lib/gcc-lib/i586-pc-linux-gnu/2.8.1/crtend.o /usr/lib/crtn.o -STDSHLGUIMT=-Bdynamic -lX11 -lm -lc -ldl /usr/lib/gcc-lib/i586-pc-linux-gnu/2.8.1/crtend.o /usr/lib/crtn.o -STDSHLCUIMT=-Bdynamic -lm -lc -ldl /usr/lib/gcc-lib/i586-pc-linux-gnu/2.8.1/crtend.o /usr/lib/crtn.o -.ELSE -STDLIBGUIMT=-Bdynamic -lpthread -lgcc -lm -lc -ldl /usr/lib/crtend.o /usr/lib/crtn.o -STDLIBCUIMT=-Bdynamic -lpthread -lgcc -lm -lc -ldl /usr/lib/crtend.o /usr/lib/crtn.o -STDSHLGUIMT=-Bdynamic -lX11 -lpthread -lgcc -lm -lc -ldl /usr/lib/crtend.o /usr/lib/crtn.o -STDSHLCUIMT=-Bdynamic -lpthread -lgcc -lm -lc -ldl /usr/lib/crtend.o /usr/lib/crtn.o -.ENDIF -.ENDIF - -LIBMGR=ar -LIBFLAGS=-r -# LIBEXT=.so - -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= - -.IF "$(WORK_STAMP)"!="LVM364" -.IF "$(WORK_STAMP)"!="MIX364" -DLLPOSTFIX=li -.ENDIF -.ENDIF -DLLPRE=lib -DLLPOST=.so - -LDUMP=cppfilt /b /n /o /p - diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk index af4b7d41c393..02459ad91d5d 100644 --- a/solenv/inc/unxsolu4.mk +++ b/solenv/inc/unxsolu4.mk @@ -240,3 +240,5 @@ LINKFLAGSAPPGUI+= LINKFLAGSSHLGUI+= LINKFLAGSAPPCUI+= LINKFLAGSSHLCUI+= + +BUILD64=1 diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index b56cfc7c2f8a..6acab30cc80d 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -43,8 +43,8 @@ .ENDIF # "$(COMEX)" == "10" .ENDIF # "$(OS)$(COM)$(CPU)" == "WNTMSCI" -.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341WNTI" -.INCLUDE : wntgcci6.mk +.IF "$(COM)$(OS)$(CPU)" == "GCCWNTI" +.INCLUDE : wntgcci.mk .ENDIF # --- changes for W32-tcsh - should move into settings.mk --- diff --git a/solenv/inc/wntgcci6.mk b/solenv/inc/wntgcci.mk index a46c9a0a3916..ef0c5ce2854d 100644 --- a/solenv/inc/wntgcci6.mk +++ b/solenv/inc/wntgcci.mk @@ -29,7 +29,7 @@ # #************************************************************************* -# mk file for wntgcci6 +# mk file for Window Intel using GCC SOLAR_JAVA*=TRUE FULL_DESK=TRUE @@ -59,8 +59,8 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions PICSWITCH:= CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS -CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch -CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch CFLAGSOBJGUIST= CFLAGSOBJCUIST= @@ -81,10 +81,7 @@ CFLAGSNOOPT=-O0 # Compiler flags for describing the output path CFLAGSOUTOBJ=-o #plattform hart setzen -CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED -.IF "$(DYNAMIC_CRT)"!="" -CDEFS+=-D_DLL -.ENDIF +CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED # -Wshadow does not work for C with nested uses of pthread_cleanup_push: CFLAGSWARNCC=-Wall -Wextra -Wendif-labels @@ -116,48 +113,32 @@ LINKC*=$(CC) CYGLIB=$(LIB:s/;/ -L/) LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc -L$(CYGLIB) .IF "$(USE_MINGW)"=="cygwin" -MINGWLIBDIR=$(COMPATH)/lib/mingw +MINGWLIBDIR=$(COMPATH)$/lib$/mingw .ELSE -MINGWLIBDIR=$(COMPATH)/lib +MINGWLIBDIR=$(COMPATH)$/lib .ENDIF -MINGWSSTDOBJ=$(MINGW_CLIB_DIR)/crtbegin.o -MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)/crtend.o -LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)/crt2.o -LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)/dllcrt2.o -LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)/crt2.o -LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)/dllcrt2.o +LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o +LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o +LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o +LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)$/dllcrt2.o LINKFLAGSTACK= LINKFLAGSPROF= LINKFLAGSDEBUG=-g LINKFLAGSOPT= -.IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" -STDLIBCPP=-lstdc++_s -.ELSE STDLIBCPP=-lstdc++ -.ENDIF UWINAPILIB*=$(DYNAMIC) -luwinapi -.IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" -MINGW_LIBGCC=-lgcc_s -lgcc -LINKFLAGS+=-shared-libgcc -.ELSE -.IF "$(MINGW_GCCLIB_EH)"=="YES" -MINGW_LIBGCC=-lgcc_eh -lgcc -.ELSE -MINGW_LIBGCC=-lgcc -.ENDIF -.ENDIF -STDOBJVCL=$(L)/salmain.obj +STDOBJVCL=$(L)$/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= STDSLOCUI= -STDLIBGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) -STDLIBCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) -STDSHLGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) -STDSHLCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) -.IF "$(DYNAMIC_CRT)"!="" +STDLIBGUIMT=-Wl,--start-group CPPRUNTIME -lgcc +STDLIBCUIMT=-Wl,--start-group CPPRUNTIME -lgcc +STDSHLGUIMT=-Wl,--start-group CPPRUNTIME -lgcc +STDSHLCUIMT=-Wl,--start-group CPPRUNTIME -lgcc +.IF "$(MINGW_NODLL)"=="" STDLIBGUIMT+=-lmingwthrd STDLIBCUIMT+=-lmingwthrd STDSHLGUIMT+=-lmingwthrd @@ -169,7 +150,7 @@ STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -l STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt LIBSTLPORT=-lstlport_gcc -LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP) +LIBSTLPORTST=-lstlport_gcc_static LIBMGR=ar LIBFLAGS=-rsu @@ -194,7 +175,7 @@ SHELL32LIB=-lshell32 GDI32LIB=-lgdi32 OLE32LIB=-lole32 OLEAUT32LIB=-loleaut32 -UUIDLIB=$(PSDK_HOME)/lib/uuid.lib +UUIDLIB=$(PSDK_HOME)$/lib$/uuid.lib WINSPOOLLIB=-lwinspool IMM32LIB=-limm32 VERSIONLIB=-lversion @@ -207,14 +188,14 @@ USER32LIB=-luser32 LIBCMT=-lmsvcrt COMDLG32LIB=-lcomdlg32 COMCTL32LIB=-lcomctl32 -CRYPT32LIB=$(PSDK_HOME)/lib/crypt32.lib -GDIPLUSLIB=$(PSDK_HOME)/lib/gdiplus.lib -DBGHELPLIB=$(PSDK_HOME)/lib/dbghelp.lib -MSILIB=$(PSDK_HOME)/lib/msi.lib +CRYPT32LIB=$(PSDK_HOME)$/lib$/crypt32.lib +GDIPLUSLIB=$(PSDK_HOME)$/lib$/gdiplus.lib +DBGHELPLIB=$(PSDK_HOME)$/lib$/dbghelp.lib +MSILIB=$(PSDK_HOME)$/lib$/msi.lib DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib -SHLWAPILIB=$(PSDK_HOME)/lib/shlwapi.lib -URLMONLIB=$(PSDK_HOME)/lib/urlmon.lib -UNICOWSLIB=$(PSDK_HOME)/lib/unicows.lib +SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib +URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib +UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib WININETLIB=-lwininet OLDNAMESLIB=-lmoldname -MSIMG32LIB=$(PSDK_HOME)/lib/msimg32.lib +MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional index 6fb7e66330f6..232cddbef5ad 100644 --- a/stlport/systemstl/functional +++ b/stlport/systemstl/functional @@ -32,30 +32,33 @@ #define SYSTEM_STL_FUNCTIONAL #ifdef GCC -#ifdef __MINGW32__ +# ifdef __MINGW32__ # define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header> # include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,functional) -#else +# else # include <ext/../functional> -#endif -#include <ext/functional> +# endif +# include <ext/functional> namespace std { - using __gnu_cxx::select1st; - using __gnu_cxx::select2nd; using __gnu_cxx::project1st; using __gnu_cxx::project2nd; - using __gnu_cxx::unary_compose; - using __gnu_cxx::binary_compose; + using __gnu_cxx::select1st; + using __gnu_cxx::select2nd; using __gnu_cxx::compose1; using __gnu_cxx::compose2; + using __gnu_cxx::unary_compose; + using __gnu_cxx::binary_compose; +# ifndef __GXX_EXPERIMENTAL_CXX0X__ using __gnu_cxx::identity; using __gnu_cxx::mem_fun1; using __gnu_cxx::mem_fun1_ref; +# endif } + #else -#error UNSUPPORTED COMPILER +# error UNSUPPORTED COMPILER #endif #endif diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map index e855427f2c67..b969b11b211b 100644 --- a/stlport/systemstl/hash_map +++ b/stlport/systemstl/hash_map @@ -31,11 +31,14 @@ #ifndef SYSTEM_STL_HASHMAP #define SYSTEM_STL_HASHMAP -#define _BACKWARD_BACKWARD_WARNING_H 1 -#include <ext/hash_map> -#undef _BACKWARD_BACKWARD_WARNING_H - #ifdef GCC + +# include <functional> + +# define _BACKWARD_BACKWARD_WARNING_H 1 +# include <ext/hash_map> +# undef _BACKWARD_BACKWARD_WARNING_H + namespace __gnu_cxx { template<> struct hash < std::string > @@ -62,14 +65,18 @@ namespace __gnu_cxx } }; } + namespace std { +# ifndef __GXX_EXPERIMENTAL_CXX0X__ using __gnu_cxx::hash; +# endif using __gnu_cxx::hash_map; using __gnu_cxx::hash_multimap; } + #else -#error UNSUPPORTED COMPILER +# error UNSUPPORTED COMPILER #endif diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set index 35ceccad40d1..89c4b51853dd 100644 --- a/stlport/systemstl/hash_set +++ b/stlport/systemstl/hash_set @@ -31,21 +31,25 @@ #ifndef SYSTEM_STL_HASHSET #define SYSTEM_STL_HASHSET -#define _BACKWARD_BACKWARD_WARNING_H 1 -#include <ext/hash_set> -#undef _BACKWARD_BACKWARD_WARNING_H - #ifdef GCC + +# include <functional> + +# define _BACKWARD_BACKWARD_WARNING_H 1 +# include <ext/hash_set> +# undef _BACKWARD_BACKWARD_WARNING_H + namespace std { +# ifndef __GXX_EXPERIMENTAL_CXX0X__ using __gnu_cxx::hash; +# endif using __gnu_cxx::hash_set; using __gnu_cxx::hash_multiset; } #else -#error UNSUPPORTED COMPILER +# error UNSUPPORTED COMPILER #endif - #endif /* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric index d18328bc5363..5ea17ad0758a 100644 --- a/stlport/systemstl/numeric +++ b/stlport/systemstl/numeric @@ -32,22 +32,24 @@ #define SYSTEM_STL_NUMERIC #ifdef GCC -#include <functional> -#ifdef __MINGW32__ +# include <functional> +# ifdef __MINGW32__ # define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header> # include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,numeric) -#else +# else # include <ext/../numeric> -#endif -#include <ext/numeric> +# endif +# include <ext/numeric> +# ifndef __GXX_EXPERIMENTAL_CXX0X__ namespace std { using __gnu_cxx::iota; } +# endif #else -#error UNSUPPORTED COMPILER +# error UNSUPPORTED COMPILER #endif #endif diff --git a/stlport/systemstl/rope b/stlport/systemstl/rope index 6441d9549988..c6349947ca7b 100644 --- a/stlport/systemstl/rope +++ b/stlport/systemstl/rope @@ -33,9 +33,11 @@ #include <functional> #include <numeric> -#include <ext/rope> #ifdef GCC + +#include <ext/rope> + namespace std { using __gnu_cxx::rope; diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist index 27a46f9b23c1..48a37c2fd512 100644 --- a/stlport/systemstl/slist +++ b/stlport/systemstl/slist @@ -31,9 +31,10 @@ #ifndef SYSTEM_STL_SLIST #define SYSTEM_STL_SLIST +#ifdef GCC + #include <ext/slist> -#ifdef GCC namespace std { using __gnu_cxx::slist; |