[gcc-6] 29/401: * GCC 6 snapshot build, taken from the trunk 20151220. * Relax gcj-6-{jre, jre-headless, jdk} dependencies on libgcj16. * Fix cross build issues.

Ximin Luo infinity0 at debian.org
Wed Apr 5 15:47:58 UTC 2017


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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 5a31a2805c28545a034b7071f61f62e1cf049fc6
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sun Dec 20 12:49:10 2015 +0000

      * GCC 6 snapshot build, taken from the trunk 20151220.
      * Relax gcj-6-{jre,jre-headless,jdk} dependencies on libgcj16.
      * Fix cross build issues.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8550 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                           |  7 ++--
 debian/control                             | 12 +++----
 debian/control.m4                          |  8 ++---
 debian/patches/cross-fixes.diff            | 20 ++++++------
 debian/patches/cross-install-location.diff | 51 +++++++++++-------------------
 debian/patches/libgnatprj-cross-hack.diff  | 25 +++++++++++++--
 debian/patches/m68k-revert-pr45144.diff    | 18 ++++++-----
 debian/rules.conf                          |  6 ++--
 8 files changed, 79 insertions(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99349b4..70f26e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-gcc-6 (6-20151213-2) UNRELEASED; urgency=medium
+gcc-6 (6-20151220-1) UNRELEASED; urgency=medium
 
+  * GCC 6 snapshot build, taken from the trunk 20151220.
   * Update libstdc++-dbg conflicts. Closes: #807885.
   * Set target tools and build dependencies for cross builds.
+  * Relax gcj-6-{jre,jre-headless,jdk} dependencies on libgcj16.
+  * Fix cross build issues.
 
- -- Matthias Klose <doko at debian.org>  Mon, 14 Dec 2015 13:55:03 +0100
+ -- Matthias Klose <doko at debian.org>  Sun, 20 Dec 2015 13:46:12 +0100
 
 gcc-6 (6-20151213-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index daa50d5..4bed046 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 5.0.62), dpkg-dev (>= 1.17.11), 
-  g++-multilib <!cross> [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32], g++-5 <!cross> [arm64], 
+  g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32] <!cross>, g++-5 [arm64] <!cross>, 
   libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mi [...]
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k], 
   m4, libtool, autoconf2.64, 
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0.62), dpkg-dev (>= 1.17.11),
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, 
   gdb:native, 
   texinfo (>= 4.3), locales, sharutils, 
-  procps, zlib1g-dev, libantlr-java, python:native, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev gnat-5:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !mips64 !x32 !sh4], g++-5:native, netbase, 
+  procps, zlib1g-dev, libantlr-java, python:native, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, gnat-5:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !mips64 !x32 !sh4], g++-5:native, netbase, 
   libisl-dev (>= 0.14), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), 
   dejagnu [!m68k], realpath (>= 1.9.12), chrpath, lsb-release, quilt, 
    g++-6-alpha-linux-gnu [alpha] <cross>, gobjc-6-alpha-linux-gnu [alpha] <cross>, gfortran-6-alpha-linux-gnu [alpha] <cross>, gcj-6-alpha-linux-gnu [alpha] <cross>, gdc-6-alpha-linux-gnu [alpha] <cross>, gccgo-6-alpha-linux-gnu [alpha] <cross>, gnat-6-alpha-linux-gnu [alpha] <cross>, g++-6-x86-64-linux-gnu [amd64] <cross>, gobjc-6-x86-64-linux-gnu [amd64] <cross>, gfortran-6-x86-64-linux-gnu [amd64] <cross>, gcj-6-x86-64-linux-gnu [amd64] <cross>, gdc-6-x86-64-linux-gnu [amd64] <cross>, [...]
@@ -1805,7 +1805,7 @@ Package: gcj-6-jdk
 Section: java
 Architecture: any
 Priority: optional
