[Libreoffice-commits] .: 3 commits - sal/inc sal/osl solenv/inc

[Tor Lillqvist]

 sal/inc/sal/mathconf.h |    3 ++-
 sal/osl/unx/file.cxx   |    4 ++--
 solenv/inc/unxgcc.mk   |    2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 1fd10dd070868a28af3de3bf7ad4e74918f8ce69
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 30 16:11:44 2012 +0300

    Avoid -z dynsort, https://issues.apache.org/ooo/show_bug.cgi?id=116423
    
    gold doesn't have -z dynsort, so instead of introducing gold ifdefs,
    just don't bother with -z dynsort. See the bug for discussion.
    
    Change-Id: Icfb8395523127d79c30b688420c469ae50ed2dad

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 2da3ef0..0e98de7 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -252,8 +252,6 @@ STDSHLCUIMT+=-ljemalloc
 
 .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
-.ELSE
-LINKFLAGS += -Wl,-zdynsort
 .ENDIF
 
 # libraries for linking applications
commit 9211f4ac413f7663e32fb5f5cdd15cf46cbc2d2c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 30 15:47:15 2012 +0300

    WaE: comparison is always false due to limited range of data type
    
    Change-Id: I7147d6ab8433976cc0c76620db2a519f306a3fa9

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 3a5dac5..536e1bf 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1552,7 +1552,7 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse
             nPos = sal::static_int_cast< off_t >(pImpl->getPos());
             if ((0 > nOffset) && (-1*nOffset > nPos))
                 return osl_File_E_INVAL;
-            if (g_limit_off_t < nPos + nOffset)
+            if (g_limit_off_t < (sal_Int64) nPos + nOffset)
                 return osl_File_E_OVERFLOW;
             break;
 
@@ -1560,7 +1560,7 @@ SAL_CALL osl_setFilePos (oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uOffse
             nPos = sal::static_int_cast< off_t >(pImpl->getSize());
             if ((0 > nOffset) && (-1*nOffset > nPos))
                 return osl_File_E_INVAL;
-            if (g_limit_off_t < nPos + nOffset)
+            if (g_limit_off_t < (sal_Int64) nPos + nOffset)
                 return osl_File_E_OVERFLOW;
             break;
 
commit 6247f4889a8b8769c48f05691dcd8db514d0c444
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 30 15:41:55 2012 +0300

    Work around isfinite crack with NDK r8b and the 4.6 toolchain
    
    Change-Id: I66e499d942b34d27e765d00f1ddfb3bbd1f78480

diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index 9a046c5..c03adc4 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -63,7 +63,8 @@ extern "C" {
 
 
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#if !defined SOLARIS && defined(__cplusplus) \
+#if !defined SOLARIS && !defined ANDROID \
+                     && defined(__cplusplus) \
                      && ( defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L )
 #define SAL_MATH_FINITE(d) std::isfinite(d)
 #elif defined( WNT)