[gcc-6] 114/401: * GCC 6.1.0 release.
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:48:10 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 93220a32f54095ce5bd02dff2ea2400e024af12f
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Wed Apr 27 10:55:29 2016 +0000
* GCC 6.1.0 release.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8789 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 8 +-
debian/control | 30 +++---
debian/control.m4 | 38 ++++----
debian/patches/ada-arm.diff | 2 +-
debian/patches/ada-gnattools-ldflags.diff | 12 +--
debian/patches/ada-hurd.diff | 152 ------------------------------
debian/patches/ada-libgnatprj.diff | 18 ++--
debian/patches/ada-libgnatvsn.diff | 18 ++--
debian/patches/ada-link-lib.diff | 50 +++++-----
debian/patches/ada-sjlj.diff | 18 ++--
debian/patches/arm-multilib-defaults.diff | 4 +-
debian/patches/g++-multiarch-incdir.diff | 4 +-
debian/patches/gcc-base-version.diff | 22 ++---
debian/patches/gcc-gfdl-build.diff | 2 +-
debian/patches/gcc-multiarch.diff | 2 +-
debian/patches/gcc-textdomain.diff | 2 +-
debian/patches/gdc-6.diff | 2 +-
debian/patches/gdc-libphobos-build.diff | 20 ++--
debian/patches/gdc-versym-os.diff | 2 +-
debian/patches/libgnatprj-cross-hack.diff | 2 +-
debian/patches/pr67590.diff | 8 +-
debian/patches/sparc-force-cpu.diff | 2 +-
debian/rules.conf | 9 +-
debian/rules.d/binary-libcc1.mk | 6 +-
debian/rules.d/binary-libgccjit.mk | 47 ++++++---
debian/rules.defs | 10 +-
debian/rules.patch | 1 -
debian/source/format | 2 +-
28 files changed, 190 insertions(+), 303 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4716a20..0cf8cb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-gcc-6 (6.0.1-3) UNRELEASED; urgency=medium
+gcc-6 (6.1.0-1) UNRELEASED; urgency=medium
+
+ * GCC 6.1.0 release.
[ Aurelien Jarno ]
* Apply proposed patch for PR target/68273 (Wrong code on mips/mipsel due to
@@ -6,8 +8,10 @@ gcc-6 (6.0.1-3) UNRELEASED; urgency=medium
[ Matthias Klose ]
* Always configure with --enable-targets=powerpcle-linux on ppc64el.
+ * Stop building libcc1 and libgccjit0, when not building common libs.
+ * Rename libgccjit-5-dbg to libgccjit0-dbg.
- -- Matthias Klose <doko at debian.org> Tue, 26 Apr 2016 15:30:15 +0200
+ -- Matthias Klose <doko at debian.org> Wed, 27 Apr 2016 12:46:27 +0200
gcc-6 (6.0.1-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 9409fde..1c3d6b7 100644
--- a/debian/control
+++ b/debian/control
@@ -1281,20 +1281,7 @@ Description: GCC just-in-time compilation (shared library)
libgccjit provides an embeddable shared library with an API for adding
compilation to existing programs using GCC.
-Package: libgccjit-6-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Priority: optional
-Depends: gcc-6-base (= ${gcc:Version}), libgccjit0 (>= ${gcc:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Suggests: libgccjit-6-dbg
-Description: GCC just-in-time compilation (development files)
- libgccjit provides an embeddable shared library with an API for adding
- compilation to existing programs using GCC.
-
-Package: libgccjit-6-dbg
+Package: libgccjit0-dbg
Section: debug
Architecture: any
Multi-Arch: same
@@ -1302,6 +1289,8 @@ Pre-Depends: ${misc:Pre-Depends}
Priority: extra
Depends: gcc-6-base (= ${gcc:Version}), libgccjit0 (= ${gcc:Version}),
${shlibs:Depends}, ${misc:Depends}
+Breaks: libgccjit-5-dbg, libgccjit-6-dbg
+Replaces: libgccjit-5-dbg, libgccjit-6-dbg
Description: GCC just-in-time compilation (debug information)
libgccjit provides an embeddable shared library with an API for adding
compilation to existing programs using GCC.
@@ -1316,6 +1305,19 @@ Description: GCC just-in-time compilation (documentation)
libgccjit provides an embeddable shared library with an API for adding
compilation to existing programs using GCC.
+Package: libgccjit-6-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Priority: optional
+Depends: gcc-6-base (= ${gcc:Version}), libgccjit0 (>= ${gcc:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Suggests: libgccjit-6-dbg
+Description: GCC just-in-time compilation (development files)
+ libgccjit provides an embeddable shared library with an API for adding
+ compilation to existing programs using GCC.
+
Package: gobjc++-6
Architecture: any
Priority: optional
diff --git a/debian/control.m4 b/debian/control.m4
index d850acb..44d25f9 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -3196,22 +3196,7 @@ Description: GCC just-in-time compilation (shared library)
libgccjit provides an embeddable shared library with an API for adding
compilation to existing programs using GCC.
-Package: libgccjit`'PV-dev
-Section: ifdef(`TARGET',`devel',`libdevel')
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`MULTIARCH', `Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-')`'dnl
-Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-Depends: BASEDEP, libgccjit`'GCCJIT_SO (>= ${gcc:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-BUILT_USING`'dnl
-Suggests: libgccjit`'PV-dbg
-Description: GCC just-in-time compilation (development files)
- libgccjit provides an embeddable shared library with an API for adding
- compilation to existing programs using GCC.
-
-Package: libgccjit`'PV-dbg
+Package: libgccjit`'GCCJIT_SO-dbg
Section: debug
Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
ifdef(`MULTIARCH', `Multi-Arch: same
@@ -3220,11 +3205,15 @@ Pre-Depends: ${misc:Pre-Depends}
Priority: extra
Depends: BASEDEP, libgccjit`'GCCJIT_SO (= ${gcc:Version}),
${shlibs:Depends}, ${misc:Depends}
+Breaks: libgccjit-5-dbg, libgccjit-6-dbg
+Replaces: libgccjit-5-dbg, libgccjit-6-dbg
BUILT_USING`'dnl
Description: GCC just-in-time compilation (debug information)
libgccjit provides an embeddable shared library with an API for adding
compilation to existing programs using GCC.
+')`'dnl libjit
+ifenabled(`jit',`
Package: libgccjit`'PV-doc
Section: doc
Architecture: all
@@ -3234,7 +3223,22 @@ Conflicts: libgccjit-5-doc
Description: GCC just-in-time compilation (documentation)
libgccjit provides an embeddable shared library with an API for adding
compilation to existing programs using GCC.
-')`'dnl libjit
+
+Package: libgccjit`'PV-dev
+Section: ifdef(`TARGET',`devel',`libdevel')
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
+ifdef(`MULTIARCH', `Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+')`'dnl
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, libgccjit`'GCCJIT_SO (>= ${gcc:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Suggests: libgccjit`'PV-dbg
+Description: GCC just-in-time compilation (development files)
+ libgccjit provides an embeddable shared library with an API for adding
+ compilation to existing programs using GCC.
+')`'dnl jit
ifenabled(`objpp',`
ifenabled(`objppdev',`
diff --git a/debian/patches/ada-arm.diff b/debian/patches/ada-arm.diff
index bd88b27..da679c0 100644
--- a/debian/patches/ada-arm.diff
+++ b/debian/patches/ada-arm.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
===================================================================
--- a/src/gcc/ada/gcc-interface/Makefile.in
+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1950,7 +1950,10 @@ ifeq ($(strip $(filter-out arm% linux-gn
+@@ -1979,7 +1979,10 @@ ifeq ($(strip $(filter-out arm% linux-gn
LIBGNAT_TARGET_PAIRS += \
system.ads<system-linux-armeb.ads
else
diff --git a/debian/patches/ada-gnattools-ldflags.diff b/debian/patches/ada-gnattools-ldflags.diff
index c3b1416..c85ba92 100644
--- a/debian/patches/ada-gnattools-ldflags.diff
+++ b/debian/patches/ada-gnattools-ldflags.diff
@@ -12,7 +12,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# Pretend that _Unwind_GetIPInfo is available for the target by default. This
# should be autodetected during the configuration of libada and passed down to
# here, but we need something for --disable-libada and hope for the best.
-@@ -2572,23 +2573,23 @@ common-tools: ../stamp-tools
+@@ -2601,23 +2602,23 @@ common-tools: ../stamp-tools
gnatchop gnatcmd gnatkr gnatls gnatprep gnatxref gnatfind gnatname \
gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS)
$(GNATLINK) -v gnatcmd -o ../../gnat$(exeext) \
@@ -45,7 +45,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
../../gnatdll$(exeext): ../stamp-tools
$(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
-@@ -2817,14 +2818,14 @@ gnatlib-shared-default:
+@@ -2846,14 +2847,14 @@ gnatlib-shared-default:
-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
@@ -62,7 +62,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
libgnat$(soext)
cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-@@ -2835,6 +2836,7 @@ gnatlib-shared-dual:
+@@ -2864,6 +2865,7 @@ gnatlib-shared-dual:
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
@@ -70,7 +70,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
gnatlib-shared-default
-@@ -2844,6 +2846,7 @@ gnatlib-shared-dual:
+@@ -2873,6 +2875,7 @@ gnatlib-shared-dual:
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
@@ -78,7 +78,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
gnatlib
-@@ -2931,6 +2934,7 @@ gnatlib-shared:
+@@ -2960,6 +2963,7 @@ gnatlib-shared:
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
@@ -86,7 +86,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
-@@ -2976,6 +2980,7 @@ gnatlib-zcx:
+@@ -3005,6 +3009,7 @@ gnatlib-zcx:
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
diff --git a/debian/patches/ada-hurd.diff b/debian/patches/ada-hurd.diff
deleted file mode 100644
index fcf17e6..0000000
--- a/debian/patches/ada-hurd.diff
+++ /dev/null
@@ -1,152 +0,0 @@
-Index: b/src/gcc/ada/s-osinte-gnu.adb
-===================================================================
---- /dev/null
-+++ b/src/gcc/ada/s-osinte-gnu.adb
-@@ -0,0 +1,147 @@
-+------------------------------------------------------------------------------
-+-- --
-+-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
-+-- --
-+-- S Y S T E M . O S _ I N T E R F A C E --
-+-- --
-+-- B o d y --
-+-- --
-+-- Copyright (C) 1991-1994, Florida State University --
-+-- Copyright (C) 1995-2006, AdaCore --
-+-- --
-+-- GNARL is free software; you can redistribute it and/or modify it under --
-+-- terms of the GNU General Public License as published by the Free Soft- --
-+-- ware Foundation; either version 2, or (at your option) any later ver- --
-+-- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
-+-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-+-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-+-- for more details. You should have received a copy of the GNU General --
-+-- Public License distributed with GNARL; see file COPYING. If not, write --
-+-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
-+-- Boston, MA 02110-1301, USA. --
-+-- --
-+-- As a special exception, if other files instantiate generics from this --
-+-- unit, or you link this unit with other files to produce an executable, --
-+-- this unit does not by itself cause the resulting executable to be --
-+-- covered by the GNU General Public License. This exception does not --
-+-- however invalidate any other reasons why the executable file might be --
-+-- covered by the GNU Public License. --
-+-- --
-+-- GNARL was developed by the GNARL team at Florida State University. --
-+-- Extensive contributions were provided by Ada Core Technologies, Inc. --
-+-- --
-+------------------------------------------------------------------------------
-+
-+-- This is the GNU/Hurd version of this package.
-+
-+pragma Polling (Off);
-+-- Turn off polling, we do not want ATC polling to take place during
-+-- tasking operations. It causes infinite loops and other problems.
-+
-+-- This package encapsulates all direct interfaces to OS services
-+-- that are needed by children of System.
-+
-+package body System.OS_Interface is
-+
-+ --------------------
-+ -- Get_Stack_Base --
-+ --------------------
-+
-+ function Get_Stack_Base (thread : pthread_t) return Address is
-+ pragma Warnings (Off, thread);
-+
-+ begin
-+ return Null_Address;
-+ end Get_Stack_Base;
-+
-+ ------------------
-+ -- pthread_init --
-+ ------------------
-+
-+ procedure pthread_init is
-+ begin
-+ null;
-+ end pthread_init;
-+
-+ --------------------------------------
-+ -- pthread_mutexattr_setprioceiling --
-+ --------------------------------------
-+
-+ function pthread_mutexattr_setprioceiling
-+ (attr : access pthread_mutexattr_t;
-+ prioceiling : int) return int is
-+ pragma Unreferenced (attr, prioceiling);
-+ begin
-+ return 0;
-+ end pthread_mutexattr_setprioceiling;
-+
-+ --------------------------------------
-+ -- pthread_mutexattr_getprioceiling --
-+ --------------------------------------
-+
-+ function pthread_mutexattr_getprioceiling
-+ (attr : access pthread_mutexattr_t;
-+ prioceiling : access int) return int is
-+ pragma Unreferenced (attr, prioceiling);
-+ begin
-+ return 0;
-+ end pthread_mutexattr_getprioceiling;
-+
-+ ---------------------------
-+ -- pthread_setschedparam --
-+ ---------------------------
-+
-+ function pthread_setschedparam
-+ (thread : pthread_t;
-+ policy : int;
-+ param : access struct_sched_param) return int is
-+ pragma Unreferenced (thread, policy, param);
-+ begin
-+ return 0;
-+ end pthread_setschedparam;
-+
-+ -----------------
-+ -- To_Duration --
-+ -----------------
-+
-+ function To_Duration (TS : timespec) return Duration is
-+ begin
-+ return Duration (TS.tv_sec) + Duration (TS.tv_nsec) / 10#1#E9;
-+ end To_Duration;
-+
-+ ------------------------
-+ -- To_Target_Priority --
-+ ------------------------
-+
-+ function To_Target_Priority
-+ (Prio : System.Any_Priority) return Interfaces.C.int
-+ is
-+ begin
-+ return Interfaces.C.int (Prio);
-+ end To_Target_Priority;
-+
-+ -----------------
-+ -- To_Timespec --
-+ -----------------
-+
-+ function To_Timespec (D : Duration) return timespec is
-+ S : time_t;
-+ F : Duration;
-+
-+ begin
-+ S := time_t (Long_Long_Integer (D));
-+ F := D - Duration (S);
-+
-+ -- If F has negative value due to a round-up, adjust for positive F
-+ -- value.
-+
-+ if F < 0.0 then
-+ S := S - 1;
-+ F := F + 1.0;
-+ end if;
-+
-+ return timespec'(tv_sec => S,
-+ tv_nsec => long (Long_Long_Integer (F * 10#1#E9)));
-+ end To_Timespec;
-+
-+end System.OS_Interface;
diff --git a/debian/patches/ada-libgnatprj.diff b/debian/patches/ada-libgnatprj.diff
index b7c2c96..191f6fe 100644
--- a/debian/patches/ada-libgnatprj.diff
+++ b/debian/patches/ada-libgnatprj.diff
@@ -547,7 +547,7 @@ Index: b/src/Makefile.in
maintainer-clean-target: maybe-maintainer-clean-target-libgomp
maintainer-clean-target: maybe-maintainer-clean-target-libitm
maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2454,6 +2469,7 @@ check-target: \
+@@ -2455,6 +2470,7 @@ check-target: \
maybe-check-target-rda \
maybe-check-target-libada \
maybe-check-target-libgnatvsn \
@@ -555,7 +555,7 @@ Index: b/src/Makefile.in
maybe-check-target-libgomp \
maybe-check-target-libitm \
maybe-check-target-libatomic
-@@ -2639,6 +2655,7 @@ install-target: \
+@@ -2640,6 +2656,7 @@ install-target: \
maybe-install-target-rda \
maybe-install-target-libada \
maybe-install-target-libgnatvsn \
@@ -563,7 +563,7 @@ Index: b/src/Makefile.in
maybe-install-target-libgomp \
maybe-install-target-libitm \
maybe-install-target-libatomic
-@@ -2748,6 +2765,7 @@ install-strip-target: \
+@@ -2749,6 +2766,7 @@ install-strip-target: \
maybe-install-strip-target-rda \
maybe-install-strip-target-libada \
maybe-install-strip-target-libgnatvsn \
@@ -571,7 +571,7 @@ Index: b/src/Makefile.in
maybe-install-strip-target-libgomp \
maybe-install-strip-target-libitm \
maybe-install-strip-target-libatomic
-@@ -46414,6 +46432,362 @@ maintainer-clean-target-libgnatvsn:
+@@ -46415,6 +46433,362 @@ maintainer-clean-target-libgnatvsn:
@@ -934,7 +934,7 @@ Index: b/src/Makefile.in
.PHONY: configure-target-libgomp maybe-configure-target-libgomp
maybe-configure-target-libgomp:
@if gcc-bootstrap
-@@ -50619,6 +50993,7 @@ configure-target-boehm-gc: stage_last
+@@ -50620,6 +50994,7 @@ configure-target-boehm-gc: stage_last
configure-target-rda: stage_last
configure-target-libada: stage_last
configure-target-libgnatvsn: stage_last
@@ -942,7 +942,7 @@ Index: b/src/Makefile.in
configure-stage1-target-libgomp: maybe-all-stage1-gcc
configure-stage2-target-libgomp: maybe-all-stage2-gcc
configure-stage3-target-libgomp: maybe-all-stage3-gcc
-@@ -50655,6 +51030,7 @@ configure-target-boehm-gc: maybe-all-gcc
+@@ -50656,6 +51031,7 @@ configure-target-boehm-gc: maybe-all-gcc
configure-target-rda: maybe-all-gcc
configure-target-libada: maybe-all-gcc
configure-target-libgnatvsn: maybe-all-gcc
@@ -950,7 +950,7 @@ Index: b/src/Makefile.in
configure-target-libgomp: maybe-all-gcc
configure-target-libitm: maybe-all-gcc
configure-target-libatomic: maybe-all-gcc
-@@ -51029,8 +51405,12 @@ all-stagefeedback-fixincludes: maybe-all
+@@ -51030,8 +51406,12 @@ all-stagefeedback-fixincludes: maybe-all
all-target-libada: maybe-all-gcc
all-gnattools: maybe-all-target-libada
all-gnattools: maybe-all-target-libgnatvsn
@@ -963,7 +963,7 @@ Index: b/src/Makefile.in
all-lto-plugin: maybe-all-libiberty
all-stage1-lto-plugin: maybe-all-stage1-libiberty
-@@ -51627,6 +52007,7 @@ configure-target-boehm-gc: maybe-all-tar
+@@ -51628,6 +52008,7 @@ configure-target-boehm-gc: maybe-all-tar
configure-target-rda: maybe-all-target-libgcc
configure-target-libada: maybe-all-target-libgcc
configure-target-libgnatvsn: maybe-all-target-libgcc
@@ -971,7 +971,7 @@ Index: b/src/Makefile.in
configure-target-libgomp: maybe-all-target-libgcc
configure-target-libitm: maybe-all-target-libgcc
configure-target-libatomic: maybe-all-target-libgcc
-@@ -51683,6 +52064,8 @@ configure-target-libada: maybe-all-targe
+@@ -51684,6 +52065,8 @@ configure-target-libada: maybe-all-targe
configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/debian/patches/ada-libgnatvsn.diff b/debian/patches/ada-libgnatvsn.diff
index 8a8223d..4071d5e 100644
--- a/debian/patches/ada-libgnatvsn.diff
+++ b/debian/patches/ada-libgnatvsn.diff
@@ -405,7 +405,7 @@ Index: b/src/Makefile.in
maintainer-clean-target: maybe-maintainer-clean-target-libgomp
maintainer-clean-target: maybe-maintainer-clean-target-libitm
maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2438,6 +2453,7 @@ check-target: \
+@@ -2439,6 +2454,7 @@ check-target: \
maybe-check-target-boehm-gc \
maybe-check-target-rda \
maybe-check-target-libada \
@@ -413,7 +413,7 @@ Index: b/src/Makefile.in
maybe-check-target-libgomp \
maybe-check-target-libitm \
maybe-check-target-libatomic
-@@ -2622,6 +2638,7 @@ install-target: \
+@@ -2623,6 +2639,7 @@ install-target: \
maybe-install-target-boehm-gc \
maybe-install-target-rda \
maybe-install-target-libada \
@@ -421,7 +421,7 @@ Index: b/src/Makefile.in
maybe-install-target-libgomp \
maybe-install-target-libitm \
maybe-install-target-libatomic
-@@ -2730,6 +2747,7 @@ install-strip-target: \
+@@ -2731,6 +2748,7 @@ install-strip-target: \
maybe-install-strip-target-boehm-gc \
maybe-install-strip-target-rda \
maybe-install-strip-target-libada \
@@ -429,7 +429,7 @@ Index: b/src/Makefile.in
maybe-install-strip-target-libgomp \
maybe-install-strip-target-libitm \
maybe-install-strip-target-libatomic
-@@ -46040,6 +46058,362 @@ maintainer-clean-target-libada:
+@@ -46041,6 +46059,362 @@ maintainer-clean-target-libada:
@@ -792,7 +792,7 @@ Index: b/src/Makefile.in
.PHONY: configure-target-libgomp maybe-configure-target-libgomp
maybe-configure-target-libgomp:
@if gcc-bootstrap
-@@ -50244,6 +50618,7 @@ configure-target-zlib: stage_last
+@@ -50245,6 +50619,7 @@ configure-target-zlib: stage_last
configure-target-boehm-gc: stage_last
configure-target-rda: stage_last
configure-target-libada: stage_last
@@ -800,7 +800,7 @@ Index: b/src/Makefile.in
configure-stage1-target-libgomp: maybe-all-stage1-gcc
configure-stage2-target-libgomp: maybe-all-stage2-gcc
configure-stage3-target-libgomp: maybe-all-stage3-gcc
-@@ -50279,6 +50654,7 @@ configure-target-zlib: maybe-all-gcc
+@@ -50280,6 +50655,7 @@ configure-target-zlib: maybe-all-gcc
configure-target-boehm-gc: maybe-all-gcc
configure-target-rda: maybe-all-gcc
configure-target-libada: maybe-all-gcc
@@ -808,7 +808,7 @@ Index: b/src/Makefile.in
configure-target-libgomp: maybe-all-gcc
configure-target-libitm: maybe-all-gcc
configure-target-libatomic: maybe-all-gcc
-@@ -50652,6 +51028,8 @@ all-stageprofile-fixincludes: maybe-all-
+@@ -50653,6 +51029,8 @@ all-stageprofile-fixincludes: maybe-all-
all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
all-target-libada: maybe-all-gcc
all-gnattools: maybe-all-target-libada
@@ -817,7 +817,7 @@ Index: b/src/Makefile.in
all-gnattools: maybe-all-target-libstdc++-v3
all-lto-plugin: maybe-all-libiberty
-@@ -51248,6 +51626,7 @@ configure-target-zlib: maybe-all-target-
+@@ -51249,6 +51627,7 @@ configure-target-zlib: maybe-all-target-
configure-target-boehm-gc: maybe-all-target-libgcc
configure-target-rda: maybe-all-target-libgcc
configure-target-libada: maybe-all-target-libgcc
@@ -825,7 +825,7 @@ Index: b/src/Makefile.in
configure-target-libgomp: maybe-all-target-libgcc
configure-target-libitm: maybe-all-target-libgcc
configure-target-libatomic: maybe-all-target-libgcc
-@@ -51302,6 +51681,8 @@ configure-target-rda: maybe-all-target-n
+@@ -51303,6 +51682,8 @@ configure-target-rda: maybe-all-target-n
configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/debian/patches/ada-link-lib.diff b/debian/patches/ada-link-lib.diff
index faaefab..4775abb 100644
--- a/debian/patches/ada-link-lib.diff
+++ b/debian/patches/ada-link-lib.diff
@@ -239,7 +239,7 @@ Index: b/src/Makefile.in
maintainer-clean-target: maybe-maintainer-clean-target-libjava
maintainer-clean-target: maybe-maintainer-clean-target-zlib
maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
-@@ -2417,6 +2432,7 @@ check-target: \
+@@ -2418,6 +2433,7 @@ check-target: \
maybe-check-target-winsup \
maybe-check-target-libgloss \
maybe-check-target-libffi \
@@ -247,7 +247,7 @@ Index: b/src/Makefile.in
maybe-check-target-libjava \
maybe-check-target-zlib \
maybe-check-target-boehm-gc \
-@@ -2600,6 +2616,7 @@ install-target: \
+@@ -2601,6 +2617,7 @@ install-target: \
maybe-install-target-winsup \
maybe-install-target-libgloss \
maybe-install-target-libffi \
@@ -255,7 +255,7 @@ Index: b/src/Makefile.in
maybe-install-target-libjava \
maybe-install-target-zlib \
maybe-install-target-boehm-gc \
-@@ -2707,6 +2724,7 @@ install-strip-target: \
+@@ -2708,6 +2725,7 @@ install-strip-target: \
maybe-install-strip-target-winsup \
maybe-install-strip-target-libgloss \
maybe-install-strip-target-libffi \
@@ -263,7 +263,7 @@ Index: b/src/Makefile.in
maybe-install-strip-target-libjava \
maybe-install-strip-target-zlib \
maybe-install-strip-target-boehm-gc \
-@@ -30606,12 +30624,6 @@ maybe-check-gnattools:
+@@ -30607,12 +30625,6 @@ maybe-check-gnattools:
maybe-check-gnattools: check-gnattools
check-gnattools:
@@ -276,7 +276,7 @@ Index: b/src/Makefile.in
@endif gnattools
-@@ -30652,24 +30664,8 @@ maybe-info-gnattools:
+@@ -30653,24 +30665,8 @@ maybe-info-gnattools:
@if gnattools
maybe-info-gnattools: info-gnattools
@@ -303,7 +303,7 @@ Index: b/src/Makefile.in
@endif gnattools
-@@ -30678,24 +30674,8 @@ maybe-dvi-gnattools:
+@@ -30679,24 +30675,8 @@ maybe-dvi-gnattools:
@if gnattools
maybe-dvi-gnattools: dvi-gnattools
@@ -330,7 +330,7 @@ Index: b/src/Makefile.in
@endif gnattools
-@@ -30730,24 +30710,8 @@ maybe-html-gnattools:
+@@ -30731,24 +30711,8 @@ maybe-html-gnattools:
@if gnattools
maybe-html-gnattools: html-gnattools
@@ -357,7 +357,7 @@ Index: b/src/Makefile.in
@endif gnattools
-@@ -30756,24 +30720,8 @@ maybe-TAGS-gnattools:
+@@ -30757,24 +30721,8 @@ maybe-TAGS-gnattools:
@if gnattools
maybe-TAGS-gnattools: TAGS-gnattools
@@ -384,7 +384,7 @@ Index: b/src/Makefile.in
@endif gnattools
-@@ -30782,25 +30730,8 @@ maybe-install-info-gnattools:
+@@ -30783,25 +30731,8 @@ maybe-install-info-gnattools:
@if gnattools
maybe-install-info-gnattools: install-info-gnattools
@@ -412,7 +412,7 @@ Index: b/src/Makefile.in
@endif gnattools
-@@ -30863,24 +30794,8 @@ maybe-installcheck-gnattools:
+@@ -30864,24 +30795,8 @@ maybe-installcheck-gnattools:
@if gnattools
maybe-installcheck-gnattools: installcheck-gnattools
@@ -439,7 +439,7 @@ Index: b/src/Makefile.in
@endif gnattools
-@@ -43504,6 +43419,449 @@ maintainer-clean-target-libffi:
+@@ -43505,6 +43420,449 @@ maintainer-clean-target-libffi:
@@ -889,7 +889,7 @@ Index: b/src/Makefile.in
.PHONY: configure-target-libjava maybe-configure-target-libjava
maybe-configure-target-libjava:
@if gcc-bootstrap
-@@ -45411,13 +45769,8 @@ maybe-check-target-libada:
+@@ -45412,13 +45770,8 @@ maybe-check-target-libada:
@if target-libada
maybe-check-target-libada: check-target-libada
@@ -904,7 +904,7 @@ Index: b/src/Makefile.in
@endif target-libada
-@@ -45426,13 +45779,8 @@ maybe-install-target-libada:
+@@ -45427,13 +45780,8 @@ maybe-install-target-libada:
@if target-libada
maybe-install-target-libada: install-target-libada
@@ -920,7 +920,7 @@ Index: b/src/Makefile.in
@endif target-libada
-@@ -45441,13 +45789,8 @@ maybe-install-strip-target-libada:
+@@ -45442,13 +45790,8 @@ maybe-install-strip-target-libada:
@if target-libada
maybe-install-strip-target-libada: install-strip-target-libada
@@ -936,7 +936,7 @@ Index: b/src/Makefile.in
@endif target-libada
-@@ -45458,24 +45801,8 @@ maybe-info-target-libada:
+@@ -45459,24 +45802,8 @@ maybe-info-target-libada:
@if target-libada
maybe-info-target-libada: info-target-libada
@@ -963,7 +963,7 @@ Index: b/src/Makefile.in
@endif target-libada
-@@ -45484,24 +45811,8 @@ maybe-dvi-target-libada:
+@@ -45485,24 +45812,8 @@ maybe-dvi-target-libada:
@if target-libada
maybe-dvi-target-libada: dvi-target-libada
@@ -990,7 +990,7 @@ Index: b/src/Makefile.in
@endif target-libada
-@@ -45536,24 +45847,8 @@ maybe-html-target-libada:
+@@ -45537,24 +45848,8 @@ maybe-html-target-libada:
@if target-libada
maybe-html-target-libada: html-target-libada
@@ -1017,7 +1017,7 @@ Index: b/src/Makefile.in
@endif target-libada
-@@ -45562,24 +45857,8 @@ maybe-TAGS-target-libada:
+@@ -45563,24 +45858,8 @@ maybe-TAGS-target-libada:
@if target-libada
maybe-TAGS-target-libada: TAGS-target-libada
@@ -1044,7 +1044,7 @@ Index: b/src/Makefile.in
@endif target-libada
-@@ -45588,25 +45867,8 @@ maybe-install-info-target-libada:
+@@ -45589,25 +45868,8 @@ maybe-install-info-target-libada:
@if target-libada
maybe-install-info-target-libada: install-info-target-libada
@@ -1072,7 +1072,7 @@ Index: b/src/Makefile.in
@endif target-libada
-@@ -45669,24 +45931,8 @@ maybe-installcheck-target-libada:
+@@ -45670,24 +45932,8 @@ maybe-installcheck-target-libada:
@if target-libada
maybe-installcheck-target-libada: installcheck-target-libada
@@ -1099,7 +1099,7 @@ Index: b/src/Makefile.in
@endif target-libada
-@@ -49992,6 +50238,7 @@ configure-target-libtermcap: stage_last
+@@ -49993,6 +50239,7 @@ configure-target-libtermcap: stage_last
configure-target-winsup: stage_last
configure-target-libgloss: stage_last
configure-target-libffi: stage_last
@@ -1107,7 +1107,7 @@ Index: b/src/Makefile.in
configure-target-libjava: stage_last
configure-target-zlib: stage_last
configure-target-boehm-gc: stage_last
-@@ -50026,6 +50273,7 @@ configure-target-libtermcap: maybe-all-g
+@@ -50027,6 +50274,7 @@ configure-target-libtermcap: maybe-all-g
configure-target-winsup: maybe-all-gcc
configure-target-libgloss: maybe-all-gcc
configure-target-libffi: maybe-all-gcc
@@ -1115,7 +1115,7 @@ Index: b/src/Makefile.in
configure-target-libjava: maybe-all-gcc
configure-target-zlib: maybe-all-gcc
configure-target-boehm-gc: maybe-all-gcc
-@@ -50402,6 +50650,7 @@ all-stage3-fixincludes: maybe-all-stage3
+@@ -50403,6 +50651,7 @@ all-stage3-fixincludes: maybe-all-stage3
all-stage4-fixincludes: maybe-all-stage4-libiberty
all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
@@ -1123,7 +1123,7 @@ Index: b/src/Makefile.in
all-gnattools: maybe-all-target-libada
all-gnattools: maybe-all-target-libstdc++-v3
all-lto-plugin: maybe-all-libiberty
-@@ -50993,6 +51242,7 @@ configure-target-libtermcap: maybe-all-t
+@@ -50994,6 +51243,7 @@ configure-target-libtermcap: maybe-all-t
configure-target-winsup: maybe-all-target-libgcc
configure-target-libgloss: maybe-all-target-libgcc
configure-target-libffi: maybe-all-target-libgcc
@@ -1131,7 +1131,7 @@ Index: b/src/Makefile.in
configure-target-libjava: maybe-all-target-libgcc
configure-target-zlib: maybe-all-target-libgcc
configure-target-boehm-gc: maybe-all-target-libgcc
-@@ -51040,6 +51290,7 @@ configure-target-winsup: maybe-all-targe
+@@ -51041,6 +51291,7 @@ configure-target-winsup: maybe-all-targe
configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
configure-target-libffi: maybe-all-target-libstdc++-v3
diff --git a/debian/patches/ada-sjlj.diff b/debian/patches/ada-sjlj.diff
index c99033f..cf66ed5 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -499,7 +499,7 @@ Index: b/src/Makefile.in
maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
maintainer-clean-target: maybe-maintainer-clean-target-libgnatprj
maintainer-clean-target: maybe-maintainer-clean-target-libgomp
-@@ -2468,6 +2483,7 @@ check-target: \
+@@ -2469,6 +2484,7 @@ check-target: \
maybe-check-target-boehm-gc \
maybe-check-target-rda \
maybe-check-target-libada \
@@ -507,7 +507,7 @@ Index: b/src/Makefile.in
maybe-check-target-libgnatvsn \
maybe-check-target-libgnatprj \
maybe-check-target-libgomp \
-@@ -2654,6 +2670,7 @@ install-target: \
+@@ -2655,6 +2671,7 @@ install-target: \
maybe-install-target-boehm-gc \
maybe-install-target-rda \
maybe-install-target-libada \
@@ -515,7 +515,7 @@ Index: b/src/Makefile.in
maybe-install-target-libgnatvsn \
maybe-install-target-libgnatprj \
maybe-install-target-libgomp \
-@@ -2764,6 +2781,7 @@ install-strip-target: \
+@@ -2765,6 +2782,7 @@ install-strip-target: \
maybe-install-strip-target-boehm-gc \
maybe-install-strip-target-rda \
maybe-install-strip-target-libada \
@@ -523,7 +523,7 @@ Index: b/src/Makefile.in
maybe-install-strip-target-libgnatvsn \
maybe-install-strip-target-libgnatprj \
maybe-install-strip-target-libgomp \
-@@ -46076,6 +46094,352 @@ maintainer-clean-target-libada:
+@@ -46077,6 +46095,352 @@ maintainer-clean-target-libada:
@@ -876,7 +876,7 @@ Index: b/src/Makefile.in
.PHONY: configure-target-libgnatvsn maybe-configure-target-libgnatvsn
maybe-configure-target-libgnatvsn:
@if gcc-bootstrap
-@@ -50992,6 +51356,7 @@ configure-target-zlib: stage_last
+@@ -50993,6 +51357,7 @@ configure-target-zlib: stage_last
configure-target-boehm-gc: stage_last
configure-target-rda: stage_last
configure-target-libada: stage_last
@@ -884,7 +884,7 @@ Index: b/src/Makefile.in
configure-target-libgnatvsn: stage_last
configure-target-libgnatprj: stage_last
configure-stage1-target-libgomp: maybe-all-stage1-gcc
-@@ -51029,6 +51394,7 @@ configure-target-zlib: maybe-all-gcc
+@@ -51030,6 +51395,7 @@ configure-target-zlib: maybe-all-gcc
configure-target-boehm-gc: maybe-all-gcc
configure-target-rda: maybe-all-gcc
configure-target-libada: maybe-all-gcc
@@ -892,7 +892,7 @@ Index: b/src/Makefile.in
configure-target-libgnatvsn: maybe-all-gcc
configure-target-libgnatprj: maybe-all-gcc
configure-target-libgomp: maybe-all-gcc
-@@ -51403,6 +51769,7 @@ all-stage4-fixincludes: maybe-all-stage4
+@@ -51404,6 +51770,7 @@ all-stage4-fixincludes: maybe-all-stage4
all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
all-target-libada: maybe-all-gcc
@@ -900,7 +900,7 @@ Index: b/src/Makefile.in
all-gnattools: maybe-all-target-libada
all-gnattools: maybe-all-target-libgnatvsn
all-gnattools: maybe-all-target-libgnatprj
-@@ -52006,6 +52373,7 @@ configure-target-zlib: maybe-all-target-
+@@ -52007,6 +52374,7 @@ configure-target-zlib: maybe-all-target-
configure-target-boehm-gc: maybe-all-target-libgcc
configure-target-rda: maybe-all-target-libgcc
configure-target-libada: maybe-all-target-libgcc
@@ -908,7 +908,7 @@ Index: b/src/Makefile.in
configure-target-libgnatvsn: maybe-all-target-libgcc
configure-target-libgnatprj: maybe-all-target-libgcc
configure-target-libgomp: maybe-all-target-libgcc
-@@ -52062,6 +52430,8 @@ configure-target-rda: maybe-all-target-n
+@@ -52063,6 +52431,8 @@ configure-target-rda: maybe-all-target-n
configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/debian/patches/arm-multilib-defaults.diff b/debian/patches/arm-multilib-defaults.diff
index b551fcd..d1ae8cb 100644
--- a/debian/patches/arm-multilib-defaults.diff
+++ b/debian/patches/arm-multilib-defaults.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/config.gcc
===================================================================
--- a/src/gcc/config.gcc
+++ b/src/gcc/config.gcc
-@@ -3723,10 +3723,18 @@ case "${target}" in
+@@ -3729,10 +3729,18 @@ case "${target}" in
fi
case "$with_float" in
@@ -25,7 +25,7 @@ Index: b/src/gcc/config.gcc
*)
echo "Unknown floating point type used in --with-float=$with_float" 1>&2
exit 1
-@@ -3760,6 +3768,9 @@ case "${target}" in
+@@ -3766,6 +3774,9 @@ case "${target}" in
"" \
| arm | thumb )
#OK
diff --git a/debian/patches/g++-multiarch-incdir.diff b/debian/patches/g++-multiarch-incdir.diff
index 9a91953..ce27865 100644
--- a/debian/patches/g++-multiarch-incdir.diff
+++ b/debian/patches/g++-multiarch-incdir.diff
@@ -39,7 +39,7 @@ Index: b/src/gcc/Makefile.in
"build_tooldir=$(build_tooldir)" \
"gcc_tooldir=$(gcc_tooldir)" \
"bindir=$(bindir)" \
-@@ -1635,6 +1636,14 @@ ifneq ($(xmake_file),)
+@@ -1636,6 +1637,14 @@ ifneq ($(xmake_file),)
include $(xmake_file)
endif
@@ -54,7 +54,7 @@ Index: b/src/gcc/Makefile.in
# all-tree.def includes all the tree.def files.
all-tree.def: s-alltree; @true
s-alltree: Makefile
-@@ -2672,7 +2681,7 @@ PREPROCESSOR_DEFINES = \
+@@ -2673,7 +2682,7 @@ PREPROCESSOR_DEFINES = \
-DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
diff --git a/debian/patches/gcc-base-version.diff b/debian/patches/gcc-base-version.diff
index 302f1fc..e06fd37 100644
--- a/debian/patches/gcc-base-version.diff
+++ b/debian/patches/gcc-base-version.diff
@@ -4,15 +4,15 @@ Index: b/src/gcc/BASE-VER
===================================================================
--- a/src/gcc/BASE-VER
+++ b/src/gcc/BASE-VER
-@@ -1,1 +1,1 @@
--6.0.1
+@@ -1 +1 @@
+-6.1.0
+6
Index: b/src/gcc/FULL-VER
===================================================================
--- /dev/null
+++ b/src/gcc/FULL-VER
-@@ -0,0 +1,1 @@
-+6.0.1
+@@ -0,0 +1 @@
++6.1.0
Index: b/src/gcc/Makefile.in
===================================================================
--- a/src/gcc/Makefile.in
@@ -40,7 +40,7 @@ Index: b/src/gcc/Makefile.in
DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
DATESTAMP_s := \
"\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\""
-@@ -2014,8 +2017,8 @@ default-c.o: config/default-c.c
+@@ -2015,8 +2018,8 @@ default-c.o: config/default-c.c
# Files used by all variants of C and some other languages.
@@ -51,7 +51,7 @@ Index: b/src/gcc/Makefile.in
# Language-independent files.
-@@ -2023,7 +2026,8 @@ DRIVER_DEFINES = \
+@@ -2024,7 +2027,8 @@ DRIVER_DEFINES = \
-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
-DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
@@ -61,7 +61,7 @@ Index: b/src/gcc/Makefile.in
-DDEFAULT_REAL_TARGET_MACHINE=\"$(real_target_noncanonical)\" \
-DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
-DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
-@@ -2073,20 +2077,20 @@ s-options-h: optionlist $(srcdir)/opt-fu
+@@ -2074,20 +2078,20 @@ s-options-h: optionlist $(srcdir)/opt-fu
dumpvers: dumpvers.c
@@ -88,7 +88,7 @@ Index: b/src/gcc/Makefile.in
echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h
$(STAMP) s-bversion
-@@ -2453,9 +2457,9 @@ build/%.o : # dependencies provided by
+@@ -2454,9 +2458,9 @@ build/%.o : # dependencies provided by
## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs
## several C macro definitions, just like version.o
build/version.o: version.c version.h \
@@ -100,7 +100,7 @@ Index: b/src/gcc/Makefile.in
-DREVISION=$(REVISION_s) \
-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
-DBUGURL=$(BUGURL_s) -o $@ $<
-@@ -2678,8 +2682,8 @@ PREPROCESSOR_DEFINES = \
+@@ -2679,8 +2683,8 @@ PREPROCESSOR_DEFINES = \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
@TARGET_SYSTEM_ROOT_DEFINE@
@@ -111,7 +111,7 @@ Index: b/src/gcc/Makefile.in
CFLAGS-cppdefault.o += $(PREPROCESSOR_DEFINES)
-@@ -2695,8 +2699,8 @@ build/gcov-iov$(build_exeext): build/gco
+@@ -2696,8 +2700,8 @@ build/gcov-iov$(build_exeext): build/gco
build/gcov-iov.o -o $@
gcov-iov.h: s-iov
@@ -122,7 +122,7 @@ Index: b/src/gcc/Makefile.in
> tmp-gcov-iov.h
$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h
$(STAMP) s-iov
-@@ -2975,8 +2979,8 @@ TEXI_GCCINSTALL_FILES = install.texi ins
+@@ -2976,8 +2980,8 @@ TEXI_GCCINSTALL_FILES = install.texi ins
TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi
# gcc-vers.texi is generated from the version files.
diff --git a/debian/patches/gcc-gfdl-build.diff b/debian/patches/gcc-gfdl-build.diff
index 7451cd5..cce9729 100644
--- a/debian/patches/gcc-gfdl-build.diff
+++ b/debian/patches/gcc-gfdl-build.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/Makefile.in
===================================================================
--- a/src/gcc/Makefile.in
+++ b/src/gcc/Makefile.in
-@@ -2311,30 +2311,8 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
+@@ -2312,30 +2312,8 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
# \r is not portable to Solaris tr, therefore we have a special
# case for ASCII. We use \r for other encodings like EBCDIC.
s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index 977c706..7e34ff6 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -124,7 +124,7 @@ Index: b/src/gcc/config.gcc
mips64*-*-linux* | mipsisa64*-*-linux*)
default_mips_abi=n32
enable_mips_multilibs="yes"
-@@ -4409,7 +4413,7 @@ case ${target} in
+@@ -4415,7 +4419,7 @@ case ${target} in
i[34567]86-*-darwin* | x86_64-*-darwin*)
;;
i[34567]86-*-linux* | x86_64-*-linux*)
diff --git a/debian/patches/gcc-textdomain.diff b/debian/patches/gcc-textdomain.diff
index bf93021..c7dadf3 100644
--- a/debian/patches/gcc-textdomain.diff
+++ b/debian/patches/gcc-textdomain.diff
@@ -19,7 +19,7 @@ Index: b/src/gcc/Makefile.in
===================================================================
--- a/src/gcc/Makefile.in
+++ b/src/gcc/Makefile.in
-@@ -3994,8 +3994,8 @@ install-po:
+@@ -3995,8 +3995,8 @@ install-po:
dir=$(localedir)/$$lang/LC_MESSAGES; \
echo $(mkinstalldirs) $(DESTDIR)$$dir; \
$(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
diff --git a/debian/patches/gdc-6.diff b/debian/patches/gdc-6.diff
index 67b28bb..fff27da 100644
--- a/debian/patches/gdc-6.diff
+++ b/debian/patches/gdc-6.diff
@@ -49,7 +49,7 @@ Index: b/src/gcc/config/rs6000/rs6000.c
===================================================================
--- a/src/gcc/config/rs6000/rs6000.c
+++ b/src/gcc/config/rs6000/rs6000.c
-@@ -27426,7 +27426,8 @@ rs6000_output_function_epilogue (FILE *f
+@@ -27446,7 +27446,8 @@ rs6000_output_function_epilogue (FILE *f
if (lang_GNU_C ()
|| ! strcmp (language_string, "GNU GIMPLE")
|| ! strcmp (language_string, "GNU Go")
diff --git a/debian/patches/gdc-libphobos-build.diff b/debian/patches/gdc-libphobos-build.diff
index 4cac266..31ec133 100644
--- a/debian/patches/gdc-libphobos-build.diff
+++ b/debian/patches/gdc-libphobos-build.diff
@@ -398,7 +398,7 @@ Index: b/src/Makefile.in
maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
maintainer-clean-target: maybe-maintainer-clean-target-winsup
maintainer-clean-target: maybe-maintainer-clean-target-libgloss
-@@ -2473,6 +2496,7 @@ check-target: \
+@@ -2474,6 +2497,7 @@ check-target: \
maybe-check-target-libgfortran \
maybe-check-target-libobjc \
maybe-check-target-libgo \
@@ -406,7 +406,7 @@ Index: b/src/Makefile.in
maybe-check-target-libtermcap \
maybe-check-target-winsup \
maybe-check-target-libgloss \
-@@ -2660,6 +2684,7 @@ install-target: \
+@@ -2661,6 +2685,7 @@ install-target: \
maybe-install-target-libgfortran \
maybe-install-target-libobjc \
maybe-install-target-libgo \
@@ -414,7 +414,7 @@ Index: b/src/Makefile.in
maybe-install-target-libtermcap \
maybe-install-target-winsup \
maybe-install-target-libgloss \
-@@ -2771,6 +2796,7 @@ install-strip-target: \
+@@ -2772,6 +2797,7 @@ install-strip-target: \
maybe-install-strip-target-libgfortran \
maybe-install-strip-target-libobjc \
maybe-install-strip-target-libgo \
@@ -422,7 +422,7 @@ Index: b/src/Makefile.in
maybe-install-strip-target-libtermcap \
maybe-install-strip-target-winsup \
maybe-install-strip-target-libgloss \
-@@ -41721,6 +41747,464 @@ maintainer-clean-target-libgo:
+@@ -41722,6 +41748,464 @@ maintainer-clean-target-libgo:
@@ -887,7 +887,7 @@ Index: b/src/Makefile.in
.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
maybe-configure-target-libtermcap:
@if gcc-bootstrap
-@@ -49140,6 +49624,14 @@ check-gcc-go:
+@@ -49141,6 +49625,14 @@ check-gcc-go:
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-go);
check-go: check-gcc-go check-target-libgo
@@ -902,7 +902,7 @@ Index: b/src/Makefile.in
# The gcc part of install-no-fixedincludes, which relies on an intimate
# knowledge of how a number of gcc internal targets (inter)operate. Delegate.
-@@ -51346,6 +51838,7 @@ configure-target-libquadmath: stage_last
+@@ -51347,6 +51839,7 @@ configure-target-libquadmath: stage_last
configure-target-libgfortran: stage_last
configure-target-libobjc: stage_last
configure-target-libgo: stage_last
@@ -910,7 +910,7 @@ Index: b/src/Makefile.in
configure-target-libtermcap: stage_last
configure-target-winsup: stage_last
configure-target-libgloss: stage_last
-@@ -51384,6 +51877,7 @@ configure-target-libquadmath: maybe-all-
+@@ -51385,6 +51878,7 @@ configure-target-libquadmath: maybe-all-
configure-target-libgfortran: maybe-all-gcc
configure-target-libobjc: maybe-all-gcc
configure-target-libgo: maybe-all-gcc
@@ -918,7 +918,7 @@ Index: b/src/Makefile.in
configure-target-libtermcap: maybe-all-gcc
configure-target-winsup: maybe-all-gcc
configure-target-libgloss: maybe-all-gcc
-@@ -52245,6 +52739,8 @@ configure-target-libgo: maybe-all-target
+@@ -52246,6 +52740,8 @@ configure-target-libgo: maybe-all-target
all-target-libgo: maybe-all-target-libbacktrace
all-target-libgo: maybe-all-target-libffi
all-target-libgo: maybe-all-target-libatomic
@@ -927,7 +927,7 @@ Index: b/src/Makefile.in
configure-target-libjava: maybe-configure-target-zlib
configure-target-libjava: maybe-configure-target-boehm-gc
configure-target-libjava: maybe-configure-target-libffi
-@@ -52363,6 +52859,7 @@ configure-target-libquadmath: maybe-all-
+@@ -52364,6 +52860,7 @@ configure-target-libquadmath: maybe-all-
configure-target-libgfortran: maybe-all-target-libgcc
configure-target-libobjc: maybe-all-target-libgcc
configure-target-libgo: maybe-all-target-libgcc
@@ -935,7 +935,7 @@ Index: b/src/Makefile.in
configure-target-libtermcap: maybe-all-target-libgcc
configure-target-winsup: maybe-all-target-libgcc
configure-target-libgloss: maybe-all-target-libgcc
-@@ -52410,6 +52907,8 @@ configure-target-libobjc: maybe-all-targ
+@@ -52411,6 +52908,8 @@ configure-target-libobjc: maybe-all-targ
configure-target-libgo: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/debian/patches/gdc-versym-os.diff b/debian/patches/gdc-versym-os.diff
index 2c3b297..9286ee6 100644
--- a/debian/patches/gdc-versym-os.diff
+++ b/debian/patches/gdc-versym-os.diff
@@ -110,7 +110,7 @@ Index: b/src/gcc/config/gnu.h
===================================================================
--- a/src/gcc/config/gnu.h
+++ b/src/gcc/config/gnu.h
-@@ -39,3 +39,11 @@ along with GCC. If not, see <http://www
+@@ -31,3 +31,11 @@ along with GCC. If not, see <http://www
builtin_assert ("system=unix"); \
builtin_assert ("system=posix"); \
} while (0)
diff --git a/debian/patches/libgnatprj-cross-hack.diff b/debian/patches/libgnatprj-cross-hack.diff
index b47440a..d24be75 100644
--- a/debian/patches/libgnatprj-cross-hack.diff
+++ b/debian/patches/libgnatprj-cross-hack.diff
@@ -22,7 +22,7 @@ Index: b/src/gcc/system.h
===================================================================
--- a/src/gcc/system.h
+++ b/src/gcc/system.h
-@@ -666,8 +666,10 @@ extern int vsnprintf (char *, size_t, co
+@@ -678,8 +678,10 @@ extern int vsnprintf (char *, size_t, co
/* Do not introduce a gmp.h dependency on the build system. */
#ifndef GENERATOR_FILE
diff --git a/debian/patches/pr67590.diff b/debian/patches/pr67590.diff
index c8fde66..b730f4e 100644
--- a/debian/patches/pr67590.diff
+++ b/debian/patches/pr67590.diff
@@ -1,10 +1,10 @@
# DP: Fix PR67590, setting objdump macro.
-Index: gcc-5-5.2.1/src/libcc1/configure.ac
+Index: b/src/libcc1/configure.ac
===================================================================
---- gcc-5-5.2.1.orig/src/libcc1/configure.ac
-+++ gcc-5-5.2.1/src/libcc1/configure.ac
-@@ -63,6 +63,31 @@ if test "$GXX" = yes; then
+--- a/src/libcc1/configure.ac
++++ b/src/libcc1/configure.ac
+@@ -64,6 +64,31 @@ if test "$GXX" = yes; then
fi
AC_SUBST(libsuffix)
diff --git a/debian/patches/sparc-force-cpu.diff b/debian/patches/sparc-force-cpu.diff
index 4f5b7f1..fde4b11 100644
--- a/debian/patches/sparc-force-cpu.diff
+++ b/debian/patches/sparc-force-cpu.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/config.gcc
===================================================================
--- a/src/gcc/config.gcc
+++ b/src/gcc/config.gcc
-@@ -4537,6 +4537,20 @@ do
+@@ -4543,6 +4543,20 @@ do
;;
esac
diff --git a/debian/rules.conf b/debian/rules.conf
index 01643d1..3b0a66d 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -614,9 +614,9 @@ NEXT_GCC_VERSION := $(shell echo $(GCC_VERSION) | \
awk -F. '{OFS="."; if (NF==2) $$3=1; else $$NF += 1; print}')
# first version with a new path component in gcc_lib_dir (i.e. GCC_VERSION
# or TARGET_ALIAS changes), or last version available for all architectures
-DEB_GCC_SOFT_VERSION := 6-20160103-1
-DEB_GCJ_SOFT_VERSION := 6-20160103-1
-DEB_GNAT_SOFT_VERSION := 6-20160103-1
+DEB_GCC_SOFT_VERSION := 6.0.1-1
+DEB_GCJ_SOFT_VERSION := 6.0.1-1
+DEB_GNAT_SOFT_VERSION := 6.0.1-1
ifeq ($(with_d),yes)
GDC_VERSION := $(BASE_VERSION)
@@ -884,6 +884,9 @@ ifeq ($(with_libqmath),yes)
addons += $(if $(findstring armhf,$(biarchsfarchs)),libsfqmath)
endif
ifeq ($(with_jit),yes)
+ addons += jit
+endif
+ifeq ($(with_libgccjit),yes)
addons += libjit
endif
ifeq ($(with_libcc1),yes)
diff --git a/debian/rules.d/binary-libcc1.mk b/debian/rules.d/binary-libcc1.mk
index c169012..1dba145 100644
--- a/debian/rules.d/binary-libcc1.mk
+++ b/debian/rules.d/binary-libcc1.mk
@@ -1,5 +1,7 @@
-ifneq ($(DEB_CROSS),yes)
- arch_binaries := $(arch_binaries) libcc1
+ifeq ($(with_libcc1),yes)
+ ifneq ($(DEB_CROSS),yes)
+ arch_binaries := $(arch_binaries) libcc1
+ endif
endif
p_cc1 = libcc1-$(CC1_SONAME)
diff --git a/debian/rules.d/binary-libgccjit.mk b/debian/rules.d/binary-libgccjit.mk
index 47e01e0..c5839e7 100644
--- a/debian/rules.d/binary-libgccjit.mk
+++ b/debian/rules.d/binary-libgccjit.mk
@@ -1,12 +1,16 @@
-$(lib_binaries) += libgccjit
+ifeq ($(with_libgccjit),yes)
+ $(lib_binaries) += libgccjit
+endif
+
+$(lib_binaries) += libgccjitdev
ifneq ($(DEB_CROSS),yes)
indep_binaries := $(indep_binaries) libgccjitdoc
endif
p_jitlib = libgccjit$(GCCJIT_SONAME)
+p_jitdbg = libgccjit$(GCCJIT_SONAME)-dbg
p_jitdev = libgccjit$(pkg_ver)-dev
-p_jitdbg = libgccjit$(pkg_ver)-dbg
p_jitdoc = libgccjit$(pkg_ver)-doc
d_jitlib = debian/$(p_jitlib)
@@ -19,27 +23,16 @@ $(binary_stamp)-libgccjit: $(install_jit_stamp)
dh_testroot
mv $(install_stamp) $(install_stamp)-tmp
- rm -rf $(d_jitlib) $(d_jitdev) $(d_jitdbg)
+ rm -rf $(d_jitlib) $(d_jitdbg)
dh_installdirs -p$(p_jitlib) \
$(usr_lib)
-
- dh_installdirs -p$(p_jitdev) \
- $(usr_lib) \
- $(gcc_lib_dir)/include
-
dh_installdirs -p$(p_jitdbg)
$(dh_compat2) dh_movefiles -p$(p_jitlib) \
$(usr_lib)/libgccjit.so.*
rm -f $(d)/$(usr_lib)/libgccjit.so
- $(dh_compat2) dh_movefiles -p$(p_jitdev) \
- $(gcc_lib_dir)/include/libgccjit*.h
- dh_link -p$(p_jitdev) \
- $(usr_lib)/libgccjit.so.$(GCCJIT_SONAME) $(gcc_lib_dir)/libgccjit.so
-
debian/dh_doclink -p$(p_jitlib) $(p_base)
- debian/dh_doclink -p$(p_jitdev) $(p_base)
debian/dh_doclink -p$(p_jitdbg) $(p_base)
dh_strip -p$(p_jitlib) --dbg-package=$(p_jitdbg)
@@ -48,7 +41,31 @@ $(binary_stamp)-libgccjit: $(install_jit_stamp)
$(ignshld)$(cross_shlibdeps) dh_shlibdeps -p$(p_jitlib) \
$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
$(call cross_mangle_substvars,$(p_jitlib))
- echo $(p_jitlib) $(p_jitdev) $(p_jitdbg) >> debian/arch_binaries
+ echo $(p_jitlib) $(p_jitdbg) >> debian/arch_binaries
+
+ trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+ touch $@
+
+$(binary_stamp)-libgccjitdev: $(install_jit_stamp)
+ dh_testdir
+ dh_testroot
+ mv $(install_stamp) $(install_stamp)-tmp
+
+ rm -rf $(d_jitdev)
+ dh_installdirs -p$(p_jitdev) \
+ $(usr_lib) \
+ $(gcc_lib_dir)/include
+
+ rm -f $(d)/$(usr_lib)/libgccjit.so
+
+ $(dh_compat2) dh_movefiles -p$(p_jitdev) \
+ $(gcc_lib_dir)/include/libgccjit*.h
+ dh_link -p$(p_jitdev) \
+ $(usr_lib)/libgccjit.so.$(GCCJIT_SONAME) $(gcc_lib_dir)/libgccjit.so
+
+ debian/dh_doclink -p$(p_jitdev) $(p_base)
+
+ echo $(p_jitdev) >> debian/arch_binaries
trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
touch $@
diff --git a/debian/rules.defs b/debian/rules.defs
index 8b428d9..996fd0a 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -552,11 +552,19 @@ ifneq (,$(findstring build-cross, $(build_type)))
with_jit := disabled for cross builds
endif
+ifeq ($(with_jit),yes)
+ ifeq ($(with_common_libs),yes)
+ with_libgccjit := yes
+ endif
+endif
+
with_cc1 := yes
with_cc1 := $(call envfilt, cc1, , , $(with_cc1))
ifeq ($(with_cc1),yes)
ifneq ($(DEB_CROSS),yes)
- with_libcc1 := yes
+ ifeq ($(with_common_libs),yes)
+ with_libcc1 := yes
+ endif
endif
endif
ifneq (,$(with_rtlibs))
diff --git a/debian/rules.patch b/debian/rules.patch
index 6dd4c57..91aeb63 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -132,7 +132,6 @@ ifneq (,$(findstring 4.4, $(PKGSOURCE)))
endif
debian_patches += ada-arm
-debian_patches += ada-hurd
debian_patches += ada-kfreebsd
debian_patches += ada-revert-pr63225
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..d3827e7 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+1.0
--
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