From b157b61f4570a731d743a50c249fb15b62b4ad7b Mon Sep 17 00:00:00 2001
From: NicJA <NicJA@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 27 Apr 2016 14:53:41 +0000
Subject: [PATCH] update experimental gcc 6 patch to gcc 6.1.0 release

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@52703 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 ...cc-6-20160313-aros.diff => gcc-6.1.0-aros.diff} | 312 ++++++++++-----------
 1 file changed, 156 insertions(+), 156 deletions(-)
 rename tools/crosstools/{gcc-6-20160313-aros.diff => gcc-6.1.0-aros.diff} (80%)

diff --git a/tools/crosstools/gcc-6-20160313-aros.diff b/tools/crosstools/gcc-6.1.0-aros.diff
similarity index 80%
rename from tools/crosstools/gcc-6-20160313-aros.diff
rename to tools/crosstools/gcc-6.1.0-aros.diff
index 9642d1e596..e144d8ee0f 100644
--- a/tools/crosstools/gcc-6-20160313-aros.diff
+++ b/tools/crosstools/gcc-6.1.0-aros.diff
@@ -1,6 +1,6 @@
-diff -ruN gcc-6-20160313/boehm-gc/include/gc_amiga_redirects.h gcc-6-20160313.aros/boehm-gc/include/gc_amiga_redirects.h
---- gcc-6-20160313/boehm-gc/include/gc_amiga_redirects.h	2001-08-17 19:30:51.000000000 +0100
-+++ gcc-6-20160313.aros/boehm-gc/include/gc_amiga_redirects.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/boehm-gc/include/gc_amiga_redirects.h gcc-6.1.0.aros/boehm-gc/include/gc_amiga_redirects.h
+--- gcc-6.1.0/boehm-gc/include/gc_amiga_redirects.h	2001-08-17 19:30:51.000000000 +0100
++++ gcc-6.1.0.aros/boehm-gc/include/gc_amiga_redirects.h	2016-04-27 15:13:21.001535038 +0100
 @@ -2,7 +2,7 @@
  
  # define GC_AMIGA_REDIRECTS_H
@@ -10,9 +10,9 @@ diff -ruN gcc-6-20160313/boehm-gc/include/gc_amiga_redirects.h gcc-6-20160313.ar
      extern void *GC_amiga_realloc(void *old_object,size_t new_size_in_bytes);
  #   define GC_realloc(a,b) GC_amiga_realloc(a,b)
      extern void GC_amiga_set_toany(void (*func)(void));
-diff -ruN gcc-6-20160313/boehm-gc/include/gc.h gcc-6-20160313.aros/boehm-gc/include/gc.h
---- gcc-6-20160313/boehm-gc/include/gc.h	2014-10-23 09:39:19.000000000 +0100
-+++ gcc-6-20160313.aros/boehm-gc/include/gc.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/boehm-gc/include/gc.h gcc-6.1.0.aros/boehm-gc/include/gc.h
+--- gcc-6.1.0/boehm-gc/include/gc.h	2014-10-23 09:39:19.000000000 +0100
++++ gcc-6.1.0.aros/boehm-gc/include/gc.h	2016-04-27 15:13:21.001535038 +0100
 @@ -1056,7 +1056,7 @@
      GC_API void GC_win32_free_heap ();
  #endif
@@ -22,9 +22,9 @@ diff -ruN gcc-6-20160313/boehm-gc/include/gc.h gcc-6-20160313.aros/boehm-gc/incl
    /* Allocation really goes through GC_amiga_allocwrapper_do */
  # include "gc_amiga_redirects.h"
  #endif
-diff -ruN gcc-6-20160313/configure gcc-6-20160313.aros/configure
---- gcc-6-20160313/configure	2016-01-29 20:26:04.000000000 +0000
-+++ gcc-6-20160313.aros/configure	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/configure gcc-6.1.0.aros/configure
+--- gcc-6.1.0/configure	2016-03-17 22:54:19.000000000 +0000
++++ gcc-6.1.0.aros/configure	2016-04-27 15:13:21.001535038 +0100
 @@ -3896,6 +3896,9 @@
    powerpcle-*-solaris*)
      noconfigdirs="$noconfigdirs gdb sim tcl tk itcl"
@@ -44,9 +44,9 @@ diff -ruN gcc-6-20160313/configure gcc-6-20160313.aros/configure
  esac
  fi
  
-diff -ruN gcc-6-20160313/configure.ac gcc-6-20160313.aros/configure.ac
---- gcc-6-20160313/configure.ac	2016-01-12 18:36:00.000000000 +0000
-+++ gcc-6-20160313.aros/configure.ac	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/configure.ac gcc-6.1.0.aros/configure.ac
+--- gcc-6.1.0/configure.ac	2016-03-17 22:54:19.000000000 +0000
++++ gcc-6.1.0.aros/configure.ac	2016-04-27 15:13:21.001535038 +0100
 @@ -1232,6 +1232,9 @@
    powerpcle-*-solaris*)
      noconfigdirs="$noconfigdirs gdb sim tcl tk itcl"
@@ -66,9 +66,9 @@ diff -ruN gcc-6-20160313/configure.ac gcc-6-20160313.aros/configure.ac
  esac
  fi
  
-diff -ruN gcc-6-20160313/fixincludes/configure gcc-6-20160313.aros/fixincludes/configure
---- gcc-6-20160313/fixincludes/configure	2016-03-13 22:33:04.000000000 +0000
-+++ gcc-6-20160313.aros/fixincludes/configure	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/fixincludes/configure gcc-6.1.0.aros/fixincludes/configure
+--- gcc-6.1.0/fixincludes/configure	2016-04-27 09:22:11.000000000 +0100
++++ gcc-6.1.0.aros/fixincludes/configure	2016-04-27 15:13:21.001535038 +0100
 @@ -4712,6 +4712,7 @@
  fi
  else
