* Update to SVN 20140727 (r213100) from the gcc-4_9-branch.

  * Fix PR libobjc/61920, libobjc link failure on powerpc*. Closes: #756096.


git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7534 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

6 files changed, 347 insertions, 327 deletions

diff --git a/debian/changelog b/debian/changelog
index b854524..f331edf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 gcc-4.9 (4.9.1-3) UNRELEASED; urgency=medium
 
+  * Update to SVN 20140727 (r213100) from the gcc-4_9-branch.
   * Fix the GFDL build on AArch64.
+  * Fix PR libobjc/61920, libobjc link failure on powerpc*. Closes: #756096.
 
- -- Matthias Klose <doko@debian.org>  Sat, 26 Jul 2014 09:53:18 +0200
+ -- Matthias Klose <doko@debian.org>  Sun, 27 Jul 2014 15:25:24 +0200
 
 gcc-4.9 (4.9.1-2) unstable; urgency=medium
 
diff --git a/debian/patches/gcc-linaro.diff b/debian/patches/gcc-linaro.diff
index 28457c5..4ec9049 100644
--- a/debian/patches/gcc-linaro.diff
+++ b/debian/patches/gcc-linaro.diff
@@ -35,160 +35,6 @@ LANG=C svn diff svn://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@212635 \
 +2014-04-22  Yvan Roux  <yvan.roux@linaro.org>
 +
 +	GCC Linaro 4.9-2014.04 released.
