[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300

[Chris Cheney]

 patches/dev300/ubuntu-arm-thumb.diff |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 5b2dfbb614b425b4b07847e9391139e0086563b2
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Wed Jan 20 15:13:53 2010 -0600

    Update ubuntu-arm-thumb for OOo 3.2
    
    * patches/dev300/ubuntu-arm-thumb.diff: Update ubuntu-arm-thumb for OOo 3.2

diff --git a/patches/dev300/ubuntu-arm-thumb.diff b/patches/dev300/ubuntu-arm-thumb.diff
index 77367dd..6139220 100644
--- a/patches/dev300/ubuntu-arm-thumb.diff
+++ b/patches/dev300/ubuntu-arm-thumb.diff
@@ -1,5 +1,16 @@
---- tools/source/datetime/makefile.mk.orig	2008-04-11 13:39:17.000000000 +0000
-+++ tools/source/datetime/makefile.mk	2010-01-12 12:11:44.000000000 +0000
+--- solenv/inc/unxlngr.mk.orig	2010-01-15 21:15:20.000000000 -0600
++++ solenv/inc/unxlngr.mk	2010-01-20 14:02:29.000000000 -0600
+@@ -31,7 +31,7 @@
+ 
+ # mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
+ 
+-CDEFAULTOPT=-Os
++CDEFAULTOPT=-O2
+ .INCLUDE : unxlng.mk
+ CDEFS+=-DARM32
+ CFLAGS+=-fno-omit-frame-pointer
+--- tools/source/datetime/makefile.mk.orig	2010-01-15 21:15:20.000000000 -0600
++++ tools/source/datetime/makefile.mk	2010-01-20 13:56:49.000000000 -0600
 @@ -39,6 +39,10 @@
  .INCLUDE :  settings.mk
  .INCLUDE :      $(PRJ)$/util$/makefile.pmk
@@ -11,14 +22,3 @@
  # --- Files --------------------------------------------------------
  
  SLOFILES=   $(SLO)$/tdate.obj     \
---- solenv/inc/unxlngr.mk.orig	2010-01-12 08:15:59.000000000 +0000
-+++ solenv/inc/unxlngr.mk	2010-01-12 13:29:27.000000000 +0000
-@@ -113,7 +113,7 @@
- CFLAGSDBGUTIL=
- # Compiler flags for enabling optimizations
- .IF "$(PRODUCT)"!=""
--CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
-+CFLAGSOPT=-O2 -fno-strict-aliasing             # optimizing for products
- CFLAGSOPT+=-Wuninitialized                             # not supported without optimization
- .ELSE  # "$(PRODUCT)"!=""
- CFLAGSOPT=                                                     # no optimizing for non products