@@ -77,9 +77,9 @@ diff -ruN gcc-6-20160313/fixincludes/configure gcc-6-20160313.aros/fixincludes/c
  	i?86-*-msdosdjgpp* | \
  	i?86-*-mingw32* | \
  	x86_64-*-mingw32* | \
-diff -ruN gcc-6-20160313/fixincludes/configure.ac gcc-6-20160313.aros/fixincludes/configure.ac
---- gcc-6-20160313/fixincludes/configure.ac	2012-05-29 20:28:57.000000000 +0100
-+++ gcc-6-20160313.aros/fixincludes/configure.ac	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/fixincludes/configure.ac gcc-6.1.0.aros/fixincludes/configure.ac
+--- gcc-6.1.0/fixincludes/configure.ac	2012-05-29 20:28:57.000000000 +0100
++++ gcc-6.1.0.aros/fixincludes/configure.ac	2016-04-27 15:13:21.001535038 +0100
 @@ -50,6 +50,7 @@
  	TARGET=oneprocess
  fi],
@@ -88,9 +88,9 @@ diff -ruN gcc-6-20160313/fixincludes/configure.ac gcc-6-20160313.aros/fixinclude
  	i?86-*-msdosdjgpp* | \
  	i?86-*-mingw32* | \
  	x86_64-*-mingw32* | \
-diff -ruN gcc-6-20160313/gcc/config/aarch64/aros.h gcc-6-20160313.aros/gcc/config/aarch64/aros.h
---- gcc-6-20160313/gcc/config/aarch64/aros.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/aarch64/aros.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/aarch64/aros.h gcc-6.1.0.aros/gcc/config/aarch64/aros.h
+--- gcc-6.1.0/gcc/config/aarch64/aros.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/aarch64/aros.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,63 @@
 +/* Configuration file for ARM AROS EABI targets.
 +   Copyright (C) 2004, 2005, 2006, 2007, 2010
@@ -155,9 +155,9 @@ diff -ruN gcc-6-20160313/gcc/config/aarch64/aros.h gcc-6-20160313.aros/gcc/confi
 +#undef LIBGCC_SPEC
 +#define LIBGCC_SPEC "-lgcc"
 +
-diff -ruN gcc-6-20160313/gcc/config/aarch64/t-aros gcc-6-20160313.aros/gcc/config/aarch64/t-aros
---- gcc-6-20160313/gcc/config/aarch64/t-aros	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/aarch64/t-aros	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/aarch64/t-aros gcc-6.1.0.aros/gcc/config/aarch64/t-aros
+--- gcc-6.1.0/gcc/config/aarch64/t-aros	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/aarch64/t-aros	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,21 @@
 +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 +# 2008, 2010 Free Software Foundation, Inc.
@@ -180,9 +180,9 @@ diff -ruN gcc-6-20160313/gcc/config/aarch64/t-aros gcc-6-20160313.aros/gcc/confi
 +
 +
 +
-diff -ruN gcc-6-20160313/gcc/config/arm/aros.h gcc-6-20160313.aros/gcc/config/arm/aros.h
---- gcc-6-20160313/gcc/config/arm/aros.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/arm/aros.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/arm/aros.h gcc-6.1.0.aros/gcc/config/arm/aros.h
+--- gcc-6.1.0/gcc/config/arm/aros.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/arm/aros.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,82 @@
 +/* Configuration file for ARM AROS EABI targets.
 +   Copyright (C) 2004, 2005, 2006, 2007, 2010
@@ -266,9 +266,9 @@ diff -ruN gcc-6-20160313/gcc/config/arm/aros.h gcc-6-20160313.aros/gcc/config/ar
 +
 +/* FIXME: AROS doesn't support dw2 unwinding yet.  */
 +#undef MD_FALLBACK_FRAME_STATE_FOR
-diff -ruN gcc-6-20160313/gcc/config/arm/t-aros gcc-6-20160313.aros/gcc/config/arm/t-aros
---- gcc-6-20160313/gcc/config/arm/t-aros	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/arm/t-aros	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/arm/t-aros gcc-6.1.0.aros/gcc/config/arm/t-aros
+--- gcc-6.1.0/gcc/config/arm/t-aros	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/arm/t-aros	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,22 @@
 +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 +# 2008, 2010 Free Software Foundation, Inc.
@@ -292,9 +292,9 @@ diff -ruN gcc-6-20160313/gcc/config/arm/t-aros gcc-6-20160313.aros/gcc/config/ar
 +MULTILIB_OPTIONS     = marm mfloat-abi=hard/mfloat-abi=soft march=armv6/march=armv7-a
 +MULTILIB_DIRNAMES    = arm fpu soft armv6 armv7-a
 +
-diff -ruN gcc-6-20160313/gcc/config/aros.h gcc-6-20160313.aros/gcc/config/aros.h
---- gcc-6-20160313/gcc/config/aros.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/aros.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/aros.h gcc-6.1.0.aros/gcc/config/aros.h
+--- gcc-6.1.0/gcc/config/aros.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/aros.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,113 @@
 +/* Definitions for AROS
 +   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
@@ -409,9 +409,9 @@ diff -ruN gcc-6-20160313/gcc/config/aros.h gcc-6-20160313.aros/gcc/config/aros.h
 +#define LINKER_NAME "collect-aros"
 +
 +#define TARGET_HAS_F_SETLKW
-diff -ruN gcc-6-20160313/gcc/config/aros.opt gcc-6-20160313.aros/gcc/config/aros.opt
---- gcc-6-20160313/gcc/config/aros.opt	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/aros.opt	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/aros.opt gcc-6.1.0.aros/gcc/config/aros.opt
+--- gcc-6.1.0/gcc/config/aros.opt	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/aros.opt	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,35 @@
 +; Processor-independent options for AROS.
 +
@@ -448,9 +448,9 @@ diff -ruN gcc-6-20160313/gcc/config/aros.opt gcc-6-20160313.aros/gcc/config/aros
 +nix
 +Driver
 +
-diff -ruN gcc-6-20160313/gcc/config/i386/aros64.h gcc-6-20160313.aros/gcc/config/i386/aros64.h
---- gcc-6-20160313/gcc/config/i386/aros64.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/i386/aros64.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/i386/aros64.h gcc-6.1.0.aros/gcc/config/i386/aros64.h
+--- gcc-6.1.0/gcc/config/i386/aros64.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/i386/aros64.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,34 @@
 +/* Definitions for AMD x86_64 running AROS systems with ELF64 format.
 +   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
@@ -486,9 +486,9 @@ diff -ruN gcc-6-20160313/gcc/config/i386/aros64.h gcc-6-20160313.aros/gcc/config
 +#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} -L %R/lib" 
 +
 +/* FIXME: AROS doesn't support dw2 unwinding yet.  */
