16 files changed, 61 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ad0ab8c641..febfc0039f7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+	
+	* LINARO-VERSION: New file.
+	* configure.ac: Add Linaro version string.
+	* configure: Regenerate.
+
 2013-04-08  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
 
 	Backport of trunk r197346.
diff --git a/gcc/LINARO-VERSION b/gcc/LINARO-VERSION
new file mode 100644
index 00000000000..9edb8e35762
--- /dev/null
+++ b/gcc/LINARO-VERSION
@@ -0,0 +1 @@
+4.8-2013.04
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 38ed69db8f5..a7b773c4db4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-22  Release Manager
 
 	* GCC 4.8.0 released.
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 6d45de967d1..97705744f22 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-22  Release Manager
 
 	* GCC 4.8.0 released.
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 421292b3068..94dc45f978b 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-22  Release Manager
 
 	* GCC 4.8.0 released.
diff --git a/gcc/configure b/gcc/configure
index e12a1803140..235cfc79118 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1658,7 +1658,8 @@ Optional Packages:
                           use sysroot as the system root during the build
   --with-sysroot[=DIR]    search for usr/lib, usr/include, et al, within DIR
   --with-specs=SPECS      add SPECS to driver command-line processing
-  --with-pkgversion=PKG   Use PKG in the version string in place of "GCC"
+  --with-pkgversion=PKG   Use PKG in the version string in place of "Linaro
+                          GCC `cat $srcdir/LINARO-VERSION`"
   --with-bugurl=URL       Direct users to URL to report a bug
   --with-multilib-list    select multilibs (SH and x86-64 only)
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
@@ -7327,7 +7328,7 @@ if test "${with_pkgversion+set}" = set; then :
       *)   PKGVERSION="($withval) " ;;
      esac
 else
-  PKGVERSION="(GCC) "
+  PKGVERSION="(Linaro GCC `cat $srcdir/LINARO-VERSION`) "
 
 fi
 
diff --git a/gcc/configure.ac b/gcc/configure.ac
index eba35774648..2105bc859b4 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -813,7 +813,7 @@ AC_ARG_WITH(specs,
 )
 AC_SUBST(CONFIGURE_SPECS)
 
-ACX_PKGVERSION([GCC])
+ACX_PKGVERSION([Linaro GCC `cat $srcdir/LINARO-VERSION`])
 ACX_BUGURL([http://gcc.gnu.org/bugs.html])
 
 # Sanity check enable_languages in case someone does not run the toplevel
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5141af41ccb..40f8ae33ea4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-29  Jason Merrill  <jason@redhat.com>
 
 	PR c++/56774
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index cbed9baaceb..e25112a32c6 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-22  Release Manager
 
 	* GCC 4.8.0 released.
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 625ee5cfc48..494d74ab277 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-22  Release Manager
 
 	* GCC 4.8.0 released.
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 022b9c99478..4177d80a666 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-22  Release Manager
 
 	* GCC 4.8.0 released.
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index efebf721655..743e84b83ce 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-22  Release Manager
 
 	* GCC 4.8.0 released.
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index d484b6bb629..f3fbc301665 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-22  Release Manager
 
 	* GCC 4.8.0 released.
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index ec3eaf71006..d9b9c528cbc 100644
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-22  Release Manager
 
 	* GCC 4.8.0 released.
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 8f4b8dd36e2..105272ad2c1 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-03-31  Joseph Myers  <joseph@codesourcery.com>
 
 	* de.po: Update.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9190b55e72d..748b4f6d893 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-09  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
+
+	* GCC Linaro 4.8-2013.04 released.
+
 2013-04-08  Matthew Gretton-Dann  <matthew.gretton-dann@linaro.org>
 
 	Backport from trunk r197052.