-Depends: gcc-6-base (= ${gcc:Version}), ${dep:gcj}, ${dep:libcdev}, gcj-6 (= ${gcj:Version}), gcj-6-jre (= ${gcj:Version}), libgcj16-dev (= ${gcj:Version}), fastjar, libgcj-bc, java-common, libantlr-java, ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Depends: gcc-6-base (= ${gcc:Version}), ${dep:gcj}, ${dep:libcdev}, gcj-6 (= ${gcj:Version}), gcj-6-jre (= ${gcj:Version}), libgcj16-dev (>= ${gcj:Version}), fastjar, libgcj-bc, java-common, libantlr-java, ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
 Recommends: libecj-java-gcj
 Suggests: gcj-6-source (>= ${gcj:SoftVersion}), libgcj16-dbg (>= ${gcc:Version})
 Provides: java-compiler, java-sdk, java2-sdk, java5-sdk
@@ -1824,8 +1824,8 @@ Package: gcj-6-jre-headless
 Priority: optional
 Section: java
 Architecture: any
-Depends: gcc-6-base (= ${gcc:Version}), gcj-6-jre-lib (>= ${gcj:SoftVersion}), libgcj16 (= ${gcj:Version}), ${dep:prctl}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: fastjar, gcj-6-jdk (= ${gcj:Version}), libgcj16-awt (= ${gcj:Version})
+Depends: gcc-6-base (= ${gcc:Version}), gcj-6-jre-lib (>= ${gcj:SoftVersion}), libgcj16 (>= ${gcj:Version}), ${dep:prctl}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: fastjar, gcj-6-jdk (= ${gcj:Version}), libgcj16-awt (>= ${gcj:Version})
 Provides: java5-runtime-headless, java2-runtime-headless, java1-runtime-headless, java-runtime-headless
 Description: Java runtime environment using GIJ/Classpath (headless version)
  GIJ is a Java bytecode interpreter, not limited to interpreting bytecode.
@@ -1841,7 +1841,7 @@ Package: gcj-6-jre
 Section: java
 Architecture: any
 Priority: optional