-diff -ruN gcc-6-20160313/gcc/config/i386/aros.h gcc-6-20160313.aros/gcc/config/i386/aros.h
---- gcc-6-20160313/gcc/config/i386/aros.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/i386/aros.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/i386/aros.h gcc-6.1.0.aros/gcc/config/i386/aros.h
+--- gcc-6.1.0/gcc/config/i386/aros.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/i386/aros.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,25 @@
 +/* Definitions for Intel 386 running AROS systems with ELF format.
 +   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
@@ -515,9 +515,9 @@ diff -ruN gcc-6-20160313/gcc/config/i386/aros.h gcc-6-20160313.aros/gcc/config/i
 +
 +#undef	LINK_SPEC
 +#define LINK_SPEC "-m elf_i386 -L%R/lib"
-diff -ruN gcc-6-20160313/gcc/config/m68k/m68k.c gcc-6-20160313.aros/gcc/config/m68k/m68k.c
---- gcc-6-20160313/gcc/config/m68k/m68k.c	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/gcc/config/m68k/m68k.c	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/m68k/m68k.c gcc-6.1.0.aros/gcc/config/m68k/m68k.c
+--- gcc-6.1.0/gcc/config/m68k/m68k.c	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/gcc/config/m68k/m68k.c	2016-04-27 15:13:21.001535038 +0100
 @@ -4452,7 +4452,7 @@
    else if (letter == '/')
      asm_fprintf (file, "%R");
@@ -527,9 +527,9 @@ diff -ruN gcc-6-20160313/gcc/config/m68k/m68k.c gcc-6-20160313.aros/gcc/config/m
    else if (letter == 'p')
      {
        output_addr_const (file, op);
-diff -ruN gcc-6-20160313/gcc/config/m68k/m68k.h gcc-6-20160313.aros/gcc/config/m68k/m68k.h
---- gcc-6-20160313/gcc/config/m68k/m68k.h	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/gcc/config/m68k/m68k.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/m68k/m68k.h gcc-6.1.0.aros/gcc/config/m68k/m68k.h
+--- gcc-6.1.0/gcc/config/m68k/m68k.h	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/gcc/config/m68k/m68k.h	2016-04-27 15:13:21.001535038 +0100
 @@ -330,7 +330,9 @@
     register elimination.  */
  #define FIRST_PSEUDO_REGISTER 25
@@ -551,9 +551,9 @@ diff -ruN gcc-6-20160313/gcc/config/m68k/m68k.h gcc-6-20160313.aros/gcc/config/m
  
  /* Base register for access to arguments of the function.
   * This isn't a hardware register. It will be eliminated to the
-diff -ruN gcc-6-20160313/gcc/config/m68k/m68k.md gcc-6-20160313.aros/gcc/config/m68k/m68k.md
---- gcc-6-20160313/gcc/config/m68k/m68k.md	2016-02-22 14:22:07.000000000 +0000
-+++ gcc-6-20160313.aros/gcc/config/m68k/m68k.md	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/m68k/m68k.md gcc-6.1.0.aros/gcc/config/m68k/m68k.md
+--- gcc-6.1.0/gcc/config/m68k/m68k.md	2016-02-22 14:22:07.000000000 +0000
++++ gcc-6.1.0.aros/gcc/config/m68k/m68k.md	2016-04-27 15:13:21.001535038 +0100
 @@ -133,7 +133,8 @@
    [(D0_REG		0)
     (A0_REG		8)
@@ -573,15 +573,15 @@ diff -ruN gcc-6-20160313/gcc/config/m68k/m68k.md gcc-6-20160313.aros/gcc/config/
        return MOTOROLA ? "move.l %?(%1),%0" : "movel %1@(%?), %0";
      }
    else if (MOTOROLA)
-diff -ruN gcc-6-20160313/gcc/config/m68k/t-aros gcc-6-20160313.aros/gcc/config/m68k/t-aros
---- gcc-6-20160313/gcc/config/m68k/t-aros	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/m68k/t-aros	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/m68k/t-aros gcc-6.1.0.aros/gcc/config/m68k/t-aros
+--- gcc-6.1.0/gcc/config/m68k/t-aros	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/m68k/t-aros	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,2 @@
 +# Custom multilibs for AROS
 +M68K_MLIB_CPU += && match(MLIB, "^68")
-diff -ruN gcc-6-20160313/gcc/config/rs6000/aros.h gcc-6-20160313.aros/gcc/config/rs6000/aros.h
---- gcc-6-20160313/gcc/config/rs6000/aros.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/rs6000/aros.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/rs6000/aros.h gcc-6.1.0.aros/gcc/config/rs6000/aros.h
+--- gcc-6.1.0/gcc/config/rs6000/aros.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/rs6000/aros.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,151 @@
 +/* Definitions for Powerpc running AROS systems with ELF format.
 +   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
@@ -734,9 +734,9 @@ diff -ruN gcc-6-20160313/gcc/config/rs6000/aros.h gcc-6-20160313.aros/gcc/config
 +
 +/* FIXME: AROS doesn't support dw2 unwinding yet.  */
 +#undef MD_FALLBACK_FRAME_STATE_FOR
