gcc-git: Added _branch variable for easy switching

.. required two different versions of
0007-Windows-New-feature-to-allow-overriding-lmsvcrt.patch

mingw-w64-gcc-git/0007-gcc-5-branch-Windows-New-feature-to-allow-overriding-lmsvcrt.patch

@@ -1,7 +1,7 @@
 From 9a5802335d195c8b1bf577bbc00e7905c2ed8226 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 5 Aug 2015 23:36:13 +0100
-Subject: [PATCH 07/21] Windows: New feature to allow overriding -lmsvcrt
+Subject: [PATCH 07/21] gcc-5-branch Windows: New feature to allow overriding -lmsvcrt
 
 Added in support of the MinGW-w64 WIP feature "agile mscvrt dll" where
 a process' loaded msvc runtime is used by a newly loaded DLL rather than

mingw-w64-gcc-git/0007-master-Windows-New-feature-to-allow-overriding-lmsvcrt.patch

@@ -0,0 +1,43 @@
+From aa1cf6450bfaaaeee75c6aaa16631dc6f606f16b Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Wed, 5 Aug 2015 23:36:13 +0100
+Subject: [PATCH 07/20] master Windows: New feature to allow overriding -lmsvcrt
+
+Added in support of the MinGW-w64 WIP feature "agile mscvrt dll" where
+a process' loaded msvc runtime is used by a newly loaded DLL rather than
+always using msvcrt.dll
+---
+ gcc/config/i386/cygming.opt | 3 +++
+ gcc/config/i386/mingw32.h   | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/config/i386/cygming.opt b/gcc/config/i386/cygming.opt
+index c7e398f..dfddaf8 100644
+--- a/gcc/config/i386/cygming.opt
++++ b/gcc/config/i386/cygming.opt
+@@ -22,6 +22,9 @@ mconsole
+ Target RejectNegative
+ Create console application
+ 
++mcrtdll=
++Target RejectNegative Joined
++
+ mdll
+ Target RejectNegative
+ Generate code for a DLL
+diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
+index eef90fb..47e12e7 100644
+--- a/gcc/config/i386/mingw32.h
++++ b/gcc/config/i386/mingw32.h
+@@ -140,7 +140,7 @@ along with GCC; see the file COPYING3.  If not see
+ #define REAL_LIBGCC_SPEC \
+   "%{mthreads:-lmingwthrd} -lmingw32 \
+    " SHARED_LIBGCC_SPEC " \
+-   -lmoldname -lmingwex -lmsvcrt"
++   -lmoldname -lmingwex %{!mcrtdll=*:-lmsvcrt} %{mcrtdll=*:-l%*}"
+ 
+ #undef STARTFILE_SPEC
+ #define STARTFILE_SPEC "%{shared|mdll:dllcrt2%O%s} \
+-- 
+2.5.0
+

mingw-w64-gcc-git/PKGBUILD

@@ -10,8 +10,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-fortran-git"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-ada-git"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-objc-git")
-pkgver=r138262.b510e09
-_realpkgver=5.2.1
+pkgver=r140440.03cb8c1
 pkgrel=1
 pkgdesc="GCC for the MinGW-w64"
 arch=('any')
@@ -34,14 +33,22 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-${_realname}"
 #checkdepends=('dejagnu')
 optdepends=()
 options=('staticlibs' '!emptydirs' '!strip' 'debug')
-source=("git://gcc.gnu.org/git/gcc.git#branch=gcc-5-branch"
+_branch=gcc-5-branch
+#_branch=master
+if [ "${_branch} = "master" ]; then
+  _realpkgver=6.0.0
+else
+  _realpkgver=5.2.1
+fiS
+source=("git://gcc.gnu.org/git/gcc.git#branch=${_branch}"
         "0001-Relocate-libintl.patch"
         "0002-PR54314-Include-_ZTC-in-libstdc-exports-deprecated.patch"
         "0003-PR52300-Avoid-__weakref__-on-__MINGW32__-deprecated.patch"
         "0004-Windows-Follow-Posix-dir-exists-semantics-more-close.patch"
         "0005-Windows-Use-not-in-progpath-and-leave-case-as-is.patch"
         "0006-Windows-Don-t-ignore-native-system-header-dir.patch"
-        "0007-Windows-New-feature-to-allow-overriding-lmsvcrt.patch"
+        "0007-master-Windows-New-feature-to-allow-overriding-lmsvcrt.patch"
+        "0007-gcc-5-branch-Windows-New-feature-to-allow-overriding-lmsvcrt.patch"
         "0008-libgomp-Use-gomp_malloc_cleared-instead-of-gomp_mall.patch"
         "0009-Build-EXTRA_GNATTOOLS-for-Ada.patch"
         "0010-Prettify-linking-no-undefined.patch"
@@ -63,7 +70,8 @@ md5sums=('SKIP'
          'bf189ec9bceb018ab7d4934723a4f8f6'
          '7efc5a9f51f997b8cff40fdfa0b7dc23'
          '6b7628d9583c1781b69f406e9c2c8bb9'
-         'e01f7479666af3eead06d95a954ee857'
+         'a886e4914107b5019ff5dbcc8456eef2'
+         'ebb2dac7bae6e8f8076a61a0afed0c9d'
          '31940882ee9a9d41636f917aa431f268'
          'b4ad313ad24f2c566a3df6502b35dc20'
          '16013736d1a50f4ac5975f92db4aef49'
@@ -95,7 +103,7 @@ prepare() {
   git am "${srcdir}"/0004-Windows-Follow-Posix-dir-exists-semantics-more-close.patch
   git am "${srcdir}"/0005-Windows-Use-not-in-progpath-and-leave-case-as-is.patch
   git am "${srcdir}"/0006-Windows-Don-t-ignore-native-system-header-dir.patch
-  git am "${srcdir}"/0007-Windows-New-feature-to-allow-overriding-lmsvcrt.patch
+  git am "${srcdir}"/0007-${_branch}-Windows-New-feature-to-allow-overriding-lmsvcrt.patch
   git am "${srcdir}"/0008-libgomp-Use-gomp_malloc_cleared-instead-of-gomp_mall.patch
   git am "${srcdir}"/0009-Build-EXTRA_GNATTOOLS-for-Ada.patch
   git am "${srcdir}"/0010-Prettify-linking-no-undefined.patch