[libapache2-mod-perl2] 02/04: Work around gcc-4.9 breakage by disabling the tree-dse optimization for modperl_env_table_populate(). (See #754901)

[Niko Tyni]

This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch ntyni/perl520
in repository libapache2-mod-perl2.

commit 7b6df4d489597a813142d95b0b80959012b2d84b
Author: Niko Tyni <ntyni at debian.org>
Date:   Wed Aug 6 15:59:35 2014 +0300

    Work around gcc-4.9 breakage by disabling the tree-dse optimization for modperl_env_table_populate(). (See #754901)
---
 debian/changelog                                   |  3 ++-
 ...-tree-dse-gcc-optimization-for-modperl_en.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3964f32..b70d57b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-9) UNRELEASED; urgency=medium
 
-  * 
+  * Work around gcc-4.9 breakage by disabling the tree-dse
+    optimization for modperl_env_table_populate(). (See #754901)
 
  -- Niko Tyni <ntyni at debian.org>  Wed, 06 Aug 2014 15:56:11 +0300
 
diff --git a/debian/patches/390-Disable-the-tree-dse-gcc-optimization-for-modperl_en.patch b/debian/patches/390-Disable-the-tree-dse-gcc-optimization-for-modperl_en.patch
new file mode 100644
index 0000000..6e190fd
--- /dev/null
+++ b/debian/patches/390-Disable-the-tree-dse-gcc-optimization-for-modperl_en.patch
@@ -0,0 +1,29 @@
+From 1bb1fd8ac4ebf8b7efd6af75e28e1bdd91f25502 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Mon, 4 Aug 2014 17:21:17 +0300
+Subject: [PATCH] Disable the tree-dse gcc optimization for
+ modperl_env_table_populate()
+
+This is a workaround for breakage with gcc 4.9.
+
+Bug-Debian: https://bugs.debian.org/754901
+---
+ src/modules/perl/modperl_env.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/modules/perl/modperl_env.c b/src/modules/perl/modperl_env.c
+index e700501..78d3e44 100644
+--- a/src/modules/perl/modperl_env.c
++++ b/src/modules/perl/modperl_env.c
+@@ -112,6 +112,8 @@ void modperl_env_clear(pTHX)
+ #define MP_ENV_HV_STORE_TABLE_ENTRY(hv, elt)    \
+     MP_ENV_HV_STORE(hv, elt.key, elt.val);
+ 
++/* see https://bugs.debian.org/754901 */
++__attribute__((optimize("-fno-tree-dse")))
+ static void modperl_env_table_populate(pTHX_ apr_table_t *table)
+ {
+     HV *hv = ENVHV;
+-- 
+2.0.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 7a54d44..244ba81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ avoid-db-linkage.patch
 360-conditional-linux-pid-module.patch
 370-Fix-t-directive-perlloadmodule2.t.patch
 380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch
+390-Disable-the-tree-dse-gcc-optimization-for-modperl_en.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git