---- a/src/libitm/configure.tgt
-+++ b/src/libitm/configure.tgt
-@@ -46,6 +46,7 @@
- # Map the target cpu to an ARCH sub-directory.  At the same time,
- # work out any special compilation flags as necessary.
- case "${target_cpu}" in
-+  aarch64*)		ARCH=aarch64 ;;
-   alpha*)		ARCH=alpha ;;
-   rs6000 | powerpc*)
- 	XCFLAGS="${XCFLAGS} -mhtm"
---- a/src/libitm/config/aarch64/sjlj.S
-+++ b/src/libitm/config/aarch64/sjlj.S
-@@ -0,0 +1,93 @@
-+/* Copyright (C) 2014 Free Software Foundation, Inc.
-+   Contributed by Richard Henderson <rth@redhat.com>.
-+
-+   This file is part of the GNU Transactional Memory Library (libitm).
-+
-+   Libitm is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   Libitm is distributed in the hope that it will be useful, but WITHOUT ANY
-+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+   more details.
-+
-+   Under Section 7 of GPL version 3, you are granted additional
-+   permissions described in the GCC Runtime Library Exception, version
-+   3.1, as published by the Free Software Foundation.
-+
-+   You should have received a copy of the GNU General Public License and
-+   a copy of the GCC Runtime Library Exception along with this program;
-+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include "asmcfi.h"
-+
-+	.text
-+	.align	2
-+	.global	_ITM_beginTransaction
-+	.type	_ITM_beginTransaction, %function
-+
-+_ITM_beginTransaction:
-+	cfi_startproc
-+	mov	x1, sp
-+	stp	x29, x30, [sp, -11*16]!
-+	cfi_adjust_cfa_offset(11*16)
-+	cfi_rel_offset(x29, 0)
-+	cfi_rel_offset(x30, 8)
-+	mov	x29, sp
-+	stp	x19, x20, [sp, 1*16]
-+	stp	x21, x22, [sp, 2*16]
-+	stp	x23, x24, [sp, 3*16]
-+	stp	x25, x26, [sp, 4*16]
-+	stp	x27, x28, [sp, 5*16]
-+	stp	d8, d9,   [sp, 6*16]
-+	stp	d10, d11, [sp, 7*16]
-+	stp	d12, d13, [sp, 8*16]
-+	stp	d14, d15, [sp, 9*16]
-+	str	x1, [sp, 10*16]
-+
-+	/* Invoke GTM_begin_transaction with the struct we just built.  */
-+	mov	x1, sp
-+	bl	GTM_begin_transaction
-+
-+	/* Return; we don't need to restore any of the call-saved regs.  */
-+	ldp	x29, x30, [sp]
-+	add     sp, sp, #11*16
-+	cfi_adjust_cfa_offset(-11*16)
-+	cfi_restore(x29)
-+	cfi_restore(x30)
-+	ret
-+	cfi_endproc
-+	.size	_ITM_beginTransaction, . - _ITM_beginTransaction
-+
-+	.align	2
-+	.global	GTM_longjmp
-+	.hidden	GTM_longjmp
-+	.type	GTM_longjmp, %function
-+
-+GTM_longjmp:
-+	/* The first parameter becomes the return value (x0).
-+	   The third parameter is ignored for now.  */
-+	cfi_startproc
-+	ldp	x19, x20, [x1, 1*16]
-+	ldp	x21, x22, [x1, 2*16]
-+	ldp	x23, x24, [x1, 3*16]
-+	ldp	x25, x26, [x1, 4*16]
-+	ldp	x27, x28, [x1, 5*16]
-+	ldp	d8, d9,   [x1, 6*16]
-+	ldp	d10, d11, [x1, 7*16]
-+	ldp	d12, d13, [x1, 8*16]
-+	ldp	d14, d15, [x1, 9*16]
-+	ldr	x3, [x1, 10*16]
-+	ldp	x29, x30, [x1]
-+	cfi_def_cfa(x1, 0)
-+	mov	sp, x3
-+	br	x30
-+	cfi_endproc
-+	.size	GTM_longjmp, . - GTM_longjmp
-+
-+#ifdef __linux__
-+.section .note.GNU-stack, "", %progbits
-+#endif
---- a/src/libitm/config/aarch64/target.h
-+++ b/src/libitm/config/aarch64/target.h
-@@ -0,0 +1,45 @@
-+/* Copyright (C) 2014 Free Software Foundation, Inc.
-+   Contributed by Richard Henderson <rth@redhat.com>.
-+
-+   This file is part of the GNU Transactional Memory Library (libitm).
-+
-+   Libitm is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   Libitm is distributed in the hope that it will be useful, but WITHOUT ANY
-+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+   more details.
-+
-+   Under Section 7 of GPL version 3, you are granted additional
-+   permissions described in the GCC Runtime Library Exception, version
-+   3.1, as published by the Free Software Foundation.
-+
-+   You should have received a copy of the GNU General Public License and
-+   a copy of the GCC Runtime Library Exception along with this program;
-+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+namespace GTM HIDDEN {
-+
-+typedef struct gtm_jmpbuf
-+{
-+  unsigned long long fp;	/* x29 */
-+  unsigned long long pc;	/* x30 */
-+  unsigned long long gr[10];	/* x19-x28 */
-+  unsigned long long vr[8];	/* d8-d15 */
-+  void *cfa;
-+} gtm_jmpbuf;
-+
-+/* ??? The size of one line in hardware caches (in bytes). */
-+#define HW_CACHELINE_SIZE 128
-+
-+static inline void
-+cpu_relax (void)
-+{
-+  __asm volatile ("" : : : "memory");
-+}
-+
-+} // namespace GTM
 --- a/src/libgomp/ChangeLog.linaro
 +++ b/src/libgomp/ChangeLog.linaro
 @@ -0,0 +1,19 @@
