[gcc-7] 192/354: * Build gnat on mips64 and powerpcspe.

[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 b01987e0f51d09181c036870dd44d0b3936d6fc8
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri May 19 16:01:33 2017 +0000

      * Build gnat on mips64 and powerpcspe.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9485 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  |  1 +
 debian/control    |  4 ++--
 debian/rules.conf |  2 +-
 debian/rules.defs | 13 -------------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0f1705..f101efe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gcc-7 (7.1.0-6) UNRELEASED; urgency=medium
   * Work around #814977 (gnat calling gcc-7-7) by providing a gcc-7-7
     symlink.
   * Fix gnat build dependencies on x32.
+  * Build gnat on mips64 and powerpcspe.
 
  -- Matthias Klose <doko at debian.org>  Mon, 15 May 2017 16:22:37 -0700
 
diff --git a/debian/control b/debian/control
index 5e069ad..0481e01 100644
--- a/debian/control
+++ b/debian/control
@@ -16,11 +16,11 @@ Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14),
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, 
   gdb:native, nvptx-tools [amd64], 
   texinfo (>= 4.3), locales, sharutils, 
-  procps, gnat-6:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !m68k !mips64 !x32], g++-7 [x32], gnat-7 [x32], g++-6:native, netbase, 
+  procps, gnat-6:native [!m32r !sh3 !sh3eb !sh4eb !x32], g++-7 [x32], gnat-7 [x32], g++-6:native, netbase, 
   libisl-dev (>= 0.14), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), lib32z1-dev [amd64 kfreebsd-amd64], lib64z1-dev [i386], 
   dejagnu [!m68k !hurd-amd64 !hurd-i386 !hurd-alpha !kfreebsd-amd64 !kfreebsd-i386 !kfreebsd-alpha], realpath (>= 1.9.12), chrpath, lsb-release, quilt, 
   pkg-config, libgc-dev, 
-   g++-7-alpha-linux-gnu [alpha] <cross>, gobjc-7-alpha-linux-gnu [alpha] <cross>, gfortran-7-alpha-linux-gnu [alpha] <cross>, gdc-7-alpha-linux-gnu [alpha] <cross>, gccgo-7-alpha-linux-gnu [alpha] <cross>, gnat-7-alpha-linux-gnu [alpha] <cross>, g++-7-x86-64-linux-gnu [amd64] <cross>, gobjc-7-x86-64-linux-gnu [amd64] <cross>, gfortran-7-x86-64-linux-gnu [amd64] <cross>, gdc-7-x86-64-linux-gnu [amd64] <cross>, gccgo-7-x86-64-linux-gnu [amd64] <cross>, gnat-7-x86-64-linux-gnu [amd64] <cro [...]
+   g++-7-alpha-linux-gnu [alpha] <cross>, gobjc-7-alpha-linux-gnu [alpha] <cross>, gfortran-7-alpha-linux-gnu [alpha] <cross>, gdc-7-alpha-linux-gnu [alpha] <cross>, gccgo-7-alpha-linux-gnu [alpha] <cross>, gnat-7-alpha-linux-gnu [alpha] <cross>, g++-7-x86-64-linux-gnu [amd64] <cross>, gobjc-7-x86-64-linux-gnu [amd64] <cross>, gfortran-7-x86-64-linux-gnu [amd64] <cross>, gdc-7-x86-64-linux-gnu [amd64] <cross>, gccgo-7-x86-64-linux-gnu [amd64] <cross>, gnat-7-x86-64-linux-gnu [amd64] <cro [...]
 Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns
 Homepage: http://gcc.gnu.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-7/
diff --git a/debian/rules.conf b/debian/rules.conf
index 3464c5d..543fec2 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -468,7 +468,7 @@ else
 	    gdc-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \
 	  $(if $(filter $(a), hppa m68k sh4),, \
 	    gccgo-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \
-	  $(if $(filter $(a), m68k mips64 powerpcspe sh4 sparc64),, \
+	  $(if $(filter $(a), m68k),, \
 	    gnat-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \
 	)
   pf_cross = $(SPACE)<cross>
diff --git a/debian/rules.defs b/debian/rules.defs
index 1397bf9..5fc970e 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -641,17 +641,12 @@ ifeq (,$(filter $(DEB_STAGE),stage1 stage2))
 # Ada --------------------
 ada_no_cpus	:= m32r sh3 sh3eb sh4eb
 # no Debian builds ... some of these should exist
-ada_no_cpus += powerpcspe
 ada_no_cpus += m68k # see https://bugs.debian.org/814221
-ada_no_cpus += mips64 # see https://gcc.gnu.org/PR65337
 ada_no_systems	:= 
 ada_no_cross	:= no
 ada_no_snap	:= no
 ifeq ($(single_package),yes)
-  ada_no_cpus += powerpcspe
-  #ifneq (,$(filter $(DEB_TARGET_ARCH),mips mipsel powerpcspe kfreebsd-i386 kfreebsd-amd64))
   ifneq (,$(filter $(DEB_TARGET_ARCH),powerpcspe))
-    #ada_no_cpus += mips mipsel
     #ada_no_cpus += kfreebsd-i386 kfreebsd-amd64
     ada_no_snap := yes
   endif
@@ -665,9 +660,6 @@ endif
 ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(ada_no_cpus)))
   with_ada := disabled for cpu $(DEB_TARGET_ARCH_CPU)
 endif
-ifneq (,$(filter $(DEB_TARGET_ARCH),powerpcspe))
-  with_ada := disabled for architecture $(DEB_TARGET_ARCH)
-endif
 ifneq (,$(filter $(DEB_TARGET_ARCH),kfreebsd-i386 kfreebsd-amd64 hurd-i386))
   with_ada := disabled for architecture $(DEB_TARGET_ARCH)
 endif
@@ -676,11 +668,6 @@ ifeq (,$(findstring cross,$(build_type)))
     with_ada := native gnat disabled for architecture $(DEB_TARGET_ARCH)
   endif
 endif
-ifneq (,$(findstring cross,$(build_type)))
-  ifneq (,$(filter $(DEB_BUILD_ARCH),powerpcspe))
-    with_ada := no gnat host compiler on $(DEB_BUILD_ARCH)
-  endif
-endif
 ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(ada_no_systems)))
   with_ada := disabled for system $(DEB_TARGET_GNU_SYSTEM)
 endif

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