From e183a9d567a9a41af5077393b43a9d9a08c71879 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Sun, 12 Apr 2015 22:49:37 +0200
Subject: [PATCH] gcc_release: For RELEASE_MAJOR 5+ only use the major number
 in branch name.

	* gcc_release: For RELEASE_MAJOR 5+ only use the major
	number in branch name.  When doing final release of 5+,
	if BASE-VER doesn't match release, but is *.*.1 for the
	one smaller minor version, bump BASE-VER.

From-SVN: r222031
---
 maintainer-scripts/ChangeLog   |  5 +++++
 maintainer-scripts/gcc_release | 24 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index c69a22ff639..5e152295c52 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,5 +1,10 @@
 2015-04-12  Jakub Jelinek  <jakub@redhat.com>
 
+	* gcc_release: For RELEASE_MAJOR 5+ only use the major
+	number in branch name.  When doing final release of 5+,
+	if BASE-VER doesn't match release, but is *.*.1 for the
+	one smaller minor version, bump BASE-VER.
+
 	* crontab: Enable snapshots from gcc-5-branch.
 
 2015-04-07  Gerald Pfeifer  <gerald@pfeifer.com>
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index c20b410bd22..80ddda1e26b 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -9,7 +9,7 @@
 # Contents:
 #   Script to create a GCC release.
 #
-# Copyright (c) 2001-2014 Free Software Foundation.
+# Copyright (c) 2001-2015 Free Software Foundation.
 #
 # This file is part of GCC.
 #
@@ -130,8 +130,20 @@ EOF
 
     # Update gcc/DEV-PHASE.
 
-    [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ] || \
-    error "Release number ${RELEASE} does not match BASE-VER"
+    if [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ]; then
+      [ ${RELEASE_MAJOR} -lt 5 ] && \
+	error "Release number ${RELEASE} does not match BASE-VER"
+      if [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` \
+	   = ${RELEASE_MAJOR}.`expr ${RELEASE_MINOR} - 1`.1 \
+	   -a x${RELEASE_REVISION} = x0 ]; then
+	(changedir ${SOURCE_DIRECTORY}/gcc && \
+	 echo ${RELEASE} > BASE-VER && \
+	 ${SVN} -q ci -m 'Bump release' BASE-VER) || \
+	error "Could not update BASE-VER"
+      else
+	error "Release number ${RELEASE} does not match BASE-VER"
+      fi
+    fi
     (changedir ${SOURCE_DIRECTORY}/gcc && \
      : > DEV-PHASE && \
      ${SVN} -q ci -m 'Mark as release' DEV-PHASE) || \
@@ -605,7 +617,11 @@ if [ $SNAPSHOT -eq 0 ]; then
 
   # Compute the name of the branch, which is based solely on the major
   # and minor release numbers.
-  SVNBRANCH="branches/gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
+  if [ ${RELEASE_MAJOR} -ge 5 ]; then
+    SVNBRANCH="branches/gcc-${RELEASE_MAJOR}-branch"
+  else
+    SVNBRANCH="branches/gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
+  fi
 
   # If this is not a final release, set various parameters accordingly.
   if [ ${FINAL} -ne 1 ]; then
-- 
2.30.2