-diff -ruN gcc-6-20160313/gcc/config/rs6000/rs6000.c gcc-6-20160313.aros/gcc/config/rs6000/rs6000.c
---- gcc-6-20160313/gcc/config/rs6000/rs6000.c	2016-03-10 23:58:44.000000000 +0000
-+++ gcc-6-20160313.aros/gcc/config/rs6000/rs6000.c	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/rs6000/rs6000.c gcc-6.1.0.aros/gcc/config/rs6000/rs6000.c
+--- gcc-6.1.0/gcc/config/rs6000/rs6000.c	2016-04-15 00:21:30.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/rs6000/rs6000.c	2016-04-27 15:13:21.001535038 +0100
 @@ -1429,6 +1429,8 @@
      false },
    { "shortcall", 0, 0, false, true,  true,  rs6000_handle_longcall_attribute,
@@ -746,7 +746,7 @@ diff -ruN gcc-6-20160313/gcc/config/rs6000/rs6000.c gcc-6-20160313.aros/gcc/conf
    { "ms_struct", 0, 0, false, false, false, rs6000_handle_struct_attribute,
      false },
    { "gcc_struct", 0, 0, false, false, false, rs6000_handle_struct_attribute,
-@@ -9914,6 +9916,9 @@
+@@ -9934,6 +9936,9 @@
  	  && !lookup_attribute ("shortcall", TYPE_ATTRIBUTES (fntype))))
      cum->call_cookie |= CALL_LONG;
  
@@ -756,7 +756,7 @@ diff -ruN gcc-6-20160313/gcc/config/rs6000/rs6000.c gcc-6-20160313.aros/gcc/conf
    if (TARGET_DEBUG_ARG)
      {
        fprintf (stderr, "\ninit_cumulative_args:");
-@@ -11060,6 +11065,9 @@
+@@ -11080,6 +11085,9 @@
  
    rs6000_discover_homogeneous_aggregate (mode, type, &elt_mode, &n_elts);
  
@@ -766,7 +766,7 @@ diff -ruN gcc-6-20160313/gcc/config/rs6000/rs6000.c gcc-6-20160313.aros/gcc/conf
    if (TARGET_MACHO && rs6000_darwin64_struct_check_p (mode, type))
      {
        rtx rslt = rs6000_darwin64_record_arg (cum, type, named, /*retval= */false);
-@@ -11668,6 +11676,9 @@
+@@ -11688,6 +11696,9 @@
    int first_reg_offset;
    alias_set_type set;
  
@@ -776,9 +776,9 @@ diff -ruN gcc-6-20160313/gcc/config/rs6000/rs6000.c gcc-6-20160313.aros/gcc/conf
    /* Skip the last named argument.  */
    next_cum = *get_cumulative_args (cum);
    rs6000_function_arg_advance_1 (&next_cum, mode, type, true, 0);
-diff -ruN gcc-6-20160313/gcc/config/rs6000/rs6000.h gcc-6-20160313.aros/gcc/config/rs6000/rs6000.h
---- gcc-6-20160313/gcc/config/rs6000/rs6000.h	2016-01-20 20:30:24.000000000 +0000
-+++ gcc-6-20160313.aros/gcc/config/rs6000/rs6000.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/rs6000/rs6000.h gcc-6.1.0.aros/gcc/config/rs6000/rs6000.h
+--- gcc-6.1.0/gcc/config/rs6000/rs6000.h	2016-01-20 20:30:24.000000000 +0000
++++ gcc-6.1.0.aros/gcc/config/rs6000/rs6000.h	2016-04-27 15:13:21.001535038 +0100
 @@ -1836,6 +1836,7 @@
    int nargs_prototype;		/* # args left in the current prototype */
    int prototype;		/* Whether a prototype was defined */
@@ -787,9 +787,9 @@ diff -ruN gcc-6-20160313/gcc/config/rs6000/rs6000.h gcc-6-20160313.aros/gcc/conf
    int call_cookie;		/* Do special things for this call */
    int sysv_gregno;		/* next available GP register */
    int intoffset;		/* running offset in struct (darwin64) */
-diff -ruN gcc-6-20160313/gcc/config/t-aros gcc-6-20160313.aros/gcc/config/t-aros
---- gcc-6-20160313/gcc/config/t-aros	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/config/t-aros	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config/t-aros gcc-6.1.0.aros/gcc/config/t-aros
+--- gcc-6.1.0/gcc/config/t-aros	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config/t-aros	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,29 @@
 +# In AROS, "/usr" is a four-letter word.
 +# Must match NATIVE_SYSTEM_HEADER_COMPONENT in aros.h !
@@ -820,9 +820,9 @@ diff -ruN gcc-6-20160313/gcc/config/t-aros gcc-6-20160313.aros/gcc/config/t-aros
 +	  cp $(srcdir)/ginclude/$$file include/$$file; \
 +	  chmod a+r include/$$file; \
 +	done
-diff -ruN gcc-6-20160313/gcc/config.build gcc-6-20160313.aros/gcc/config.build
---- gcc-6-20160313/gcc/config.build	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/gcc/config.build	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config.build gcc-6.1.0.aros/gcc/config.build
+--- gcc-6.1.0/gcc/config.build	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/gcc/config.build	2016-04-27 15:13:21.001535038 +0100
 @@ -73,6 +73,9 @@
      build_xm_file=i386/xm-djgpp.h
      build_exeext=.exe
@@ -833,9 +833,9 @@ diff -ruN gcc-6-20160313/gcc/config.build gcc-6-20160313.aros/gcc/config.build
    *-*-sysv*)
      # All other System V variants.
      build_install_headers_dir=install-headers-cpio
-diff -ruN gcc-6-20160313/gcc/config.gcc gcc-6-20160313.aros/gcc/config.gcc
---- gcc-6-20160313/gcc/config.gcc	2016-03-02 09:53:05.000000000 +0000
-+++ gcc-6-20160313.aros/gcc/config.gcc	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config.gcc gcc-6.1.0.aros/gcc/config.gcc
+--- gcc-6.1.0/gcc/config.gcc	2016-04-11 11:14:59.000000000 +0100
++++ gcc-6.1.0.aros/gcc/config.gcc	2016-04-27 15:13:21.001535038 +0100
 @@ -798,6 +798,15 @@
        ;;
    esac
@@ -929,9 +929,9 @@ diff -ruN gcc-6-20160313/gcc/config.gcc gcc-6-20160313.aros/gcc/config.gcc
  powerpc*-*-linux*)
  	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h freebsd-spec.h rs6000/sysv4.h"
  	extra_options="${extra_options} rs6000/sysv4.opt"