-Depends: gcc-6-base (= ${gcc:Version}), gcj-6-jre-headless (= ${gcj:Version}), libgcj16-awt (= ${gcj:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: gcc-6-base (= ${gcc:Version}), gcj-6-jre-headless (= ${gcj:Version}), libgcj16-awt (>= ${gcj:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: java5-runtime, java2-runtime, java1-runtime, java-runtime
 Description: Java runtime environment using GIJ/Classpath
  GIJ is a Java bytecode interpreter, not limited to interpreting bytecode.
diff --git a/debian/control.m4 b/debian/control.m4
index 31601de..9cede50 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -4062,7 +4062,7 @@ Package: gcj`'PV-jdk`'TS
 Section: java
 Architecture: any
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-Depends: BASEDEP, ${dep:gcj}, ${dep:libcdev}, gcj`'PV`'TS (= ${gcj:Version}), gcj`'PV-jre`'TS (= ${gcj:Version}), libidevdep(gcj`'GCJ_SO-dev,,=,${gcj:Version}), fastjar, libgcj-bc`'LS, java-common, libantlr-java, ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Depends: BASEDEP, ${dep:gcj}, ${dep:libcdev}, gcj`'PV`'TS (= ${gcj:Version}), gcj`'PV-jre`'TS (= ${gcj:Version}), libidevdep(gcj`'GCJ_SO-dev,,>=,${gcj:Version}), fastjar, libgcj-bc`'LS, java-common, libantlr-java, ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
 Recommends: libecj-java-gcj
 Suggests: gcj`'PV-source (>= ${gcj:SoftVersion}), libdbgdep(gcj`'GCJ_SO-dbg,)
 Provides: java-compiler, java-sdk, java2-sdk, java5-sdk
@@ -4082,8 +4082,8 @@ Package: gcj`'PV-jre-headless`'TS
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Section: java
 Architecture: any
-Depends: BASEDEP, gcj`'PV-jre-lib`'TS (>= ${gcj:SoftVersion}), libdep(gcj`'LIBGCJ_EXT,,=,${gcj:Version}), ${dep:prctl}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: fastjar, gcj`'PV-jdk`'TS (= ${gcj:Version}), libdep(gcj`'LIBGCJ_EXT-awt,,=,${gcj:Version})
+Depends: BASEDEP, gcj`'PV-jre-lib`'TS (>= ${gcj:SoftVersion}), libdep(gcj`'LIBGCJ_EXT,,>=,${gcj:Version}), ${dep:prctl}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: fastjar, gcj`'PV-jdk`'TS (= ${gcj:Version}), libdep(gcj`'LIBGCJ_EXT-awt,,>=,${gcj:Version})
 Provides: java5-runtime-headless, java2-runtime-headless, java1-runtime-headless, java-runtime-headless
 BUILT_USING`'dnl
 Description: Java runtime environment using GIJ/Classpath (headless version)
@@ -4100,7 +4100,7 @@ Package: gcj`'PV-jre`'TS
 Section: java
 Architecture: any
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-Depends: BASEDEP, gcj`'PV-jre-headless`'TS (= ${gcj:Version}), libdep(gcj`'LIBGCJ_EXT-awt,,=,${gcj:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: BASEDEP, gcj`'PV-jre-headless`'TS (= ${gcj:Version}), libdep(gcj`'LIBGCJ_EXT-awt,,>=,${gcj:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: java5-runtime, java2-runtime, java1-runtime, java-runtime
 BUILT_USING`'dnl
 Description: Java runtime environment using GIJ/Classpath
diff --git a/debian/patches/cross-fixes.diff b/debian/patches/cross-fixes.diff
index bb796b1..cfe223f 100644
--- a/debian/patches/cross-fixes.diff
+++ b/debian/patches/cross-fixes.diff
@@ -19,7 +19,7 @@ Index: b/src/libgcc/config/ia64/fde-glibc.c
  #include "config.h"
  #include <stddef.h>
  #include <stdlib.h>
-@@ -159,3 +160,5 @@
+@@ -159,3 +160,5 @@ _Unwind_FindTableEntry (void *pc, unw_wo
  
    return data.ret;
  }
@@ -29,7 +29,7 @@ Index: b/src/libgcc/config/ia64/unwind-ia64.c
 ===================================================================
 --- a/src/libgcc/config/ia64/unwind-ia64.c
 +++ b/src/libgcc/config/ia64/unwind-ia64.c
-@@ -27,6 +27,7 @@
+@@ -26,6 +26,7 @@
     see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
     <http://www.gnu.org/licenses/>.  */
  
@@ -37,7 +37,7 @@ Index: b/src/libgcc/config/ia64/unwind-ia64.c
  #include "tconfig.h"
  #include "tsystem.h"
  #include "coretypes.h"
-@@ -2467,3 +2468,4 @@
+@@ -2466,3 +2467,4 @@ alias (_Unwind_SetIP);
  #endif
  
  #endif
@@ -46,7 +46,7 @@ Index: b/src/libgcc/unwind-compat.c
 ===================================================================
 --- a/src/libgcc/unwind-compat.c
 +++ b/src/libgcc/unwind-compat.c
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
     <http://www.gnu.org/licenses/>.  */
  
  #if defined (USE_GAS_SYMVER) && defined (USE_LIBUNWIND_EXCEPTIONS)
@@ -54,7 +54,7 @@ Index: b/src/libgcc/unwind-compat.c
  #include "tconfig.h"
  #include "tsystem.h"
  #include "unwind.h"
-@@ -208,3 +209,4 @@
+@@ -207,3 +208,4 @@ _Unwind_SetIP (struct _Unwind_Context *c
  }
  symver (_Unwind_SetIP, GCC_3.0);
  #endif
@@ -63,19 +63,19 @@ Index: b/src/libgcc/unwind-generic.h
 ===================================================================
 --- a/src/libgcc/unwind-generic.h
 +++ b/src/libgcc/unwind-generic.h
-@@ -221,6 +221,7 @@
+@@ -221,6 +221,7 @@ _Unwind_SjLj_Resume_or_Rethrow (struct _
     compatible with the standard ABI for IA-64, we inline these.  */
  
  #ifdef __ia64__
 +#ifndef inhibit_libc
- #include <stdlib.h>
- 
  static inline _Unwind_Ptr
-@@ -239,6 +240,7 @@
+ _Unwind_GetDataRelBase (struct _Unwind_Context *_C)
+ {
+@@ -237,6 +238,7 @@ _Unwind_GetTextRelBase (struct _Unwind_C
  
  /* @@@ Retrieve the Backing Store Pointer of the given context.  */
  extern _Unwind_Word _Unwind_GetBSP (struct _Unwind_Context *);
-+#endif
++#endif /* inhibit_libc */
  #else
  extern _Unwind_Ptr _Unwind_GetDataRelBase (struct _Unwind_Context *);
  extern _Unwind_Ptr _Unwind_GetTextRelBase (struct _Unwind_Context *);
diff --git a/debian/patches/cross-install-location.diff b/debian/patches/cross-install-location.diff
index 468a18b..162ea4f 100644
--- a/debian/patches/cross-install-location.diff
+++ b/debian/patches/cross-install-location.diff
@@ -18,15 +18,9 @@ Index: b/src/libgfortran/Makefile.in
 ===================================================================
 --- a/src/libgfortran/Makefile.in
 +++ b/src/libgfortran/Makefile.in
-@@ -608,17 +608,17 @@ libgfortran_la_LDFLAGS = -version-info `
+@@ -604,12 +604,12 @@ libgfortran_la_LDFLAGS = -version-info `
  
  libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP)
- myexeclib_LTLIBRARIES = libgfortranbegin.la
--myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
-+myexeclibdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
- libgfortranbegin_la_SOURCES = fmain.c
- libgfortranbegin_la_LDFLAGS = -static
- libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS)
  cafexeclib_LTLIBRARIES = libcaf_single.la
 -cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
 +cafexeclibdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
@@ -43,16 +37,9 @@ Index: b/src/libgfortran/Makefile.am
 ===================================================================
 --- a/src/libgfortran/Makefile.am
 +++ b/src/libgfortran/Makefile.am
-@@ -42,20 +42,20 @@ libgfortran_la_LDFLAGS = -version-info `
+@@ -43,14 +43,14 @@ libgfortran_la_LDFLAGS = -version-info `
  libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP)
  
- myexeclib_LTLIBRARIES = libgfortranbegin.la
--myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
-+myexeclibdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
- libgfortranbegin_la_SOURCES = fmain.c
- libgfortranbegin_la_LDFLAGS = -static
- libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS)
- 
  cafexeclib_LTLIBRARIES = libcaf_single.la
 -cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
 +cafexeclibdir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
@@ -71,7 +58,7 @@ Index: b/src/lto-plugin/Makefile.in
 ===================================================================
 --- a/src/lto-plugin/Makefile.in
 +++ b/src/lto-plugin/Makefile.in
-@@ -229,7 +229,7 @@ with_libiberty = @with_libiberty@
+@@ -255,7 +255,7 @@ with_libiberty = @with_libiberty@
  ACLOCAL_AMFLAGS = -I .. -I ../config
  AUTOMAKE_OPTIONS = no-dependencies
  gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
@@ -97,7 +84,7 @@ Index: b/src/libitm/Makefile.in
 ===================================================================
 --- a/src/libitm/Makefile.in
 +++ b/src/libitm/Makefile.in
-@@ -306,8 +306,8 @@ SUBDIRS = testsuite
+@@ -334,8 +334,8 @@ SUBDIRS = testsuite
  gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
  abi_version = -fabi-version=4
  search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir)
@@ -127,7 +114,7 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -3970,7 +3970,7 @@ process_command (unsigned int decoded_op
+@@ -4179,7 +4179,7 @@ process_command (unsigned int decoded_op
  	 GCC_EXEC_PREFIX is typically a directory name with a trailing
  	 / (which is ignored by make_relative_prefix), so append a
  	 program name.  */
@@ -136,7 +123,7 @@ Index: b/src/gcc/gcc.c
        gcc_libexec_prefix = get_relative_prefix (tmp_prefix,
  						standard_exec_prefix,
  						standard_libexec_prefix);
-@@ -3996,15 +3996,15 @@ process_command (unsigned int decoded_op
+@@ -4205,15 +4205,15 @@ process_command (unsigned int decoded_op
      {
        int len = strlen (gcc_exec_prefix);
  
@@ -160,7 +147,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -581,9 +581,9 @@ libexecdir = @libexecdir@
+@@ -592,9 +592,9 @@ libexecdir = @libexecdir@
  # --------
  
  # Directory in which the compiler finds libraries etc.
@@ -172,7 +159,7 @@ Index: b/src/gcc/Makefile.in
  # Directory in which all plugin resources are installed
  plugin_resourcesdir = $(libsubdir)/plugin
   # Directory in which plugin headers are installed
-@@ -1971,8 +1971,8 @@ prefix.o: $(FULLVER)
+@@ -2017,8 +2017,8 @@ prefix.o: $(FULLVER)
  
  DRIVER_DEFINES = \
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
@@ -183,7 +170,7 @@ Index: b/src/gcc/Makefile.in
    -DDEFAULT_TARGET_VERSION=\"$(BASEVER_c)\" \
    -DDEFAULT_TARGET_FULL_VERSION=\"$(FULLVER_c)\" \
    -DDEFAULT_REAL_TARGET_MACHINE=\"$(real_target_noncanonical)\" \
-@@ -2594,7 +2594,7 @@ PREPROCESSOR_DEFINES = \
+@@ -2671,7 +2671,7 @@ PREPROCESSOR_DEFINES = \
    -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
    -DNATIVE_SYSTEM_HEADER_DIR=\"$(NATIVE_SYSTEM_HEADER_DIR)\" \
    -DPREFIX=\"$(prefix)/\" \
@@ -196,7 +183,7 @@ Index: b/src/libssp/Makefile.in
 ===================================================================
 --- a/src/libssp/Makefile.in
 +++ b/src/libssp/Makefile.in
-@@ -259,7 +259,7 @@ gcc_version := $(shell cat $(top_srcdir)
+@@ -287,7 +287,7 @@ gcc_version := $(shell cat $(top_srcdir)
  @LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE at version_dep = ssp.map-sun
  AM_CFLAGS = -Wall
  toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
@@ -222,7 +209,7 @@ Index: b/src/libquadmath/Makefile.in
 ===================================================================
 --- a/src/libquadmath/Makefile.in
 +++ b/src/libquadmath/Makefile.in
-@@ -325,7 +325,7 @@ AUTOMAKE_OPTIONS = 1.8 foreign
+@@ -354,7 +354,7 @@ AUTOMAKE_OPTIONS = 1.8 foreign
  
  @BUILD_LIBQUADMATH_TRUE at libquadmath_la_DEPENDENCIES = $(version_dep) $(libquadmath_la_LIBADD)
  @BUILD_LIBQUADMATH_TRUE at nodist_libsubinclude_HEADERS = quadmath.h quadmath_weak.h
@@ -274,7 +261,7 @@ Index: b/src/libgomp/Makefile.in
 ===================================================================
 --- a/src/libgomp/Makefile.in
 +++ b/src/libgomp/Makefile.in
-@@ -368,8 +368,8 @@ gcc_version := $(shell cat $(top_srcdir)
+@@ -386,8 +386,8 @@ gcc_version := $(shell cat $(top_srcdir)
  search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
  	      $(top_srcdir)/../include
  
@@ -304,12 +291,12 @@ Index: b/src/libgcc/Makefile.in
 ===================================================================
 --- a/src/libgcc/Makefile.in
 +++ b/src/libgcc/Makefile.in
-@@ -185,7 +185,7 @@ STRIP = @STRIP@
+@@ -186,7 +186,7 @@ STRIP = @STRIP@
  STRIP_FOR_TARGET = $(STRIP)
  
  # Directory in which the compiler finds libraries etc.
--libsubdir = $(libdir)/gcc/$(host_noncanonical)/$(version)@accel_dir_suffix@
-+libsubdir = $(libdir)/gcc-cross/$(host_noncanonical)/$(version)@accel_dir_suffix@
+-libsubdir = $(libdir)/gcc/$(real_host_noncanonical)/$(version)@accel_dir_suffix@
++libsubdir = $(libdir)/gcc-cross/$(real_host_noncanonical)/$(version)@accel_dir_suffix@
  # Used to install the shared libgcc.
  slibdir = @slibdir@
  # Maybe used for DLLs on Windows targets.
@@ -317,7 +304,7 @@ Index: b/src/libjava/Makefile.in
 ===================================================================
 --- a/src/libjava/Makefile.in
 +++ b/src/libjava/Makefile.in
-@@ -797,8 +797,8 @@ write_entries_to_file = $(shell rm -f $(
+@@ -825,8 +825,8 @@ write_entries_to_file = $(shell rm -f $(
  
  
  # This is required by TL_AC_GXX_INCLUDE_DIR.
@@ -360,7 +347,7 @@ Index: b/src/libffi/include/Makefile.in
 ===================================================================
 --- a/src/libffi/include/Makefile.in
 +++ b/src/libffi/include/Makefile.in
-@@ -223,7 +223,7 @@ EXTRA_DIST = ffi.h.in
+@@ -251,7 +251,7 @@ EXTRA_DIST = ffi.h.in
  
  # Where generated headers like ffitarget.h get installed.
  gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
@@ -386,7 +373,7 @@ Index: b/src/libcc1/Makefile.in
 ===================================================================
 --- a/src/libcc1/Makefile.in
 +++ b/src/libcc1/Makefile.in
-@@ -262,7 +262,7 @@ libiberty = $(if $(wildcard $(libiberty_
+@@ -290,7 +290,7 @@ libiberty = $(if $(wildcard $(libiberty_
  	    $(Wc)$(libiberty_normal)))
  
  libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
@@ -411,7 +398,7 @@ Index: b/src/libsanitizer/Makefile.in
 ===================================================================
 --- a/src/libsanitizer/Makefile.in
 +++ b/src/libsanitizer/Makefile.in
-@@ -255,7 +255,7 @@ top_build_prefix = @top_build_prefix@
+@@ -285,7 +285,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I .. -I ../config
diff --git a/debian/patches/libgnatprj-cross-hack.diff b/debian/patches/libgnatprj-cross-hack.diff
index 75c5fb4..fe72ab6 100644
--- a/debian/patches/libgnatprj-cross-hack.diff
+++ b/debian/patches/libgnatprj-cross-hack.diff
@@ -37,11 +37,30 @@ Index: b/src/libgnatprj/Makefile.in
 ===================================================================
 --- a/src/libgnatprj/Makefile.in
 +++ b/src/libgnatprj/Makefile.in
-@@ -38,6 +38,7 @@ LN_S := @LN_S@
+@@ -37,7 +37,7 @@ TOOLS_TARGET_PAIRS := @TOOLS_TARGET_PAIR
+ LN_S := @LN_S@
  
  ifneq (@build@, at host@)
-    CFLAGS += -b @host@
-+   CFLAGS += -DLIBGNATPRJ_CROSS_HACK
+-   CFLAGS += -b @host@
++   override CFLAGS += -DLIBGNATPRJ_CROSS_HACK
  endif
  
  .PHONY: libgnatprj install
+Index: b/src/gcc/double-int.h
+===================================================================
+--- a/src/gcc/double-int.h
++++ b/src/gcc/double-int.h
+@@ -429,11 +429,13 @@ double_int::popcount () const
+ 
+ 
+ #ifndef GENERATOR_FILE
++#ifndef LIBGNATPRJ_CROSS_HACK
+ /* Conversion to and from GMP integer representations.  */
+ 
+ void mpz_set_double_int (mpz_t, double_int, bool);
+ double_int mpz_get_double_int (const_tree, mpz_t, bool);
+ #endif
++#endif
+ 
+ namespace wi
+ {
diff --git a/debian/patches/m68k-revert-pr45144.diff b/debian/patches/m68k-revert-pr45144.diff
index 9f9d3c7..e7318d4 100644
--- a/debian/patches/m68k-revert-pr45144.diff
+++ b/debian/patches/m68k-revert-pr45144.diff
@@ -4,15 +4,17 @@
 
 	PR ada/48835
 
+Index: b/src/gcc/tree-sra.c
+===================================================================
 --- a/src/gcc/tree-sra.c
 +++ b/src/gcc/tree-sra.c
-@@ -916,9 +916,6 @@ type_consists_of_records_p (tree type)
-       {
- 	tree ft = TREE_TYPE (fld);
+@@ -927,9 +927,6 @@ scalarizable_type_p (tree type)
+ 	{
+ 	  tree ft = TREE_TYPE (fld);
  
--	if (DECL_BIT_FIELD (fld))
--	  return false;
+-	  if (DECL_BIT_FIELD (fld))
+-	    return false;
 -
- 	if (!is_gimple_reg_type (ft)
- 	    && !type_consists_of_records_p (ft))
- 	  return false;
+ 	  if (!is_gimple_reg_type (ft)
+ 	      && !scalarizable_type_p (ft))
+ 	    return false;
diff --git a/debian/rules.conf b/debian/rules.conf
index a4bf7c4..2c778ba 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -361,8 +361,8 @@ endif
 
 # needed for the include/asm symlink to run the testsuite for
 # non default multilibs
-GCC_MULTILIB_BUILD_DEP = g++-multilib$(pf_ncross) [$(multilib_archs)],
-GCC_MULTILIB_BUILD_DEP += g++-5$(pf_ncross) [arm64],
+GCC_MULTILIB_BUILD_DEP = g++-multilib [$(multilib_archs)]$(pf_ncross),
+GCC_MULTILIB_BUILD_DEP += g++-5 [arm64]$(pf_ncross),
 
 LIBUNWIND_DEV_DEP := libunwind7-dev$(LS)$(AQ) (>= 0.98.5-6)
 LIBUNWIND_BUILD_DEP := $(LIBUNWIND_DEV_DEP) [ia64],
@@ -481,7 +481,7 @@ ifneq (,$(java_awt_peers))
   endif
   JAVA_BUILD_DEP += libasound2-dev [$(java_no_archs) $(linux_no_archs)],
   ifneq (,$(findstring gtk,$(java_awt_peers)))
-    JAVA_BUILD_DEP += libxtst-dev$(bd_java_archs), libxt-dev$(bd_java_archs), libgtk2.0-dev (>= 2.4.4-2)$(bd_java_archs), libart-2.0-dev$(bd_java_archs), libcairo2-dev$(bd_java_archs)
+    JAVA_BUILD_DEP += libxtst-dev$(bd_java_archs), libxt-dev$(bd_java_archs), libgtk2.0-dev (>= 2.4.4-2)$(bd_java_archs), libart-2.0-dev$(bd_java_archs), libcairo2-dev$(bd_java_archs),
   endif
   ifneq (,$(findstring qt,$(java_awt_peers)))
     JAVA_BUILD_DEP += libqt4-dev (>= 4.1.0)$(bd_java_archs),

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



More information about the Reproducible-commits mailing list