[Libreoffice-commits] .: 6 commits - sal/osl

[Petr Mladek]

 sal/osl/unx/interlck.c |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 6505f364c82958ddbf3f8e48b9082cc763942f9a
Merge: 19d2e79... 23f7b49...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 6 19:25:26 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-4'

commit 23f7b49c802fcef717e83c00bc367eb2d735dcda
Merge: 77d24c6... 1818bf1...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 5 20:19:03 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
    
    Conflicts:
    	pyuno/demo/pyunoenv.tcsh
    	sal/osl/unx/interlck.c

diff --cc sal/osl/unx/interlck.c
index 826592a,184cb5f..e5bb3ea
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@@ -158,8 -119,31 +158,17 @@@ oslInterlockedCount SAL_CALL osl_increm
  
  oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
  {
 -    /* "subi" doesn't work with r0 as second parameter */
 -    register oslInterlockedCount nCount __asm__ ("r4");
 -
 -    __asm__ __volatile__ (
 -        "1: lwarx   %0,0,%2\n\t"
 -        "   subi    %0,%0,1\n\t"
 -        "   stwcx.  %0,0,%2\n\t"
 -        "   bne-    1b\n\t"
 -        "   isync"
 -        : "=&r" (nCount), "=m" (*pCount)
 -        : "r" (pCount)
 -        : "memory");
 -
 -    return nCount;
 +    return __sync_sub_and_fetch(pCount, 1);
  }
+ #elif ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
+ oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
+ {
+     return __sync_add_and_fetch(pCount, 1);
+ }
 -
+ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
+ {
+     return __sync_sub_and_fetch(pCount, 1);
+ }
  #else
  /* use only if nothing else works, expensive due to single mutex for all reference counts */
  
commit 1818bf1dbc330974c749ca17b4d7b79796587fae
Author: Jani Monoses <jani.monoses at canonical.com>
Date:   Mon Mar 14 19:10:04 2011 +0100

    prefer gcc __sync functions over pthread
    
    Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c
index f164371..184cb5f 100644
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@ -134,7 +134,16 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
 
     return nCount;
 }
+#elif ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
+oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
+{
+    return __sync_add_and_fetch(pCount, 1);
+}
 
+oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
+{
+    return __sync_sub_and_fetch(pCount, 1);
+}
 #else
 /* use only if nothing else works, expensive due to single mutex for all reference counts */
 
commit 77d24c6a195fc82b1ffb8bfd6afd47a27eccf021
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 1 15:13:18 2011 +0200

    Branch libreoffice-3-4
    
    This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases
    
        + only bug fixes are allowed
        + no approval needed during beta phase (two weeks after branch)
        + 1 approval needed during rc phase and for bugfix releases
        + 2 approvals with different/no affiliation needed for late features
        + regularly merged into master by a selected person when living
    
    Please watch http://wiki.documentfoundation.org/ReleasePlan
    and read announces on libreoffice at lists.freedesktop.org
    
    If you want to build something cool, unstable, and risky, use master.
commit aa69dfc89ad7def36625c4cb65088ea30c50405c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 8 15:31:14 2011 +0100

    Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)
commit 7744c3ad6f33c2cb80ae8a1005dce1d5ea2f65c0
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Feb 11 22:47:35 2011 +0100

    fix pyuno/demo/pyunoenv.tcsh for PYTHONPATH usage

diff --git a/pyuno/demo/pyunoenv.tcsh b/pyuno/demo/pyunoenv.tcsh
index 1a83199..d17aa37 100644
--- a/pyuno/demo/pyunoenv.tcsh
+++ b/pyuno/demo/pyunoenv.tcsh
@@ -17,7 +17,12 @@ if( ! $?LD_LIBRARY_PATH ) then
 setenv LD_LIBRARY_PATH
 endif
 
-setenv PYTHONPATH .:$OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH
+if ( $?PYTHOHOME )
+	setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH
+else
+	setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib
+endif
+	
 setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH
 
 if( $?PYTHONHOME ) then