-diff -ruN gcc-6-20160313/gcc/config.host gcc-6-20160313.aros/gcc/config.host
---- gcc-6-20160313/gcc/config.host	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/gcc/config.host	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/config.host gcc-6.1.0.aros/gcc/config.host
+--- gcc-6.1.0/gcc/config.host	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/gcc/config.host	2016-04-27 15:13:21.001535038 +0100
 @@ -281,6 +281,10 @@
      out_host_hook_obj=host-hpux.o
      host_xmake_file="${host_xmake_file} x-hpux"
@@ -943,44 +943,44 @@ diff -ruN gcc-6-20160313/gcc/config.host gcc-6-20160313.aros/gcc/config.host
    *-*-*vms*)
      host_xm_file="vms/xm-vms.h"
      host_xmake_file=vms/x-vms
-diff -ruN gcc-6-20160313/gcc/ginclude/aros/types/null.h gcc-6-20160313.aros/gcc/ginclude/aros/types/null.h
---- gcc-6-20160313/gcc/ginclude/aros/types/null.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/ginclude/aros/types/null.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/ginclude/aros/types/null.h gcc-6.1.0.aros/gcc/ginclude/aros/types/null.h
+--- gcc-6.1.0/gcc/ginclude/aros/types/null.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/ginclude/aros/types/null.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,3 @@
 +/* Replace AROS' NULL definition with gcc's one */
 +#define __need_NULL
 +#include <stddef.h>
-diff -ruN gcc-6-20160313/gcc/ginclude/aros/types/ptrdiff_t.h gcc-6-20160313.aros/gcc/ginclude/aros/types/ptrdiff_t.h
---- gcc-6-20160313/gcc/ginclude/aros/types/ptrdiff_t.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/ginclude/aros/types/ptrdiff_t.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/ginclude/aros/types/ptrdiff_t.h gcc-6.1.0.aros/gcc/ginclude/aros/types/ptrdiff_t.h
+--- gcc-6.1.0/gcc/ginclude/aros/types/ptrdiff_t.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/ginclude/aros/types/ptrdiff_t.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,3 @@
 +/* Replace AROS' ptrdiff_t definition with gcc's one */
 +#define __need_ptrdiff_t
 +#include <stddef.h>
-diff -ruN gcc-6-20160313/gcc/ginclude/aros/types/size_t.h gcc-6-20160313.aros/gcc/ginclude/aros/types/size_t.h
---- gcc-6-20160313/gcc/ginclude/aros/types/size_t.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/ginclude/aros/types/size_t.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/ginclude/aros/types/size_t.h gcc-6.1.0.aros/gcc/ginclude/aros/types/size_t.h
+--- gcc-6.1.0/gcc/ginclude/aros/types/size_t.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/ginclude/aros/types/size_t.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,3 @@
 +/* Replace AROS' size_t definition with gcc's one */
 +#define __need_size_t
 +#include <stddef.h>
-diff -ruN gcc-6-20160313/gcc/ginclude/aros/types/wchar_t.h gcc-6-20160313.aros/gcc/ginclude/aros/types/wchar_t.h
---- gcc-6-20160313/gcc/ginclude/aros/types/wchar_t.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/ginclude/aros/types/wchar_t.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/ginclude/aros/types/wchar_t.h gcc-6.1.0.aros/gcc/ginclude/aros/types/wchar_t.h
+--- gcc-6.1.0/gcc/ginclude/aros/types/wchar_t.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/ginclude/aros/types/wchar_t.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,3 @@
 +/* Replace AROS' wchar_t definition with gcc's one */
 +#define __need_wchar_t
 +#include <stddef.h>
-diff -ruN gcc-6-20160313/gcc/ginclude/aros/types/wint_t.h gcc-6-20160313.aros/gcc/ginclude/aros/types/wint_t.h
---- gcc-6-20160313/gcc/ginclude/aros/types/wint_t.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/gcc/ginclude/aros/types/wint_t.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/ginclude/aros/types/wint_t.h gcc-6.1.0.aros/gcc/ginclude/aros/types/wint_t.h
+--- gcc-6.1.0/gcc/ginclude/aros/types/wint_t.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/gcc/ginclude/aros/types/wint_t.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,3 @@
 +/* Replace AROS' wint_t definition with gcc's one */
 +#define __need_wint_t
 +#include <stddef.h>
-diff -ruN gcc-6-20160313/gcc/ginclude/stddef.h gcc-6-20160313.aros/gcc/ginclude/stddef.h
---- gcc-6-20160313/gcc/ginclude/stddef.h	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/gcc/ginclude/stddef.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/gcc/ginclude/stddef.h gcc-6.1.0.aros/gcc/ginclude/stddef.h
+--- gcc-6.1.0/gcc/ginclude/stddef.h	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/gcc/ginclude/stddef.h	2016-04-27 15:13:21.001535038 +0100
 @@ -131,6 +131,7 @@
  #ifndef __PTRDIFF_T
  #ifndef _PTRDIFF_T_
@@ -1029,9 +1029,9 @@ diff -ruN gcc-6-20160313/gcc/ginclude/stddef.h gcc-6-20160313.aros/gcc/ginclude/
  #endif /* _BSD_SIZE_T_ */
  #endif /* _SIZE_T_ */
  #endif /* __SIZE_T */
