[ooo-build-commit] patches/dev300

[Bernhard Rosenkraenzer]

 patches/dev300/testing-more-optimizations-ark.diff |   31 +++------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

New commits:
commit 1166bc679aa8de238b0fed9f910a6fcb77a26871
Author: Bernhard Rosenkraenzer <bero at arklinux.ch>
Date:   Sat Jan 9 22:55:31 2010 +0000

    Adapt to current OOo tree
    
    * patches/dev300/testing-more-optimizations-ark.diff:
      Make it apply on ooo320-m7 and higher

diff --git a/patches/dev300/testing-more-optimizations-ark.diff b/patches/dev300/testing-more-optimizations-ark.diff
index 53ff5c5..4f72e2d 100644
--- a/patches/dev300/testing-more-optimizations-ark.diff
+++ b/patches/dev300/testing-more-optimizations-ark.diff
@@ -1,16 +1,15 @@
 --- ./icu/makefile.mk.arkopts~	2008-04-11 09:26:27.000000000 +0200
 +++ ./icu/makefile.mk	2008-07-17 11:52:18.870043577 +0200
-@@ -82,8 +82,8 @@ CC:=gcc $(EXTRA_CFLAGS)
+@@ -82,7 +82,7 @@ CC:=gcc $(EXTRA_CFLAGS)
  icu_LDFLAGS+=-Wl,-z,noexecstack
  .ENDIF
  
 -icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
--icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
 +icu_CFLAGS+=$(CFLAGSOPT) $(ARCH_FLAGS) $(EXTRA_CDEFS)
+ icu_LDFLAGS+=$(EXTRA_LINKFLAGS)
+-icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
 +icu_CXXFLAGS+=$(CFLAGSOPT) $(ARCH_FLAGS) $(EXTRA_CDEFS)
  
- # until someone introduces SOLARIS 64-bit builds
- .IF "$(OS)"=="SOLARIS"
 --- ./registry/inc/registry/registry.h.arkopts~	2008-07-17 11:49:18.777288611 +0200
 +++ ./registry/inc/registry/registry.h	2008-07-17 11:54:21.532038669 +0200
 @@ -50,7 +50,7 @@ extern "C" {
@@ -238,15 +237,6 @@
  					   					rtl_uString* keyName, 
  					   					rtl_uString* regFileName,
  					   					sal_Bool bWarnings,
-@@ -409,7 +409,7 @@ RegError REGISTRY_CALLTYPE reg_mergeKey(
- 	@param 	phRegistry points to a handle of the new registry if the function succeeds otherwise NULL.
- 	@return	REG_NO_ERROR if succeeds else an error code. 
- */
--RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, 
-+RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_createRegistry(rtl_uString* registryName, 
- 							 				  RegHandle* phRegistry, bool bInternal = false);
- 
- 
 @@ -419,7 +419,7 @@ RegError REGISTRY_CALLTYPE reg_createReg
  	@param 	phRootKey points to a handle of the open root key if the function succeeds otherwise NULL.
  	@return	REG_NO_ERROR if succeeds else an error code. 
@@ -991,18 +981,7 @@ Index: unxlng.mk
 ===================================================================
 --- solenv/inc/unxlng.mk	(Revision 276754)
 +++ solenv/inc/unxlng.mk	(Arbeitskopie)
-@@ -77,21 +77,21 @@
- 
- # flags to enable build with symbols; required for crashdump feature
- .IF "$(ENABLE_SYMBOLS)"=="SMALL"
--CFLAGSENABLESYMBOLS=-g1
-+CFLAGSENABLESYMBOLS=
- .ELSE
--CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-+CFLAGSENABLESYMBOLS= # was temporarily commented out, reenabled before Beta
- 
- .ENDIF
- 
+@@ -86,12 +86,12 @@
  # flags for the C++ Compiler
 -CFLAGSCC= -pipe $(ARCH_FLAGS)
 +CFLAGSCC= -O2 -Os -fno-omit-frame-pointer -fweb -frename-registers -pipe $(ARCH_FLAGS)
@@ -1014,7 +993,7 @@ Index: unxlng.mk
  # -fpermissive should be removed as soon as possible
 -CFLAGSCXX= -pipe $(ARCH_FLAGS)
 +CFLAGSCXX= -O2 -Os -fno-omit-frame-pointer -fweb -frename-registers -pipe $(ARCH_FLAGS)
- .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE"
  CFLAGSCXX += -fvisibility-inlines-hidden
  .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 @@ -111,13 +111,13 @@