diff options
| author | Andrew Stubbs <ams@codesourcery.com> | 2012-04-10 10:54:30 +0100 |
|---|---|---|
| committer | Andrew Stubbs <ams@codesourcery.com> | 2012-04-10 10:54:30 +0100 |
| commit | 39b63850128b97bbd9d5d1449b1093237c7b1f36 (patch) | |
| tree | ac9757c3181862cf4e2fb82f95c4db70b847ef3b | |
| parent | c744057148d5c435c86b903833508da3a5a41875 (diff) | |
Make 4.7-2012.04 release.gcc-linaro-4.7-2012.04
| -rw-r--r-- | ChangeLog.linaro | 9 | ||||
| -rw-r--r-- | gcc/LINARO-VERSION | 1 | ||||
| -rwxr-xr-x | gcc/configure | 9 | ||||
| -rw-r--r-- | gcc/configure.ac | 2 |
4 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog.linaro b/ChangeLog.linaro index 42ad47ac9e5..aa233cb37b0 100644 --- a/ChangeLog.linaro +++ b/ChangeLog.linaro @@ -1,3 +1,12 @@ +2012-04-10 Andrew Stubbs <ams@codesourcery.com> + + GCC Linaro 4.7-2012.04 released. + + gcc/ + * LINARO-VERSION: Update. + * configure.ac: Add Linaro version string. + * configure: Regenerate. + 2012-04-05 Andrew Stubbs <ams@codesourcery.com> Backport from mainline r186167: diff --git a/gcc/LINARO-VERSION b/gcc/LINARO-VERSION new file mode 100644 index 00000000000..0cf513cd309 --- /dev/null +++ b/gcc/LINARO-VERSION @@ -0,0 +1 @@ +4.7-2012.04 diff --git a/gcc/configure b/gcc/configure index e2a0aea9f09..f178542ee08 100755 --- a/gcc/configure +++ b/gcc/configure @@ -1655,7 +1655,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 @@ -7323,7 +7324,7 @@ if test "${with_pkgversion+set}" = set; then : *) PKGVERSION="($withval) " ;; esac else - PKGVERSION="(GCC) " + PKGVERSION="(Linaro GCC `cat $srcdir/LINARO-VERSION`) " fi @@ -17970,7 +17971,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17973 "configure" +#line 17974 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18076,7 +18077,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18079 "configure" +#line 18080 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 39302ad76c3..c0ffda177ba 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -809,7 +809,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 |