Merged from RELEASE_16.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24243 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index d19aea29eff601bc519670090912a7aad2b88a8f..b5fcaa4a110a5f15c670f946df81cb2f1bcd7da4 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -31,12 +31,12 @@ dnl===
 dnl===-----------------------------------------------------------------------===
 dnl Initialize autoconf and define the package name, version number and
 dnl email address for reporting bugs.
-AC_INIT([[llvm]],[[1.6cvs]],[llvmbugs@cs.uiuc.edu])
+AC_INIT([[llvm]],[[1.6]],[llvmbugs@cs.uiuc.edu])
 
 dnl Provide a copyright substitution and ensure the copyright notice is included
 dnl in the output of --version option of the generated configure script.
 AC_SUBST(LLVM_COPYRIGHT,["Copyright (c) 2003-2005 University of Illinois at Urbana-Champaign."])
-AC_COPYRIGHT($LLVM_COPYRIGHT)
+AC_COPYRIGHT([Copyright (c) 2003-2005 University of Illinois at Urbana-Champaign.])
 
 dnl Indicate that we require autoconf 2.59 or later. Ths is needed because we
 dnl use some autoconf macros only available in 2.59.

diff --git a/configure b/configure
index d801c9b02eb7879423f1882df06aa7a2bf406f56..b8261ff2d60907131951718228b68b0d2708f0c2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for llvm 1.6cvs.
+# Generated by GNU Autoconf 2.59 for llvm 1.6.
 #
 # Report bugs to <llvmbugs@cs.uiuc.edu>.
 #
@@ -8,7 +8,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# $LLVM_COPYRIGHT
+# Copyright (c) 2003-2005 University of Illinois at Urbana-Champaign.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -425,8 +425,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='llvm'
 PACKAGE_TARNAME='-llvm-'
-PACKAGE_VERSION='1.6cvs'
-PACKAGE_STRING='llvm 1.6cvs'
+PACKAGE_VERSION='1.6'
+PACKAGE_STRING='llvm 1.6'
 PACKAGE_BUGREPORT='llvmbugs@cs.uiuc.edu'
 
 ac_unique_file="lib/VMCore/Module.cpp"
@@ -964,7 +964,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures llvm 1.6cvs to adapt to many kinds of systems.
+\`configure' configures llvm 1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1026,7 +1026,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of llvm 1.6cvs:";;
+     short | recursive ) echo "Configuration of llvm 1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1173,14 +1173,14 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-llvm configure 1.6cvs
+llvm configure 1.6
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-$LLVM_COPYRIGHT
+Copyright (c) 2003-2005 University of Illinois at Urbana-Champaign.
 _ACEOF
   exit 0
 fi
@@ -1189,7 +1189,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by llvm $as_me 1.6cvs, which was
+It was created by llvm $as_me 1.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -31044,7 +31044,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by llvm $as_me 1.6cvs, which was
+This file was extended by llvm $as_me 1.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31107,7 +31107,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-llvm config.status 1.6cvs
+llvm config.status 1.6
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/docs/GettingStarted.html b/docs/GettingStarted.html
index f493c5d5d623db84a921d0e8f2787d4894956f6c..70e87eea88b1656863ffd74ac88a654912b0457c 100644 (file)
--- a/docs/GettingStarted.html
+++ b/docs/GettingStarted.html
@@ -661,6 +661,7 @@ revision), you can specify a label.  The following releases have the following
 labels:</p>
 
 <ul>
+<li>Release 1.6: <b>RELEASE_16</b></li>
 <li>Release 1.5: <b>RELEASE_15</b></li>
 <li>Release 1.4: <b>RELEASE_14</b></li>
 <li>Release 1.3: <b>RELEASE_13</b></li>

diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index f557b12389238e99ad3853ed22fb88cf3ded8306..e5378ba9602a0973df56db40ba8ed0d3ea22fc19 100644 (file)
--- a/docs/ReleaseNotes.html
+++ b/docs/ReleaseNotes.html
@@ -316,6 +316,19 @@ components, please contact us on the llvmdev list.</p>
 
 </div>
 
+<!-- ======================================================================= -->
+<div class="doc_subsection">
+  <a name="build">Known problems with the Build System</a>
+</div>
+
+<div class="doc_text">
+
+<ul>
+  <li>The <a href="http://llvm.org/PR656">configure script sometimes fails on Solaris/Sparc</a>. A work around is documented in <a href="http://llvm.org/PR656">PR656.</a></li>
+</ul>
+</div>
+
+
 <!-- ======================================================================= -->
 <div class="doc_subsection">
   <a name="core">Known problems with the LLVM Core</a>

diff --git a/test/CFrontend/2004-06-17-UnorderedCompares.c.tr b/test/CFrontend/2004-06-17-UnorderedCompares.c.tr
index 111273d2b4dbaa8261614b062d595903c2f99d39..8b0939aa0cd380bb22414ca47af37d930e3fc42b 100644 (file)
--- a/test/CFrontend/2004-06-17-UnorderedCompares.c.tr
+++ b/test/CFrontend/2004-06-17-UnorderedCompares.c.tr
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc -xc -std=c99 %s -c -o - | llvm-dis | grep -v llvm.isunordered | not grep call
-// XFAIL: sparcv9|ia64
+// XFAIL: sparc|ia64
 
 #include <math.h>
 

diff --git a/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c b/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c
index a555bfd6c9d377ad4d811fb50e4de863fba5836b..e6e7b59f2a320419e0d013ef6d43ddf1bfe3a64c 100644 (file)
--- a/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c
+++ b/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c
@@ -6,7 +6,7 @@
 //  We could modify the test to use only GCC extensions, but I don't know if
 //  that would change the nature of the test.
 //
-// XFAIL: sparcv9
+// XFAIL: sparc
 
 #include <complex.h>
 

diff --git a/test/ExecutionEngine/parallel.ll b/test/ExecutionEngine/parallel.ll
index 6dc3f760d9931bd4f4d757d69145b1813d1d71c3..9f55d3dda4efb4d6a38a2a96b09dbe2d3ae7baad 100644 (file)
--- a/test/ExecutionEngine/parallel.ll
+++ b/test/ExecutionEngine/parallel.ll
@@ -1,3 +1,3 @@
 ; This isn't really an assembly file. This test runs the ParallelJIT example
 ; program and ensures its output is sane.
-; RUN: ParallelJIT | grep -q "Fib2 returned 267914296"
+; RUN: ParallelJIT | grep "Fib2 returned 267914296"