-diff -ruN gcc-6-20160313/include/filenames.h gcc-6-20160313.aros/include/filenames.h
---- gcc-6-20160313/include/filenames.h	2015-07-14 17:08:59.000000000 +0100
-+++ gcc-6-20160313.aros/include/filenames.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/include/filenames.h gcc-6.1.0.aros/include/filenames.h
+--- gcc-6.1.0/include/filenames.h	2015-07-14 17:08:59.000000000 +0100
++++ gcc-6.1.0.aros/include/filenames.h	2016-04-27 15:13:21.001535038 +0100
 @@ -42,6 +42,10 @@
  #  define HAS_DRIVE_SPEC(f) HAS_DOS_DRIVE_SPEC (f)
  #  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
@@ -1043,9 +1043,9 @@ diff -ruN gcc-6-20160313/include/filenames.h gcc-6-20160313.aros/include/filenam
  #else /* not DOSish */
  #  if defined(__APPLE__)
  #    ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
-diff -ruN gcc-6-20160313/libgcc/config.host gcc-6-20160313.aros/libgcc/config.host
---- gcc-6-20160313/libgcc/config.host	2016-02-26 20:02:28.000000000 +0000
-+++ gcc-6-20160313.aros/libgcc/config.host	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libgcc/config.host gcc-6.1.0.aros/libgcc/config.host
+--- gcc-6.1.0/libgcc/config.host	2016-02-26 20:02:28.000000000 +0000
++++ gcc-6.1.0.aros/libgcc/config.host	2016-04-27 15:13:21.001535038 +0100
 @@ -804,7 +804,7 @@
  m32rle-*-linux*)
  	tmake_file="$tmake_file m32r/t-linux t-fdpbit"
@@ -1065,9 +1065,9 @@ diff -ruN gcc-6-20160313/libgcc/config.host gcc-6-20160313.aros/libgcc/config.ho
  *)
  	echo "*** Configuration ${host} not supported" 1>&2
  	exit 1
-diff -ruN gcc-6-20160313/libgcc/gthr.h gcc-6-20160313.aros/libgcc/gthr.h
---- gcc-6-20160313/libgcc/gthr.h	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/libgcc/gthr.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libgcc/gthr.h gcc-6.1.0.aros/libgcc/gthr.h
+--- gcc-6.1.0/libgcc/gthr.h	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/libgcc/gthr.h	2016-04-27 15:13:21.001535038 +0100
 @@ -141,6 +141,11 @@
  #define GTHREAD_USE_WEAK 0
  #endif
@@ -1080,9 +1080,9 @@ diff -ruN gcc-6-20160313/libgcc/gthr.h gcc-6-20160313.aros/libgcc/gthr.h
  #ifndef GTHREAD_USE_WEAK
  #define GTHREAD_USE_WEAK 1
  #endif
-diff -ruN gcc-6-20160313/libgcc/unwind-dw2.c gcc-6-20160313.aros/libgcc/unwind-dw2.c
---- gcc-6-20160313/libgcc/unwind-dw2.c	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/libgcc/unwind-dw2.c	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libgcc/unwind-dw2.c gcc-6.1.0.aros/libgcc/unwind-dw2.c
+--- gcc-6.1.0/libgcc/unwind-dw2.c	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/libgcc/unwind-dw2.c	2016-04-27 15:13:21.001535038 +0100
 @@ -1542,7 +1542,9 @@
  static inline void
  init_dwarf_reg_size_table (void)
@@ -1093,9 +1093,9 @@ diff -ruN gcc-6-20160313/libgcc/unwind-dw2.c gcc-6-20160313.aros/libgcc/unwind-d
  }
  
  static void __attribute__((noinline))
-diff -ruN gcc-6-20160313/libgcc/unwind-dw2-fde.c gcc-6-20160313.aros/libgcc/unwind-dw2-fde.c
---- gcc-6-20160313/libgcc/unwind-dw2-fde.c	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/libgcc/unwind-dw2-fde.c	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libgcc/unwind-dw2-fde.c gcc-6.1.0.aros/libgcc/unwind-dw2-fde.c
+--- gcc-6.1.0/libgcc/unwind-dw2-fde.c	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/libgcc/unwind-dw2-fde.c	2016-04-27 15:13:21.001535038 +0100
 @@ -92,12 +92,16 @@
  #endif
  
@@ -1113,9 +1113,9 @@ diff -ruN gcc-6-20160313/libgcc/unwind-dw2-fde.c gcc-6-20160313.aros/libgcc/unwi
  }
  
  void
-diff -ruN gcc-6-20160313/libiberty/filename_cmp.c gcc-6-20160313.aros/libiberty/filename_cmp.c
---- gcc-6-20160313/libiberty/filename_cmp.c	2014-11-11 23:33:25.000000000 +0000
-+++ gcc-6-20160313.aros/libiberty/filename_cmp.c	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libiberty/filename_cmp.c gcc-6.1.0.aros/libiberty/filename_cmp.c
+--- gcc-6.1.0/libiberty/filename_cmp.c	2014-11-11 23:33:25.000000000 +0000
++++ gcc-6.1.0.aros/libiberty/filename_cmp.c	2016-04-27 15:13:21.001535038 +0100
 @@ -55,9 +55,12 @@
  int
  filename_cmp (const char *s1, const char *s2)
