[gcc-7] 203/354: * Don't build libada with -O3 (ftbfs on ppc64el).

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 674c544e43dcba0abb52834f69213785e77e1aaf
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed May 24 22:07:33 2017 +0000

      * Don't build libada with -O3 (ftbfs on ppc64el).
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9504 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                        | 6 ++++++
 debian/patches/ada-gnattools-cross.diff | 2 +-
 debian/patches/ada-libgnatvsn.diff      | 2 +-
 debian/patches/ada-link-lib.diff        | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b61ee2..6bd7d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-7 (7.1.0-7) UNRELEASED; urgency=medium
+
+  * Don't build libada with -O3 (ftbfs on ppc64el).
+
+ -- Matthias Klose <doko at debian.org>  Wed, 24 May 2017 13:45:03 -0700
+
 gcc-7 (7.1.0-6) experimental; urgency=medium
 
   * Update to SVN 20170522 (r248347) from the gcc-7-branch.
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
index e6d2fdd..4096d85 100644
--- a/debian/patches/ada-gnattools-cross.diff
+++ b/debian/patches/ada-gnattools-cross.diff
@@ -241,7 +241,7 @@ Index: b/src/gnattools/Makefile.in
 +	  $(shell dpkg-buildflags --get LDFLAGS)" \
 +	"ADAFLAGS=$(ADAFLAGS) -gnatn \
 +	  $(filter-out -Wformat -Werror=format-security, \
-+	    $(shell dpkg-buildflags --get CFLAGS))" \
++	    $(subst -O3,-O2,$(shell dpkg-buildflags --get CFLAGS)))" \
  	"ADA_CFLAGS=$(ADA_CFLAGS)" \
  	"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
 -	"ADA_INCLUDES=-I- -I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
diff --git a/debian/patches/ada-libgnatvsn.diff b/debian/patches/ada-libgnatvsn.diff
index 9d92d6e..c2df6a7 100644
--- a/debian/patches/ada-libgnatvsn.diff
+++ b/debian/patches/ada-libgnatvsn.diff
@@ -126,7 +126,7 @@
 +cppflags += $(CPPFLAGS)
 +ldflags  += $(LDFLAGS)
 +
-+deb_cflags := $(shell dpkg-buildflags --get CFLAGS)
++deb_cflags := $(subst -O3,-O2,$(shell dpkg-buildflags --get CFLAGS))
 +adaflags += $(filter-out -Wformat -Werror=format-security,$(deb_cflags))
 +cflags   += $(deb_cflags)
 +cppflags += $(shell dpkg-buildflags --get CPPFLAGS)
diff --git a/debian/patches/ada-link-lib.diff b/debian/patches/ada-link-lib.diff
index 034c84e..b368cc9 100644
--- a/debian/patches/ada-link-lib.diff
+++ b/debian/patches/ada-link-lib.diff
@@ -65,7 +65,7 @@
  # a *target* library, aren't we?!?  Likewise for CC.  Still, provide bogus
  # definitions just in case something slips through the safety net provided
  # by recursive make invocations in gcc/ada/Makefile.in
-+deb_cflags := $(shell dpkg-buildflags --get CFLAGS)
++deb_cflags := $(subst -O3,-O2,$(shell dpkg-buildflags --get CFLAGS))
  LIBADA_FLAGS_TO_PASS = \
          "MAKEOVERRIDES=" \
 -        "LDFLAGS=$(LDFLAGS)" \
@@ -168,7 +168,7 @@
  
  # Extra flags to pass to recursive makes.
 -COMMON_ADAFLAGS= -gnatpg
-+deb_cflags := $(shell dpkg-buildflags --get CFLAGS)
++deb_cflags := $(subst -O3,-O2,$(shell dpkg-buildflags --get CFLAGS))
 +COMMON_ADAFLAGS= -gnatpgn \
 +  $(filter-out -Wformat -Werror=format-security,$(deb_cflags))
  ifeq ($(TREECHECKING),)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git