[Pkg-apache-commits] r1266 - in /trunk/apr: changelog patches/00list patches/028_aliasing_gcc_4.5.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Sat Feb  5 16:56:28 2011
New Revision: 1266

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1266
Log:
add workaround for aliasing problem

Added:
    trunk/apr/patches/028_aliasing_gcc_4.5.dpatch   (with props)
Modified:
    trunk/apr/changelog
    trunk/apr/patches/00list

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=1266&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Sat Feb  5 16:56:28 2011
@@ -1,3 +1,11 @@
+apr (1.4.2-7) UNRELEASED; urgency=low
+
+  * Add a workaround for a problem related to strict aliasing that causes
+    gcc 4.5 to create incorrect code in some cases. Closes: #609163
+    LP: #697105
+
+ -- Stefan Fritsch <sf at debian.org>  Sat, 05 Feb 2011 17:54:35 +0100
+
 apr (1.4.2-6) unstable; urgency=low
 
   * Also disable robust pthread mutexes on alpha, to fix hang in the test

Modified: trunk/apr/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/00list?rev=1266&op=diff
==============================================================================
--- trunk/apr/patches/00list (original)
+++ trunk/apr/patches/00list Sat Feb  5 16:56:28 2011
@@ -8,3 +8,4 @@
 025_GNU_SOURCE_earlier.dpatch
 026_omit_extra_libs.dpatch
 027_apr_socket_addr_get_lifetime.dpatch
+028_aliasing_gcc_4.5.dpatch

Added: trunk/apr/patches/028_aliasing_gcc_4.5.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/028_aliasing_gcc_4.5.dpatch?rev=1266&op=file
==============================================================================
--- trunk/apr/patches/028_aliasing_gcc_4.5.dpatch (added)
+++ trunk/apr/patches/028_aliasing_gcc_4.5.dpatch Sat Feb  5 16:56:28 2011
@@ -1,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 028_aliasing_gcc_4.5.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Workaround for aliasing problem that causes gcc 4.5 to miscompile
+## DP: some brigade related code
+## DP: https://issues.apache.org/bugzilla/show_bug.cgi?id=50190
+## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=609163
+## DP: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/697105
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/include/apr_ring.h trunk/include/apr_ring.h
+--- trunk~/include/apr_ring.h	2008-06-02 02:12:00.000000000 +0200
++++ trunk/include/apr_ring.h	2011-02-05 17:51:46.604001378 +0100
+@@ -90,8 +90,8 @@
+  */
+ #define APR_RING_HEAD(head, elem)					\
+     struct head {							\
+-	struct elem *next;						\
+-	struct elem *prev;						\
++	struct elem * volatile next;					\
++	struct elem * volatile prev;					\
+     }
+ 
+ /**

Propchange: trunk/apr/patches/028_aliasing_gcc_4.5.dpatch
------------------------------------------------------------------------------
    svn:executable = *