diff --git a/debian/patches/libitm-aarch64.diff b/debian/patches/libitm-aarch64.diff
deleted file mode 100644
index faf93cd..0000000
--- a/debian/patches/libitm-aarch64.diff
+++ /dev/null
@@ -1,155 +0,0 @@
-# DP: Build libitm on AArch64, patch taken from the trunk.
---- /dev/null
-+++ b/src/libitm/config/aarch64/sjlj.S
-@@ -0,0 +1,93 @@
-+/* Copyright (C) 2014 Free Software Foundation, Inc.
-+   Contributed by Richard Henderson <rth@redhat.com>.
-+
-+   This file is part of the GNU Transactional Memory Library (libitm).
-+
-+   Libitm is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   Libitm is distributed in the hope that it will be useful, but WITHOUT ANY
-+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+   more details.
-+
-+   Under Section 7 of GPL version 3, you are granted additional
-+   permissions described in the GCC Runtime Library Exception, version
-+   3.1, as published by the Free Software Foundation.
-+
-+   You should have received a copy of the GNU General Public License and
-+   a copy of the GCC Runtime Library Exception along with this program;
-+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include "asmcfi.h"
-+
-+	.text
-+	.align	2
-+	.global	_ITM_beginTransaction
-+	.type	_ITM_beginTransaction, %function
-+
-+_ITM_beginTransaction:
-+	cfi_startproc
-+	mov	x1, sp
-+	stp	x29, x30, [sp, -11*16]!
-+	cfi_adjust_cfa_offset(11*16)
-+	cfi_rel_offset(x29, 0)
-+	cfi_rel_offset(x30, 8)
-+	mov	x29, sp
-+	stp	x19, x20, [sp, 1*16]
-+	stp	x21, x22, [sp, 2*16]
-+	stp	x23, x24, [sp, 3*16]
-+	stp	x25, x26, [sp, 4*16]
-+	stp	x27, x28, [sp, 5*16]
-+	stp	d8, d9,   [sp, 6*16]
-+	stp	d10, d11, [sp, 7*16]
-+	stp	d12, d13, [sp, 8*16]
-+	stp	d14, d15, [sp, 9*16]
-+	str	x1, [sp, 10*16]
-+
-+	/* Invoke GTM_begin_transaction with the struct we just built.  */
-+	mov	x1, sp
-+	bl	GTM_begin_transaction
-+
-+	/* Return; we don't need to restore any of the call-saved regs.  */
-+	ldp	x29, x30, [sp]
-+	add     sp, sp, #11*16
-+	cfi_adjust_cfa_offset(-11*16)
-+	cfi_restore(x29)
-+	cfi_restore(x30)
-+	ret
-+	cfi_endproc
-+	.size	_ITM_beginTransaction, . - _ITM_beginTransaction
-+
-+	.align	2
-+	.global	GTM_longjmp
-+	.hidden	GTM_longjmp
-+	.type	GTM_longjmp, %function
-+
-+GTM_longjmp:
-+	/* The first parameter becomes the return value (x0).
-+	   The third parameter is ignored for now.  */
-+	cfi_startproc
-+	ldp	x19, x20, [x1, 1*16]
-+	ldp	x21, x22, [x1, 2*16]
-+	ldp	x23, x24, [x1, 3*16]
-+	ldp	x25, x26, [x1, 4*16]
-+	ldp	x27, x28, [x1, 5*16]
-+	ldp	d8, d9,   [x1, 6*16]
-+	ldp	d10, d11, [x1, 7*16]
-+	ldp	d12, d13, [x1, 8*16]
-+	ldp	d14, d15, [x1, 9*16]
-+	ldr	x3, [x1, 10*16]
-+	ldp	x29, x30, [x1]
-+	cfi_def_cfa(x1, 0)
-+	mov	sp, x3
-+	br	x30
-+	cfi_endproc
-+	.size	GTM_longjmp, . - GTM_longjmp
-+
-+#ifdef __linux__
-+.section .note.GNU-stack, "", %progbits
-+#endif
---- /dev/null
-+++ b/src/libitm/config/aarch64/target.h
-@@ -0,0 +1,45 @@
-+/* Copyright (C) 2014 Free Software Foundation, Inc.
-+   Contributed by Richard Henderson <rth@redhat.com>.
-+
-+   This file is part of the GNU Transactional Memory Library (libitm).
-+
-+   Libitm is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   Libitm is distributed in the hope that it will be useful, but WITHOUT ANY
-+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+   more details.
-+
-+   Under Section 7 of GPL version 3, you are granted additional
-+   permissions described in the GCC Runtime Library Exception, version
-+   3.1, as published by the Free Software Foundation.
-+
-+   You should have received a copy of the GNU General Public License and
-+   a copy of the GCC Runtime Library Exception along with this program;
-+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+namespace GTM HIDDEN {
-+
-+typedef struct gtm_jmpbuf
-+{
-+  unsigned long long fp;	/* x29 */
-+  unsigned long long pc;	/* x30 */
-+  unsigned long long gr[10];	/* x19-x28 */
-+  unsigned long long vr[8];	/* d8-d15 */
-+  void *cfa;
-+} gtm_jmpbuf;
-+
-+/* ??? The size of one line in hardware caches (in bytes). */
-+#define HW_CACHELINE_SIZE 128
-+
-+static inline void
-+cpu_relax (void)
-+{
-+  __asm volatile ("" : : : "memory");
-+}
-+
-+} // namespace GTM
---- a/src/libitm/configure.tgt
-+++ b/src/libitm/configure.tgt
-@@ -46,6 +46,7 @@ fi
- # Map the target cpu to an ARCH sub-directory.  At the same time,
- # work out any special compilation flags as necessary.
- case "${target_cpu}" in
-+  aarch64*)		ARCH=aarch64 ;;
-   alpha*)		ARCH=alpha ;;
-   rs6000 | powerpc*)
- 	XCFLAGS="${XCFLAGS} -mhtm"
diff --git a/debian/patches/svn-updates.diff b/debian/patches/svn-updates.diff
index c8050f7..58a3e4a 100644
--- a/debian/patches/svn-updates.diff
+++ b/debian/patches/svn-updates.diff
@@ -1,10 +1,10 @@
-# DP: updates from the 4.9 branch upto 20140724 (r213031).
+# DP: updates from the 4.9 branch upto 20140727 (r213100).
 
 last_update()
 {
 	cat > ${dir}LAST_UPDATED <EOF
-Fri Jul 25 00:07:18 CEST 2014
-Thu Jul 24 22:07:18 UTC 2014 (revision 213031)
+Sun Jul 27 15:20:15 CEST 2014
+Sun Jul 27 13:20:15 UTC 2014 (revision 213100)
 EOF
 }
 
