aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Novillo <dnovillo@google.com>2008-05-12 18:53:42 +0000
committerDiego Novillo <dnovillo@google.com>2008-05-12 18:53:42 +0000
commit6f8413630a9f120c1faf0fcfa6220ee556b17743 (patch)
tree0cf5e4ba5f45beab180de6f7347d044c31cf8767
parent920a41be7518bb774c95dbe1094ad41af403000e (diff)
Fix revision string typo.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/lto@135225 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.lto2
-rwxr-xr-xgcc/configure4
-rw-r--r--gcc/configure.ac2
3 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ChangeLog.lto b/gcc/ChangeLog.lto
index 62c6ff0e86f..9caf32d87cf 100644
--- a/gcc/ChangeLog.lto
+++ b/gcc/ChangeLog.lto
@@ -1,6 +1,6 @@
2008-05-12 Diego Novillo <dnovillo@google.com>
- Mainline merge @136136
+ Mainline merge @135136
* configure.ac (ACX_PKGVERSION): Update revision merge string.
* confiugre: Regenerate.
diff --git a/gcc/configure b/gcc/configure
index fea80132585..67e6b4bccc1 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1088,7 +1088,7 @@ 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-pkgversion=PKG Use PKG in the version string in place of "lto -
- merge rev. 130155"
+ merge rev. 135136"
--with-bugurl=URL Direct users to URL to report a bug
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
@@ -7795,7 +7795,7 @@ echo "$as_me: error: package version not specified" >&2;}
*) PKGVERSION="($withval) " ;;
esac
else
- PKGVERSION="(lto - merge rev. 130155) "
+ PKGVERSION="(lto - merge rev. 135136) "
fi;
diff --git a/gcc/configure.ac b/gcc/configure.ac
index fbab47a122a..46ed345ab37 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -769,7 +769,7 @@ esac],
[onestep=""])
AC_SUBST(onestep)
-ACX_PKGVERSION([lto - merge rev. 130155])
+ACX_PKGVERSION([lto - merge rev. 135136])
ACX_BUGURL([http://gcc.gnu.org/bugs.html])
# Sanity check enable_languages in case someone does not run the toplevel