[libapache2-mod-perl2] 04/05: enable the tree-dse GCC optimization again.

[Niko Tyni]

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

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

commit 18eb553bb18ff63314369db96e40de706495bc46
Author: Niko Tyni <ntyni at debian.org>
Date:   Sat Aug 9 16:58:13 2014 +0300

    enable the tree-dse GCC optimization again.
---
 debian/changelog                                   |  1 +
 ...-tree-dse-gcc-optimization-for-modperl_en.patch | 29 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e75e58e..5d2fb99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libapache2-mod-perl2 (2.0.9~1604013-2) UNRELEASED; urgency=medium
   * Fix invalid code in modperl_env.c that was the root cause of
     the gcc-4.9 breakage. Thanks to Matthias Klose and Richard Biener.
     (Closes: #757240)
+    + enable the tree-dse GCC optimization again.
 
  -- Niko Tyni <ntyni at debian.org>  Sat, 09 Aug 2014 16:48:01 +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
deleted file mode 100644
index 6e190fd..0000000
--- a/debian/patches/390-Disable-the-tree-dse-gcc-optimization-for-modperl_en.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 65cfafd..2d72205 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,6 @@ avoid-db-linkage.patch
 350-ap-test-apache24-define.patch
 360-conditional-linux-pid-module.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
 400-Define-MP_IN_XS-to-avoid-referencing-perl_module-out.patch
 410-Restore-httpd-2.4-compatibility-in-lib-Apache2-compa.patch
 420-Mark-failing-tests-in-t-perl-ithreads3.t-as-TODO.patch

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