@@ -12,6 +12,261 @@ LANG=C svn diff svn://gcc.gnu.org/svn/gcc/tags/gcc_4_9_1_release svn://gcc.gnu.o
 	| sed -r 's,^--- (\S+)\t(\S+)(.*)$,--- a/src/\1\t\2,;s,^\+\+\+ (\S+)\t(\S+)(.*)$,+++ b/src/\1\t\2,' \
 	| awk '/^Index:.*\.(class|texi)/ {skip=1; next} /^Index:/ { skip=0 } skip==0'
 
+Index: libitm/configure.tgt
+===================================================================
+--- a/src/libitm/configure.tgt	(.../tags/gcc_4_9_1_release)
++++ b/src/libitm/configure.tgt	(.../branches/gcc-4_9-branch)
+@@ -46,6 +46,7 @@
+ # Map the target cpu to an ARCH sub-directory.  At the same time,
+ # work out any special compilation flags as necessary.
+ case "${target_cpu}" in
++  aarch64*)		ARCH=aarch64 ;;
+   alpha*)		ARCH=alpha ;;
+   rs6000 | powerpc*)
+ 	XCFLAGS="${XCFLAGS} -mhtm"
+Index: libitm/ChangeLog
+===================================================================
+--- a/src/libitm/ChangeLog	(.../tags/gcc_4_9_1_release)
++++ b/src/libitm/ChangeLog	(.../branches/gcc-4_9-branch)
+@@ -1,3 +1,9 @@
++2014-07-24  Richard Henderson  <rth@redhat.com>
++
++	* config/aarch64/sjlj.S: New file.
++	* config/aarch64/target.h: New file.
++	* configure.tgt: Enable aarch64.
++
+ 2014-07-16  Release Manager
+ 
+ 	* GCC 4.9.1 released.
+Index: libitm/config/aarch64/sjlj.S
+===================================================================
+--- a/src/libitm/config/aarch64/sjlj.S	(.../tags/gcc_4_9_1_release)
++++ b/src/libitm/config/aarch64/sjlj.S	(.../branches/gcc-4_9-branch)
+@@ -0,0 +1,92 @@
++/* Copyright (C) 2014 Free Software Foundation, Inc.
++   Contributed by Richard Henderson <rth@redhat.com>.
++
++   This file is part of the GNU Transactional Memory Library (libitm).
++
++   Libitm is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   Libitm is distributed in the hope that it will be useful, but WITHOUT ANY
++   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
++   more details.
++
++   Under Section 7 of GPL version 3, you are granted additional
++   permissions described in the GCC Runtime Library Exception, version
++   3.1, as published by the Free Software Foundation.
++
++   You should have received a copy of the GNU General Public License and
++   a copy of the GCC Runtime Library Exception along with this program;
++   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include "asmcfi.h"
++
++	.text
++	.align	2
++	.global	_ITM_beginTransaction
++	.type	_ITM_beginTransaction, %function
++
++_ITM_beginTransaction:
++	cfi_startproc
++	mov	x1, sp
++	stp	x29, x30, [sp, -11*16]!
++	cfi_adjust_cfa_offset(11*16)
++	cfi_rel_offset(x29, 0)
++	cfi_rel_offset(x30, 8)
++	mov	x29, sp
++	stp	x19, x20, [sp, 1*16]
++	stp	x21, x22, [sp, 2*16]
++	stp	x23, x24, [sp, 3*16]
++	stp	x25, x26, [sp, 4*16]
++	stp	x27, x28, [sp, 5*16]
++	stp	d8, d9,   [sp, 6*16]
++	stp	d10, d11, [sp, 7*16]
++	stp	d12, d13, [sp, 8*16]
++	stp	d14, d15, [sp, 9*16]
++	str	x1, [sp, 10*16]
++
++	/* Invoke GTM_begin_transaction with the struct we just built.  */
++	mov	x1, sp
++	bl	GTM_begin_transaction
++
++	/* Return; we don't need to restore any of the call-saved regs.  */
++	ldp	x29, x30, [sp], 11*16
++	cfi_adjust_cfa_offset(-11*16)
++	cfi_restore(x29)
++	cfi_restore(x30)
++	ret
++	cfi_endproc
++	.size	_ITM_beginTransaction, . - _ITM_beginTransaction
++
++	.align	2
++	.global	GTM_longjmp
++	.hidden	GTM_longjmp
++	.type	GTM_longjmp, %function
++
++GTM_longjmp:
++	/* The first parameter becomes the return value (x0).
++	   The third parameter is ignored for now.  */
++	cfi_startproc
++	ldp	x19, x20, [x1, 1*16]
++	ldp	x21, x22, [x1, 2*16]
++	ldp	x23, x24, [x1, 3*16]
++	ldp	x25, x26, [x1, 4*16]
++	ldp	x27, x28, [x1, 5*16]
++	ldp	d8, d9,   [x1, 6*16]
++	ldp	d10, d11, [x1, 7*16]
++	ldp	d12, d13, [x1, 8*16]
++	ldp	d14, d15, [x1, 9*16]
++	ldr	x3, [x1, 10*16]
++	ldp	x29, x30, [x1]
++	cfi_def_cfa(x1, 0)
++	mov	sp, x3
++	br	x30
++	cfi_endproc
++	.size	GTM_longjmp, . - GTM_longjmp
++
++#ifdef __linux__
++.section .note.GNU-stack, "", %progbits
++#endif
+Index: libitm/config/aarch64/target.h
+===================================================================
+--- a/src/libitm/config/aarch64/target.h	(.../tags/gcc_4_9_1_release)
++++ b/src/libitm/config/aarch64/target.h	(.../branches/gcc-4_9-branch)
+@@ -0,0 +1,45 @@
++/* Copyright (C) 2014 Free Software Foundation, Inc.
++   Contributed by Richard Henderson <rth@redhat.com>.
++
++   This file is part of the GNU Transactional Memory Library (libitm).
++
++   Libitm is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   Libitm is distributed in the hope that it will be useful, but WITHOUT ANY
++   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
++   more details.
++
++   Under Section 7 of GPL version 3, you are granted additional
++   permissions described in the GCC Runtime Library Exception, version
++   3.1, as published by the Free Software Foundation.
++
++   You should have received a copy of the GNU General Public License and
++   a copy of the GCC Runtime Library Exception along with this program;
++   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
++   <http://www.gnu.org/licenses/>.  */
++
++namespace GTM HIDDEN {
++
++typedef struct gtm_jmpbuf
++{
++  unsigned long long fp;	/* x29 */
++  unsigned long long pc;	/* x30 */
++  unsigned long long gr[10];	/* x19-x28 */
++  unsigned long long vr[8];	/* d8-d15 */
++  void *cfa;
++} gtm_jmpbuf;
++
++/* ??? The size of one line in hardware caches (in bytes). */
++#define HW_CACHELINE_SIZE 128
++
++static inline void
++cpu_relax (void)
++{
++  __asm volatile ("" : : : "memory");
++}
++
++} // namespace GTM
+Index: configure.ac
+===================================================================
+--- a/src/configure.ac	(.../tags/gcc_4_9_1_release)
++++ b/src/configure.ac	(.../branches/gcc-4_9-branch)
+@@ -1177,6 +1177,9 @@
+   *-mingw*)
+     host_makefile_frag="config/mh-mingw"
+     ;;
++  alpha*-*-linux*)
++    host_makefile_frag="config/mh-alpha-linux"
++    ;;
+   hppa*-hp-hpux10*)
+     host_makefile_frag="config/mh-pa-hpux10"
+     ;;
+Index: ChangeLog
+===================================================================
+--- a/src/ChangeLog	(.../tags/gcc_4_9_1_release)
++++ b/src/ChangeLog	(.../branches/gcc-4_9-branch)
+@@ -1,3 +1,9 @@
++2014-07-26  Uros Bizjak  <ubizjak@gmail.com>
++
++	PR target/47230
++	* configure.ac (alpha*-*-linux*): Use mh-alpha-linux.
++	* configure: Regenerate.
++
+ 2014-07-16  Release Manager
+ 
+ 	* GCC 4.9.1 released.
+@@ -9,7 +15,7 @@
+ 2014-04-04  Eric Botcazou  <ebotcazou@adacore.com>
+ 
+ 	PR bootstrap/60620
+-	* Makefile.def (dependencies): Make gnattools depend on libstdc++-v3. 
++	* Makefile.def (dependencies): Make gnattools depend on libstdc++-v3.
+ 	* Makefile.in: Regenerate.
+ 
+ 2014-03-28  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+@@ -47,7 +53,8 @@
+ 
+ 2014-03-07  Denis Chertykov  <chertykov@gmail.com>
+ 
+-	* MAINTAINERS: Remove avr maintainers: Anatoly Sokolov and Eric Weddington
++	* MAINTAINERS: Remove avr maintainers: Anatoly Sokolov
++	and Eric Weddington
+ 
+ 2014-03-07  Jakub Jelinek  <jakub@redhat.com>
+ 
+Index: config/mh-alpha-linux
+===================================================================
+--- a/src/config/mh-alpha-linux	(.../tags/gcc_4_9_1_release)
++++ b/src/config/mh-alpha-linux	(.../branches/gcc-4_9-branch)
+@@ -0,0 +1,3 @@
++# Prevent GPREL16 relocation truncation
++LDFLAGS += -Wl,--no-relax
++BOOT_LDFLAGS += -Wl,--no-relax
+Index: config/ChangeLog
+===================================================================
+--- a/src/config/ChangeLog	(.../tags/gcc_4_9_1_release)
++++ b/src/config/ChangeLog	(.../branches/gcc-4_9-branch)
+@@ -1,3 +1,8 @@
++2014-07-26  Uros Bizjak  <ubizjak@gmail.com>
++
++	PR target/47230
++	* mh-alpha-linux: New file.
++
+ 2014-07-16  Release Manager
+ 
+ 	* GCC 4.9.1 released.
+Index: configure
+===================================================================
+--- a/src/configure	(.../tags/gcc_4_9_1_release)
++++ b/src/configure	(.../branches/gcc-4_9-branch)
+@@ -3868,6 +3868,9 @@
+   *-mingw*)
+     host_makefile_frag="config/mh-mingw"
+     ;;
++  alpha*-*-linux*)
++    host_makefile_frag="config/mh-alpha-linux"
++    ;;
+   hppa*-hp-hpux10*)
+     host_makefile_frag="config/mh-pa-hpux10"
+     ;;
 Index: gcc/c-family/c-gimplify.c
 ===================================================================
 --- a/src/gcc/c-family/c-gimplify.c	(.../tags/gcc_4_9_1_release)