@@ -1131,9 +1131,9 @@ diff -ruN gcc-6-20160313/libiberty/filename_cmp.c gcc-6-20160313.aros/libiberty/
  #else
    for (;;)
      {
-diff -ruN gcc-6-20160313/libobjc/configure gcc-6-20160313.aros/libobjc/configure
---- gcc-6-20160313/libobjc/configure	2016-03-13 22:33:04.000000000 +0000
-+++ gcc-6-20160313.aros/libobjc/configure	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libobjc/configure gcc-6.1.0.aros/libobjc/configure
+--- gcc-6.1.0/libobjc/configure	2016-04-27 09:22:11.000000000 +0100
++++ gcc-6.1.0.aros/libobjc/configure	2016-04-27 15:13:21.001535038 +0100
 @@ -11253,214 +11253,7 @@
  # -----------
  
@@ -1350,9 +1350,9 @@ diff -ruN gcc-6-20160313/libobjc/configure gcc-6-20160313.aros/libobjc/configure
  
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the type of bitfields matters" >&5
-diff -ruN gcc-6-20160313/libobjc/configure.ac gcc-6-20160313.aros/libobjc/configure.ac
---- gcc-6-20160313/libobjc/configure.ac	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/libobjc/configure.ac	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libobjc/configure.ac gcc-6.1.0.aros/libobjc/configure.ac
+--- gcc-6.1.0/libobjc/configure.ac	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/libobjc/configure.ac	2016-04-27 15:13:21.001535038 +0100
 @@ -210,7 +210,7 @@
  # -----------
  
@@ -1362,9 +1362,9 @@ diff -ruN gcc-6-20160313/libobjc/configure.ac gcc-6-20160313.aros/libobjc/config
  
  gt_BITFIELD_TYPE_MATTERS
  
-diff -ruN gcc-6-20160313/libobjc/thr.c gcc-6-20160313.aros/libobjc/thr.c
---- gcc-6-20160313/libobjc/thr.c	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/libobjc/thr.c	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libobjc/thr.c gcc-6.1.0.aros/libobjc/thr.c
+--- gcc-6.1.0/libobjc/thr.c	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/libobjc/thr.c	2016-04-27 15:13:21.001535038 +0100
 @@ -35,6 +35,7 @@
  #include "objc/runtime.h"
  #include "objc-private/module-abi-8.h"
@@ -1373,9 +1373,9 @@ diff -ruN gcc-6-20160313/libobjc/thr.c gcc-6-20160313.aros/libobjc/thr.c
  #include <gthr.h>
  
  #include <stdlib.h>
-diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_base.h gcc-6-20160313.aros/libstdc++-v3/config/os/aros/ctype_base.h
---- gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_base.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/libstdc++-v3/config/os/aros/ctype_base.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/config/os/aros/ctype_base.h gcc-6.1.0.aros/libstdc++-v3/config/os/aros/ctype_base.h
+--- gcc-6.1.0/libstdc++-v3/config/os/aros/ctype_base.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/libstdc++-v3/config/os/aros/ctype_base.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,30 @@
 +namespace std _GLIBCXX_VISIBILITY(default)
 +{
@@ -1407,9 +1407,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_base.h gcc-6-20160313
 +
 +_GLIBCXX_END_NAMESPACE_VERSION
 +} // namespace
-diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_configure_char.cc gcc-6-20160313.aros/libstdc++-v3/config/os/aros/ctype_configure_char.cc
---- gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_configure_char.cc	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/libstdc++-v3/config/os/aros/ctype_configure_char.cc	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/config/os/aros/ctype_configure_char.cc gcc-6.1.0.aros/libstdc++-v3/config/os/aros/ctype_configure_char.cc
+--- gcc-6.1.0/libstdc++-v3/config/os/aros/ctype_configure_char.cc	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/libstdc++-v3/config/os/aros/ctype_configure_char.cc	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,99 @@
 +// Locale support -*- C++ -*-
 +
@@ -1510,9 +1510,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_configure_char.cc gcc
 +
 +_GLIBCXX_END_NAMESPACE_VERSION
 +} // namespace
-diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_inline.h gcc-6-20160313.aros/libstdc++-v3/config/os/aros/ctype_inline.h
---- gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_inline.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/libstdc++-v3/config/os/aros/ctype_inline.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/config/os/aros/ctype_inline.h gcc-6.1.0.aros/libstdc++-v3/config/os/aros/ctype_inline.h
+--- gcc-6.1.0/libstdc++-v3/config/os/aros/ctype_inline.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/libstdc++-v3/config/os/aros/ctype_inline.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,173 @@
 +// Locale support -*- C++ -*-
 +
@@ -1687,9 +1687,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_inline.h gcc-6-201603
 +
 +_GLIBCXX_END_NAMESPACE_VERSION
 +} // namespace
-diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_noninline.h gcc-6-20160313.aros/libstdc++-v3/config/os/aros/ctype_noninline.h
---- gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_noninline.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/libstdc++-v3/config/os/aros/ctype_noninline.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/config/os/aros/ctype_noninline.h gcc-6.1.0.aros/libstdc++-v3/config/os/aros/ctype_noninline.h
+--- gcc-6.1.0/libstdc++-v3/config/os/aros/ctype_noninline.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/libstdc++-v3/config/os/aros/ctype_noninline.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,56 @@
 +  const ctype_base::mask*
 +  ctype<char>::classic_table() throw()
@@ -1747,9 +1747,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/ctype_noninline.h gcc-6-201
 +      }
 +    return __high;
 +  }
-diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/os_defines.h gcc-6-20160313.aros/libstdc++-v3/config/os/aros/os_defines.h
---- gcc-6-20160313/libstdc++-v3/config/os/aros/os_defines.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-6-20160313.aros/libstdc++-v3/config/os/aros/os_defines.h	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/config/os/aros/os_defines.h gcc-6.1.0.aros/libstdc++-v3/config/os/aros/os_defines.h
+--- gcc-6.1.0/libstdc++-v3/config/os/aros/os_defines.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-6.1.0.aros/libstdc++-v3/config/os/aros/os_defines.h	2016-04-27 15:13:21.001535038 +0100
 @@ -0,0 +1,11 @@
 +// Specific definitions for AROS  -*- C++ -*-
 +
@@ -1762,9 +1762,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/config/os/aros/os_defines.h gcc-6-20160313
 +#define _GLIBCXX_USE_WEAK_REF 0
 +
 +#endif
