X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=contrib%2Fgcc_update;h=b81fc0ce458ed7bab9e7d4fcae34f2262f385905;hb=1ce37615303e3cc54f24b96d905d6e2f8ffbfaf0;hp=0ec373945a007bd7f89e6e477ec6a5e7727ffaad;hpb=1e8e992020adfba209ef30b3c369e2ca6282d837;p=pf3gnuchains%2Fgcc-fork.git diff --git a/contrib/gcc_update b/contrib/gcc_update index 0ec373945a0..b81fc0ce458 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -1,10 +1,11 @@ #! /bin/sh # -# Update a local Subversion tree from the GCC repository, with an emphasis -# on treating generated files correctly, so that autoconf, gperf et -# al are not required for the ``end'' user. +# Update a local Subversion, Git or Mercurial tree from the GCC +# repository, with an emphasis on treating generated files correctly, so +# that autoconf, gperf et al are not required for the ``end'' user. # -# (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation +# (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 Free Software Foundation # Originally by Gerald Pfeifer , August 1998. # # This script is Free Software, and it can be copied, distributed and @@ -12,8 +13,8 @@ # its license can be downloaded from http://www.gnu.org/copyleft/gpl.html # # -# By default all command-line options are passed to `svn update` in -# addition to $UPDATE_OPTIONS (defined below). If the first parameter +# By default all command-line options are passed to `svn update` or `hg/git +# pull` in addition to $UPDATE_OPTIONS (defined below). If the first parameter # reads --nostdflags, $UPDATE_OPTIONS as well as this parameter itself # are omitted. # @@ -38,11 +39,15 @@ # contrib/gcc_update --list -# SVN command -GCC_SVN=${GCC_SVN-${SVN-svn}} -# Default options used when updating via SVN (none). +# Default options used when updating (none). UPDATE_OPTIONS="" +# Set the locale to C to make this script work for users with foreign +# locale like e.g. French UTF-8. +LANG=C +LC_ALL=C +export LANG LC_ALL + ######## Anything below shouldn't be changed by regular users. # Arrange for the value of $0 to be available for functions @@ -75,12 +80,29 @@ gcc/cstamp-h.in: gcc/configure.ac gcc/config.in: gcc/cstamp-h.in gcc/fixinc/fixincl.x: gcc/fixinc/fixincl.tpl gcc/fixinc/inclhack.def gcc/config/arm/arm-tune.md: gcc/config/arm/arm-cores.def gcc/config/arm/gentune.sh +gcc/config/arm/arm-tables.opt: gcc/config/arm/arm-arches.def gcc/config/arm/arm-cores.def gcc/config/arm/arm-fpus.def gcc/config/arm/genopt.sh +gcc/config/avr/avr-tables.opt: gcc/config/avr/avr-mcus.def gcc/config/avr/genopt.sh +gcc/config/avr/t-multilib: gcc/config/avr/avr-mcus.def gcc/config/avr/genmultilib.awk +gcc/config/c6x/c6x-tables.opt: gcc/config/c6x/c6x-isas.def gcc/config/c6x/genopt.sh +gcc/config/c6x/c6x-sched.md: gcc/config/c6x/c6x-sched.md.in gcc/config/c6x/gensched.sh +gcc/config/c6x/c6x-mult.md: gcc/config/c6x/c6x-mult.md.in gcc/config/c6x/genmult.sh +gcc/config/m68k/m68k-tables.opt: gcc/config/m68k/m68k-devices.def gcc/config/m68k/m68k-isas.def gcc/config/m68k/m68k-microarchs.def gcc/config/m68k/genopt.sh +gcc/config/mips/mips-tables.opt: gcc/config/mips/mips-cpus.def gcc/config/mips/genopt.sh +gcc/config/rs6000/rs6000-tables.opt: gcc/config/rs6000/rs6000-cpus.def gcc/config/rs6000/genopt.sh +gcc/config/tilegx/mul-tables.c: gcc/config/tilepro/gen-mul-tables.cc +gcc/config/tilepro/mul-tables.c: gcc/config/tilepro/gen-mul-tables.cc # And then, language-specific files gcc/cp/cfns.h: gcc/cp/cfns.gperf gcc/java/keyword.h: gcc/java/keyword.gperf # testsuite # Without this, _Pragma3.c can have a false negative. gcc/testsuite/gcc.dg/cpp/_Pragma3.c: gcc/testsuite/gcc.dg/cpp/mi1c.h +# Similarly, without this, you will see: +# direct2s.c:35: warning: current file is older than direct2.c +gcc/testsuite/gcc.dg/cpp/direct2s.c: gcc/testsuite/gcc.dg/cpp/direct2.c +# lto-plugin +lto-plugin/configure: lto-plugin/configure.ac lto-plugin/aclocal.m4 +lto-plugin/Makefile.in: lto-plugin/Makefile.am lto-plugin/aclocal.m4 # And libraries, at last libbanshee/configure: libbanshee/configure.ac libmudflap/configure: libmudflap/configure.ac @@ -114,11 +136,17 @@ libcpp/Makefile.in: libcpp/configure.ac libcpp/aclocal.m4 libcpp/configure: libcpp/configure.ac libcpp/aclocal.m4 libgomp/aclocal.m4: libgomp/configure.ac libgomp/acinclude.m4 libgomp/Makefile.in: libgomp/Makefile.am libgomp/aclocal.m4 +libgomp/testsuite/Makefile.in: libgomp/Makefile.am libgomp/aclocal.m4 libgomp/configure: libgomp/configure.ac libgomp/aclocal.m4 libgomp/config.h.in: libgomp/configure.ac libgomp/aclocal.m4 +libitm/aclocal.m4: libitm/configure.ac libitm/acinclude.m4 +libitm/Makefile.in: libitm/Makefile.am libitm/aclocal.m4 +libitm/testsuite/Makefile.in: libitm/testsuite/Makefile.am libitm/aclocal.m4 +libitm/configure: libitm/configure.ac libitm/aclocal.m4 +libitm/config.h.in: libitm/configure.ac libitm/aclocal.m4 # Top level Makefile.in: Makefile.tpl Makefile.def -configure: configure.in config/acx.m4 +configure: configure.ac config/acx.m4 EOF } @@ -232,9 +260,18 @@ p esac -# Check whether this indeed looks like a local SVN tree. -if [ ! -d .svn ]; then - echo "This does not seem to be a GCC SVN tree!" +# Check for known version control systems. +if [ -d .git ]; then + GCC_GIT=${GCC_GIT-${GIT-git}} + vcs_type="git" +elif [ -d .hg ]; then + GCC_HG=${GCC_HG-${HG-hg}} + vcs_type="hg" +elif [ -d .svn ]; then + GCC_SVN=${GCC_SVN-${SVN-svn}} + vcs_type="svn" +else + echo "This does not seem to be a GCC GIT/HG/SVN tree!" exit fi @@ -245,17 +282,106 @@ else set -- $UPDATE_OPTIONS ${1+"$@"} fi -chat "Updating SVN tree" +case $vcs_type in + git) + chat "Updating GIT tree" -$GCC_SVN ${silent+-q} --non-interactive update ${1+"$@"} -if [ $? -ne 0 ]; then - (touch_files_reexec) - echo "SVN update of full tree failed." >&2 - exit 1 -fi + $GCC_GIT diff --quiet --exit-code HEAD + if [ $? -ne 0 ]; then + echo "Attempting to update a dirty git tree!" >&2 + echo "Commit or stash your changes first and retry." >&2 + exit 1 + fi + + $GCC_GIT pull ${silent+-q} --rebase ${1+"$@"} + if [ $? -ne 0 ]; then + (touch_files_reexec) + echo "git pull of full tree failed." >&2 + exit 1 + fi + + revision=`$GCC_GIT log -n1 --pretty=%p:%t:%H` + branch=`$GCC_GIT name-rev --name-only HEAD || :` + ;; + + hg) + chat "Updating HG tree" + + # Add -q so untracked files aren't listed. + if [ `$GCC_HG status -q | wc -l` -gt 0 ]; then + echo "Attempting to update a dirty hg tree!" >&2 + echo "Commit or revert your changes first and retry." >&2 + exit 1 + fi + + # Check for mq extension. mq patches must be popped so tip has + # been converted from the SVN tree. + if [ -d .hg/patches ] && [ `$GCC_HG qapplied | wc -l` -gt 0 ]; then + # FIXME: Perhaps pop queue instead? We could do that since we + # know the tree is clean. + echo "Attempting to update hg tree with mq patches applied!" >&2 + echo "Pop your patches first and retry." >&2 + exit 1 + fi + # Update tree, but make sure to only pull the default branch. + # Otherwise all branches in the upstream repo are added, even if + # only a single one has been cloned. + $GCC_HG pull ${silent+-q} -r`$GCC_HG branch` ${1+"$@"} + if [ $? -ne 0 ]; then + (touch_files_reexec) + echo "hg pull of full tree failed." >&2 + exit 1 + fi + + # Update tree. Needs to be done separately from pull so + # gcc_update -rREV works. + $GCC_HG update ${silent+-q} ${1+"$@"} + if [ $? -ne 0 ]; then + (touch_files_reexec) + echo "hg update of full tree failed." >&2 + exit 1 + fi + + # Extract SVN revision corresponding to parents, as stored by + # hg convert. Before hg 1.4.3, there's no template keyword + # corresponding to the extra: tag, so need to use hg log --debug + # to extract the info. + parents=`$GCC_HG parents --template '{rev}'` + convert_revision=`$GCC_HG log --debug -r$parents | \ + sed -ne "/^extra:.*convert_revision=svn:/ { + s%^[^/]*/%% + p + }"` + revision=`echo $convert_revision | sed -e 's/.*@//'` + branch=`echo $convert_revision | sed -e 's%branches/%%' -e 's/@.*//'` + ;; + + svn) + chat "Updating SVN tree" + + $GCC_SVN ${silent+-q} --non-interactive update ${1+"$@"} + if [ $? -ne 0 ]; then + (touch_files_reexec) + echo "SVN update of full tree failed." >&2 + exit 1 + fi + + revision=`svn info | awk '/Revision:/ { print $2 }'` + branch=`svn info | sed -ne "/URL:/ { + s,.*/trunk,trunk, + s,.*/branches/,, + s,.*/tags/,, + p + }"` + ;; +esac + +rm -f LAST_UPDATED gcc/REVISION { - date - echo "`TZ=UTC date` (revision `svnversion .`)" + date + echo "`TZ=UTC date` (revision $revision)" } > LAST_UPDATED +echo "[$branch revision $revision]" > gcc/REVISION + touch_files_reexec