@@ -51,7 +306,7 @@ Index: gcc/DATESTAMP
 +++ b/src/gcc/DATESTAMP	(.../branches/gcc-4_9-branch)
 @@ -1 +1 @@
 -20140716
-+20140724
++20140727
 Index: gcc/omp-low.c
 ===================================================================
 --- a/src/gcc/omp-low.c	(.../tags/gcc_4_9_1_release)
@@ -97,7 +352,20 @@ Index: gcc/ChangeLog
 ===================================================================
 --- a/src/gcc/ChangeLog	(.../tags/gcc_4_9_1_release)
 +++ b/src/gcc/ChangeLog	(.../branches/gcc-4_9-branch)
-@@ -1,3 +1,166 @@
+@@ -1,3 +1,179 @@
++2014-07-25  Uros Bizjak  <ubizjak@gmail.com>
++
++	Backport from mainline
++	2014-07-14  Jakub Jelinek  <jakub@redhat.com>
++
++	PR target/61656
++	* config/i386/i386.c (classify_argument): Don't merge classes above
++	number of words.
++
++2014-07-25  Uros Bizjak  <ubizjak@gmail.com>
++
++	* config/alpha/elf.h: Define TARGET_UNWIND_TABLES_DEFAULT.
++
 +2014-07-24  Kyle McMartin  <kyle@redhat.com>
 +
 +        * config/aarch64/aarch64-linux.h (TARGET_ASM_FILE_END): Define.