-diff -ruN gcc-6-20160313/libstdc++-v3/configure gcc-6-20160313.aros/libstdc++-v3/configure
---- gcc-6-20160313/libstdc++-v3/configure	2016-02-08 15:37:59.000000000 +0000
-+++ gcc-6-20160313.aros/libstdc++-v3/configure	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/configure gcc-6.1.0.aros/libstdc++-v3/configure
+--- gcc-6.1.0/libstdc++-v3/configure	2016-04-05 20:03:46.000000000 +0100
++++ gcc-6.1.0.aros/libstdc++-v3/configure	2016-04-27 15:13:21.001535038 +0100
 @@ -5365,12 +5365,12 @@
  
  
@@ -1868,9 +1868,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/configure gcc-6-20160313.aros/libstdc++-v3
    arm*-*-symbianelf*)
      # This is a freestanding configuration; there is nothing to do here.
      ;;
-diff -ruN gcc-6-20160313/libstdc++-v3/configure.ac gcc-6-20160313.aros/libstdc++-v3/configure.ac
---- gcc-6-20160313/libstdc++-v3/configure.ac	2016-01-15 22:42:41.000000000 +0000
-+++ gcc-6-20160313.aros/libstdc++-v3/configure.ac	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/configure.ac gcc-6.1.0.aros/libstdc++-v3/configure.ac
+--- gcc-6.1.0/libstdc++-v3/configure.ac	2016-01-15 22:42:41.000000000 +0000
++++ gcc-6.1.0.aros/libstdc++-v3/configure.ac	2016-04-27 15:13:21.001535038 +0100
 @@ -89,9 +89,9 @@
  GLIBCXX_CONFIGURE
  
@@ -1884,9 +1884,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/configure.ac gcc-6-20160313.aros/libstdc++
  AM_PROG_LIBTOOL
  ACX_LT_HOST_FLAGS
  AC_SUBST(enable_shared)
-diff -ruN gcc-6-20160313/libstdc++-v3/configure.host gcc-6-20160313.aros/libstdc++-v3/configure.host
---- gcc-6-20160313/libstdc++-v3/configure.host	2016-01-13 09:48:53.000000000 +0000
-+++ gcc-6-20160313.aros/libstdc++-v3/configure.host	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/configure.host gcc-6.1.0.aros/libstdc++-v3/configure.host
+--- gcc-6.1.0/libstdc++-v3/configure.host	2016-01-13 09:48:53.000000000 +0000
++++ gcc-6.1.0.aros/libstdc++-v3/configure.host	2016-04-27 15:13:21.001535038 +0100
 @@ -226,6 +226,9 @@
      os_include_dir="os/generic"
      atomicity_dir="cpu/generic"
@@ -1897,9 +1897,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/configure.host gcc-6-20160313.aros/libstdc
    bsd*)
      # Plain BSD attempts to share FreeBSD files.
      os_include_dir="os/bsd/freebsd"
-diff -ruN gcc-6-20160313/libstdc++-v3/crossconfig.m4 gcc-6-20160313.aros/libstdc++-v3/crossconfig.m4
---- gcc-6-20160313/libstdc++-v3/crossconfig.m4	2015-10-11 23:34:28.000000000 +0100
-+++ gcc-6-20160313.aros/libstdc++-v3/crossconfig.m4	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/crossconfig.m4 gcc-6.1.0.aros/libstdc++-v3/crossconfig.m4
+--- gcc-6.1.0/libstdc++-v3/crossconfig.m4	2015-10-11 23:34:28.000000000 +0100
++++ gcc-6.1.0.aros/libstdc++-v3/crossconfig.m4	2016-04-27 15:13:21.001535038 +0100
 @@ -5,6 +5,31 @@
  AC_DEFUN([GLIBCXX_CROSSCONFIG],[
  # Base decisions on target environment.
@@ -1932,9 +1932,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/crossconfig.m4 gcc-6-20160313.aros/libstdc
    arm*-*-symbianelf*)
      # This is a freestanding configuration; there is nothing to do here.
      ;;
-diff -ruN gcc-6-20160313/libstdc++-v3/include/Makefile.in gcc-6-20160313.aros/libstdc++-v3/include/Makefile.in
---- gcc-6-20160313/libstdc++-v3/include/Makefile.in	2016-01-25 16:44:30.000000000 +0000
-+++ gcc-6-20160313.aros/libstdc++-v3/include/Makefile.in	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/include/Makefile.in gcc-6.1.0.aros/libstdc++-v3/include/Makefile.in
+--- gcc-6.1.0/libstdc++-v3/include/Makefile.in	2016-03-23 00:41:52.000000000 +0000
++++ gcc-6.1.0.aros/libstdc++-v3/include/Makefile.in	2016-04-27 15:13:21.001535038 +0100
 @@ -1686,6 +1686,7 @@
  	    -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
  	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
@@ -1943,9 +1943,9 @@ diff -ruN gcc-6-20160313/libstdc++-v3/include/Makefile.in gcc-6-20160313.aros/li
  	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
  	    < $< > $@
  
-diff -ruN gcc-6-20160313/libstdc++-v3/include/std/ratio gcc-6-20160313.aros/libstdc++-v3/include/std/ratio
---- gcc-6-20160313/libstdc++-v3/include/std/ratio	2016-01-04 14:30:50.000000000 +0000
-+++ gcc-6-20160313.aros/libstdc++-v3/include/std/ratio	2016-03-30 12:04:49.763705461 +0100
+diff -ruN gcc-6.1.0/libstdc++-v3/include/std/ratio gcc-6.1.0.aros/libstdc++-v3/include/std/ratio
+--- gcc-6.1.0/libstdc++-v3/include/std/ratio	2016-01-04 14:30:50.000000000 +0000
++++ gcc-6.1.0.aros/libstdc++-v3/include/std/ratio	2016-04-27 15:13:21.001535038 +0100
 @@ -211,10 +211,10 @@
      {
      private:
-- 
2.11.4.GIT