apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1470189 - in /apr/apr/branches/1.5.x: ./ CHANGES atomic/unix/ppc.c
Date Sat, 20 Apr 2013 16:46:30 GMT
Author: sf
Date: Sat Apr 20 16:46:30 2013
New Revision: 1470189

URL: http://svn.apache.org/r1470189
Log:
Merge r1470186:

Fix PPC atomics to work with gcc 4.0

PR: 54840
Submitted by: Mattias EngdegÄrd <mattiase acm org>

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/CHANGES
    apr/apr/branches/1.5.x/atomic/unix/ppc.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1470186

Modified: apr/apr/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?rev=1470189&r1=1470188&r2=1470189&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.5.x/CHANGES [utf-8] Sat Apr 20 16:46:30 2013
@@ -1,10 +1,16 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.5.0
 
+  *) Fix PPC atomics to work with gcc 4.0. PR 54840. [Mattias EngdegÄrd
+     <mattiase acm org>]
+
   *) Add apr_hash_this_key(), apr_hash_this_key_len(), and 
      apr_hash_this_val() for easier access to those attributes from
      a hash iterator.  [Hyrum K. Wright <hyrum_wright mail.utexas.edu>]
 
+  *) Mark apr_dbd_freetds as unsupported, and remove it from all builds
+     [Nick Kew]
+
   *) MinGW/MSYS:  Support shared builds of APR, other general improvements
      to support of this toolchain.  PR 46175.  [Carlo Bramini 
      <carlo.bramix libero.it>]  

Modified: apr/apr/branches/1.5.x/atomic/unix/ppc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/atomic/unix/ppc.c?rev=1470189&r1=1470188&r2=1470189&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/atomic/unix/ppc.c (original)
+++ apr/apr/branches/1.5.x/atomic/unix/ppc.c Sat Apr 20 16:46:30 2013
@@ -43,12 +43,12 @@ APR_DECLARE(apr_uint32_t) apr_atomic_add
 {
     apr_uint32_t prev, temp;
 
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%3\n"      /* load and reserve     */
                   "    add     %1,%0,%4\n"     /* add val and prev     */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %1,0,%3\n"      /* store new value      */
-                  "    bne-    loop_%=\n"      /* loop if lost         */
+                  "    bne-    1b\n"           /* loop if lost         */
                   : "=&r" (prev), "=&r" (temp), "=m" (*mem)
                   : "b" (mem), "r" (val)
                   : "cc", "memory");