@@ -264,7 +532,7 @@ Index: gcc/ChangeLog
  2014-07-16  Release Manager
  
  	* GCC 4.9.1 released.
-@@ -4,14 +170,14 @@
+@@ -4,14 +183,14 @@
  
  2014-07-10  Cary Coutant  <ccoutant@google.com>
  
@@ -283,7 +551,7 @@ Index: gcc/ChangeLog
  
  2014-07-10  Tom G. Christensen  <tgc@jupiterrise.com>
  
-@@ -33,13 +199,13 @@
+@@ -33,13 +212,13 @@
  	PR target/61062
  	* config/arm/arm_neon.h (vtrn_s8, vtrn_s16, vtrn_u8, vtrn_u16, vtrn_p8,
  	vtrn_p16, vtrn_s32, vtrn_f32, vtrn_u32, vtrnq_s8, vtrnq_s16, vtrnq_s32,
@@ -304,7 +572,7 @@ Index: gcc/ChangeLog
  
  
  2014-07-09  Alan Lawrence  <alan.lawrence@arm.com>
-@@ -157,11 +323,9 @@
+@@ -157,11 +336,9 @@
  	2014-06-24  Jakub Jelinek  <jakub@redhat.com>
  
  	* gimplify.c (gimplify_scan_omp_clauses) <case OMP_CLAUSE_MAP,
@@ -318,7 +586,7 @@ Index: gcc/ChangeLog
  	(gimplify_adjust_omp_clauses): Likewise.
  	* omp-low.c (lower_rec_simd_input_clauses,
  	lower_rec_input_clauses, expand_omp_simd): Handle non-constant
-@@ -176,9 +340,8 @@
+@@ -176,9 +353,8 @@
  
  	2014-06-18  Jakub Jelinek  <jakub@redhat.com>
  
@@ -330,7 +598,7 @@ Index: gcc/ChangeLog
  	(struct gimplify_adjust_omp_clauses_data): New type.
  	(gimplify_adjust_omp_clauses_1): Adjust for data being
  	a struct gimplify_adjust_omp_clauses_data pointer instead
-@@ -196,14 +359,12 @@
+@@ -196,14 +372,12 @@
  	gimple_seq * argument to omp_finish_clause hook.
  	* omp-low.c (scan_sharing_clauses): Call scan_omp_op on
  	non-DECL_P OMP_CLAUSE_DECL if ctx->outer.
@@ -348,7 +616,7 @@ Index: gcc/ChangeLog
  
  	2014-06-10  Jakub Jelinek  <jakub@redhat.com>
  
-@@ -227,8 +388,7 @@
+@@ -227,8 +401,7 @@
  	OMP_CLAUSE_LINEAR_STMT.
  	* omp-low.c (lower_rec_input_clauses): Fix typo.
  	(maybe_add_implicit_barrier_cancel, lower_omp_1): Add
@@ -358,7 +626,7 @@ Index: gcc/ChangeLog
  
  2014-06-30  Jason Merrill  <jason@redhat.com>
  
-@@ -279,8 +439,7 @@
+@@ -279,8 +452,7 @@
  	(aarch64_sqdmlsl_lane<mode>): Likewise.
  	(aarch64_sqdmull_lane<mode>): Likewise.
  	(aarch64_sqdmull2_lane<mode>): Likewise.
@@ -1033,6 +1301,21 @@ Index: gcc/config.gcc
          esac
  	;;
  pdp11-*-*)
