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

[Chris Cheney]

 patches/dev300/apply                 |    3 +++
 patches/dev300/arm-vis.diff          |   13 +++++++++++++
 patches/dev300/ubuntu-arm-thumb.diff |   24 ++++++++++++++++++++++++
 3 files changed, 40 insertions(+)

New commits:
commit 454ea0d62d4321b54cd5ef870ac99d8d7929c459
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Tue Jan 19 15:35:04 2010 -0600

    Ubuntu fixes for building on ARM
    
    * patches/dev300/apply:
    * patches/dev300/arm-vis.diff: Fix configure check to test for a visibility
      bug in GCC on ARM.
    * patches/dev300/ubuntu-arm-thumb.diff: Build with -O2 instead of -Os on ARM
      to work around GCC register spill errors.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e3607ab..933a87e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3163,10 +3163,13 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 [ UbuntuKarmicOnly ]
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
 ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+arm-vis.diff, cmc
 
 [ UbuntuLucidOnly ]
 # Add patch to force use of gvfs fuse path needed when gnome-vfs/gio is disabled
 ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
+arm-vis.diff, cmc
+ubuntu-arm-thumb.diff
 
 [ Fixes ]
 # Fix for crash on Windows by Rail Aliev. Root cause unknown.
diff --git a/patches/dev300/arm-vis.diff b/patches/dev300/arm-vis.diff
new file mode 100644
index 0000000..15a834d
--- /dev/null
+++ b/patches/dev300/arm-vis.diff
@@ -0,0 +1,13 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 276718)
++++ configure.in	(working copy)
+@@ -2710,7 +2710,7 @@
+       if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
+          gccvisbroken=yes
+       else
+-         if $EGREP -q '@PLT|\$stub' visibility.s; then
++         if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then
+              gccvisbroken=no;
+          else 
+              gccvisbroken=yes; 
diff --git a/patches/dev300/ubuntu-arm-thumb.diff b/patches/dev300/ubuntu-arm-thumb.diff
new file mode 100644
index 0000000..77367dd
--- /dev/null
+++ b/patches/dev300/ubuntu-arm-thumb.diff
@@ -0,0 +1,24 @@
+--- 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
+@@ -39,6 +39,10 @@
+ .INCLUDE :  settings.mk
+ .INCLUDE :      $(PRJ)$/util$/makefile.pmk
+ 
++.IF "$(CPUNAME)"=="ARM"
++CFLAGSOPT += -O2
++.ENDIF
++
+ # --- 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