@@ -60,12 +60,12 @@ APR_DECLARE(void) apr_atomic_sub32(volat
 {
     apr_uint32_t temp;
 
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%2\n"      /* load and reserve     */
                   "    subf    %0,%3,%0\n"     /* subtract val         */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %0,0,%2\n"      /* store new value      */
-                  "    bne-    loop_%=\n"      /* loop if lost         */
+                  "    bne-    1b\n"           /* loop if lost         */
                   : "=&r" (temp), "=m" (*mem)
                   : "b" (mem), "r" (val)
                   : "cc", "memory");
@@ -75,12 +75,12 @@ APR_DECLARE(apr_uint32_t) apr_atomic_inc
 {
     apr_uint32_t prev;
 
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%2\n"      /* load and reserve     */
                   "    addi    %0,%0,1\n"      /* add immediate        */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %0,0,%2\n"      /* store new value      */
-                  "    bne-    loop_%=\n"      /* loop if lost         */
+                  "    bne-    1b\n"           /* loop if lost         */
                   "    subi    %0,%0,1\n"      /* return old value     */
                   : "=&b" (prev), "=m" (*mem)
                   : "b" (mem), "m" (*mem)
@@ -93,12 +93,12 @@ APR_DECLARE(int) apr_atomic_dec32(volati
 {
     apr_uint32_t prev;
 
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%2\n"      /* load and reserve     */
                   "    subi    %0,%0,1\n"      /* subtract immediate   */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %0,0,%2\n"      /* store new value      */
-                  "    bne-    loop_%=\n"      /* loop if lost         */
+                  "    bne-    1b\n"           /* loop if lost         */
                   : "=&b" (prev), "=m" (*mem)
                   : "b" (mem), "m" (*mem)
                   : "cc", "memory");
@@ -111,13 +111,13 @@ APR_DECLARE(apr_uint32_t) apr_atomic_cas
 {
     apr_uint32_t prev;
 
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%1\n"      /* load and reserve     */
                   "    cmpw    %0,%3\n"        /* compare operands     */
                   "    bne-    exit_%=\n"      /* skip if not equal    */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %2,0,%1\n"      /* store new value      */
-                  "    bne-    loop_%=\n"      /* loop if lost         */
+                  "    bne-    1b\n"           /* loop if lost         */
                   "exit_%=:\n"                 /* not equal            */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with), "r" (cmp)
@@ -130,11 +130,11 @@ APR_DECLARE(apr_uint32_t) apr_atomic_xch
 {
     apr_uint32_t prev;
 
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%1\n"      /* load and reserve     */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %2,0,%1\n"      /* store new value      */
-                  "    bne-    loop_%="        /* loop if lost         */
+                  "    bne-    1b"             /* loop if lost         */
                   : "=&r" (prev)
                   : "b" (mem), "r" (val)
                   : "cc", "memory");
@@ -146,26 +146,26 @@ APR_DECLARE(void*) apr_atomic_casptr(vol
 {
     void *prev;
 #if APR_SIZEOF_VOIDP == 4
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%1\n"      /* load and reserve     */
                   "    cmpw    %0,%3\n"        /* compare operands     */
-                  "    bne-    exit_%=\n"      /* skip if not equal    */
+                  "    bne-    2f\n"           /* skip if not equal    */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %2,0,%1\n"      /* store new value      */
-                  "    bne-    loop_%=\n"      /* loop if lost         */
-                  "exit_%=:\n"                 /* not equal            */
+                  "    bne-    1b\n"           /* loop if lost         */
+                  "2:\n"                       /* not equal            */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with), "r" (cmp)
                   : "cc", "memory");
 #elif APR_SIZEOF_VOIDP == 8
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    ldarx   %0,0,%1\n"      /* load and reserve     */
                   "    cmpd    %0,%3\n"        /* compare operands     */
-                  "    bne-    exit_%=\n"      /* skip if not equal    */
+                  "    bne-    2f\n"           /* skip if not equal    */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stdcx.  %2,0,%1\n"      /* store new value      */
-                  "    bne-    loop_%=\n"      /* loop if lost         */
-                  "exit_%=:\n"                 /* not equal            */
+                  "    bne-    1b\n"           /* loop if lost         */
+                  "2:\n"                       /* not equal            */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with), "r" (cmp)
                   : "cc", "memory");
@@ -179,21 +179,21 @@ APR_DECLARE(void*) apr_atomic_xchgptr(vo
 {
     void *prev;
 #if APR_SIZEOF_VOIDP == 4
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    lwarx   %0,0,%1\n"      /* load and reserve     */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stwcx.  %2,0,%1\n"      /* store new value      */
-                  "    bne-    loop_%=\n"      /* loop if lost         */
+                  "    bne-    1b\n"           /* loop if lost         */
                   "    isync\n"                /* memory barrier       */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with)
                   : "cc", "memory");
 #elif APR_SIZEOF_VOIDP == 8
-    asm volatile ("loop_%=:\n"                 /* lost reservation     */
+    asm volatile ("1:\n"                       /* lost reservation     */
                   "    ldarx   %0,0,%1\n"      /* load and reserve     */
                   PPC405_ERR77_SYNC            /* ppc405 Erratum 77    */
                   "    stdcx.  %2,0,%1\n"      /* store new value      */
-                  "    bne-    loop_%=\n"      /* loop if lost         */
+                  "    bne-    1b\n"           /* loop if lost         */
                   "    isync\n"                /* memory barrier       */
                   : "=&r" (prev)
                   : "b" (mem), "r" (with)



Mime
View raw message