+Index: gcc/config/alpha/elf.h
+===================================================================
+--- a/src/gcc/config/alpha/elf.h	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/config/alpha/elf.h	(.../branches/gcc-4_9-branch)
+@@ -126,6 +126,10 @@
+   "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
+    %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
+ 
++/* This variable should be set to 'true' if the target ABI requires
++   unwinding tables even when exceptions are not used.  */
++#define TARGET_UNWIND_TABLES_DEFAULT true
++
+ /* Select a format to encode pointers in exception handling data.  CODE
+    is 0 for data, 1 for code labels, 2 for function pointers.  GLOBAL is
+    true if the symbol may be affected by dynamic relocations.
 Index: gcc/config/sparc/sync.md
 ===================================================================
 --- a/src/gcc/config/sparc/sync.md	(.../tags/gcc_4_9_1_release)
@@ -1173,6 +1456,19 @@ Index: gcc/config/i386/ia32intrin.h
  #define _bit_scan_forward(a)	__bsfd(a)
  #define _bit_scan_reverse(a)	__bsrd(a)
  #define _bswap(a)		__bswapd(a)
+Index: gcc/config/i386/i386.c
+===================================================================
+--- a/src/gcc/config/i386/i386.c	(.../tags/gcc_4_9_1_release)
++++ b/src/gcc/config/i386/i386.c	(.../branches/gcc-4_9-branch)
+@@ -6552,7 +6552,7 @@
+ 					   bit_offset);
+ 		  if (!num)
+ 		    return 0;
+-		  for (i = 0; i < num; i++)
++		  for (i = 0; i < num && i < words; i++)
+ 		    classes[i] = merge_classes (subclasses[i], classes[i]);
+ 		}
+ 	    }
 Index: gcc/config/nios2/rtems.h
 ===================================================================
 --- a/src/gcc/config/nios2/rtems.h	(.../tags/gcc_4_9_1_release)
@@ -2315,3 +2611,39 @@ Index: gcc/config/arm/t-rtems-eabi
 +MULTILIB_EXCEPTIONS += mfpu=fpv4-sp-d16/mfloat-abi=hard
 +MULTILIB_EXCEPTIONS += mfpu=fpv4-sp-d16
  MULTILIB_EXCEPTIONS += mfloat-abi=hard
+Index: libobjc/encoding.c
+===================================================================
+--- a/src/libobjc/encoding.c	(.../tags/gcc_4_9_1_release)
++++ b/src/libobjc/encoding.c	(.../branches/gcc-4_9-branch)
+@@ -192,6 +192,7 @@
+    ? MAX (MAX (COMPUTED, SPECIFIED), 64)				\
+    : MAX (COMPUTED, SPECIFIED));})
+ 
++#define rs6000_special_adjust_field_align_p(FIELD, COMPUTED) 0
+ 
+ /* Skip a variable name, enclosed in quotes (").  */
+ static inline
+Index: libobjc/ChangeLog
+===================================================================
+--- a/src/libobjc/ChangeLog	(.../tags/gcc_4_9_1_release)
++++ b/src/libobjc/ChangeLog	(.../branches/gcc-4_9-branch)
+@@ -1,3 +1,10 @@
++2014-07-27  Alan Modra  <amodra@gmail.com>
++	    Matthias Klose  <doko@ubuntu.com>
++
++	PR libobjc/61920
++
++	* encoding.c: Define rs6000_special_adjust_field_align_p.
++
+ 2014-07-16  Release Manager
+ 
+ 	* GCC 4.9.1 released.
+Index: .
+===================================================================
+--- a/src/.	(.../tags/gcc_4_9_1_release)
++++ b/src/.	(.../branches/gcc-4_9-branch)
+
+Property changes on: .
+___________________________________________________________________
+Modified: svn:mergeinfo
+   Merged /trunk:r210615
diff --git a/debian/rules.patch b/debian/rules.patch
index 6d1de3c..688506b 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -77,7 +77,6 @@ debian_patches += \
 	libitm-no-fortify-source \
 	pr59758 \
 	pr57653 \
-	$(if $(with_linaro_branch),,libitm-aarch64) \
 	pr61257 \
 	pr61046 \
 	pr61336 \
diff --git a/debian/rules2 b/debian/rules2
index f2f435f..402392d 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -134,10 +134,6 @@ ifneq (,$(findstring static,$(DEB_BUILD_OPTIONS)))
   LDFLAGS	+= -static
 endif
 
-ifneq (,$(filter $(DEB_TARGET_ARCH),alpha))
-  LDFLAGS += -Wl,--no-relax
-endif
-
 CFLAGS_TO_PASS = \
 	$(if $(CFLAGS),CFLAGS="$(CFLAGS)") \
 	$(if $(BOOT_CFLAGS),BOOT_CFLAGS="$(BOOT_CFLAGS)") \