This commit was manufactured by cvs2svn to create tag 'cgen-
snapshot-20090601'.
Sprout from cgen-1_1-branch 2009-06-17 16:35:16 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'cgen-1_1-branch'.'
Cherrypick from master 2009-05-29 00:15:12 UTC Doug Kwan <dougkwan@google.com> '2009-05-28 Doug Kwan <dougkwan@google.com>':
COPYING.LIBGLOSS
ChangeLog
Makefile.in
Makefile.tpl
config.guess
config.sub
configure
configure.acdiff --git a/COPYING.LIBGLOSS b/COPYING.LIBGLOSS
index a63b737..b4d657e 100644
--- a/COPYING.LIBGLOSS
+++ b/COPYING.LIBGLOSS
@@ -228,35 +228,3 @@
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-
-(13) - Xilinx, Inc. (powerpc-* targets)
-
-Copyright (c) 2004, 2009 Xilinx, Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. Neither the name of Xilinx nor the names of its contributors may be
-used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/ChangeLog b/ChangeLog
index 16c6391..adacc3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,3 @@
-2009-06-17 Michael Eager <eager@eagercon.com>
-
- * COPYING.LIBGLOSS: Add Xilinx license.
-
-2009-06-15 Ryan Mansfield <rmansfield@qnx.com>
-
- * configure.ac: Define is_elf for QNX Neutrino targets.
- * configure: Regenerate.
-
-2009-06-03 Jerome Guitton <guitton@adacore.com>
- Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- * Makefile.tpl (all): Avoid a trailing backslash.
- * Makefile.in: Regenerate.
-
-2009-06-03 Ben Elliston <bje@au.ibm.com>
-
- * config.sub, config.guess: Update from upstream sources.
-
-2009-06-02 Alexandre Oliva <aoliva@redhat.com>
-
- * Makefile.tpl ([+compare-target+]): Compare all stage
- directories, rather than just gcc.
- * Makefile.in: Rebuilt.
-
2009-05-28 Doug Kwan <dougkwan@google.com>
* configure.ac: Support gold for target arm*-*-*.
diff --git a/Makefile.in b/Makefile.in
index fdc2d2e..aa34c89 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -862,9 +862,8 @@
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
@if gcc-bootstrap
; \
- fi \
+ fi
@endif gcc-bootstrap
- && :
.PHONY: all-build
@@ -52211,16 +52210,15 @@
: $(MAKE); $(stage); \
rm -f .bad_compare ; \
echo Comparing stages 2 and 3 ; \
- sed=`echo stage3 | sed 's,^stage,,;s,.,.,g'`; \
- files=`find stage3-* -name "*$(objext)" -print | \
- sed -n s,^stage$$sed-,,p` ; \
+ cd stage3-gcc; \
+ files=`find . -name "*$(objext)" -print` ; \
+ cd .. ; \
for file in $${files} ; do \
- f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \
- if test ! -f $$f1; then continue; fi; \
+ f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
$(do-compare) > /dev/null 2>&1; \
if test $$? -eq 1; then \
case $$file in \
- gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \
+ ./cc*-checksum$(objext) | ./libgcc/* ) \
echo warning: $$file differs ;; \
*) \
echo $$file differs >> .bad_compare ;; \
@@ -52537,16 +52535,15 @@
: $(MAKE); $(stage); \
rm -f .bad_compare ; \
echo Comparing stages 3 and 4 ; \
- sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \
- files=`find stage4-* -name "*$(objext)" -print | \
- sed -n s,^stage$$sed-,,p` ; \
+ cd stage4-gcc; \
+ files=`find . -name "*$(objext)" -print` ; \
+ cd .. ; \
for file in $${files} ; do \
- f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \
- if test ! -f $$f1; then continue; fi; \
+ f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \
$(do-compare3) > /dev/null 2>&1; \
if test $$? -eq 1; then \
case $$file in \
- gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \
+ ./cc*-checksum$(objext) | ./libgcc/* ) \
echo warning: $$file differs ;; \
*) \
echo $$file differs >> .bad_compare ;; \
diff --git a/Makefile.tpl b/Makefile.tpl
index f543003..e683ebc 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -628,9 +628,8 @@
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
@if gcc-bootstrap
; \
- fi \
+ fi
@endif gcc-bootstrap
- && :
.PHONY: all-build
[+ FOR build_modules +]
@@ -1427,16 +1426,15 @@
: $(MAKE); $(stage); \
rm -f .bad_compare ; \
echo Comparing stages [+prev+] and [+id+] ; \
- sed=`echo stage[+id+] | sed 's,^stage,,;s,.,.,g'`; \
- files=`find stage[+id+]-* -name "*$(objext)" -print | \
- sed -n s,^stage$$sed-,,p` ; \
+ cd stage[+id+]-gcc; \
+ files=`find . -name "*$(objext)" -print` ; \
+ cd .. ; \
for file in $${files} ; do \
- f1=$$r/stage[+prev+]-$$file; f2=$$r/stage[+id+]-$$file; \
- if test ! -f $$f1; then continue; fi; \
+ f1=$$r/stage[+prev+]-gcc/$$file; f2=$$r/stage[+id+]-gcc/$$file; \
$(do-[+compare-target+]) > /dev/null 2>&1; \
if test $$? -eq 1; then \
case $$file in \
- gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \
+ ./cc*-checksum$(objext) | ./libgcc/* ) \
echo warning: $$file differs ;; \
*) \
echo $$file differs >> .bad_compare ;; \
diff --git a/config.guess b/config.guess
index 7c48073..3eda297 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-06-03'
+timestamp='2009-02-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -324,9 +324,6 @@
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
- s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -822,9 +819,6 @@
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -885,17 +879,40 @@
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
+ mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef ${UNAME_MACHINE}
- #undef ${UNAME_MACHINE}el
+ #undef mips
+ #undef mipsel
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=${UNAME_MACHINE}el
+ CPU=mipsel
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=${UNAME_MACHINE}
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
#else
CPU=
#endif
@@ -981,6 +998,14 @@
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
diff --git a/config.sub b/config.sub
index 67a635e..a39437d 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2009-06-03'
+timestamp='2009-04-17'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
diff --git a/configure b/configure
index 3d7d18e..d750b42 100755
--- a/configure
+++ b/configure
@@ -2064,7 +2064,7 @@
case "${target}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
- | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*)
+ | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2*)
case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*)
;;
diff --git a/configure.ac b/configure.ac
index d2ad27e..ba45bd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -305,7 +305,7 @@
case "${target}" in
*-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
| *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
- | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*)
+ | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2*)
case "${target}" in
*-*-linux*aout* | *-*-linux*oldld*)
;;
