From c0c186d140b75fc3b2e4e3632f826a40cf4f8626 Mon Sep 17 00:00:00 2001
From: John Criswell
Date: Tue, 8 Nov 2005 21:11:33 +0000
Subject: [PATCH] Merged from RELEASE_16.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24243 91177308-0d34-0410-b5e6-96231b3b80d8
---
autoconf/configure.ac | 4 ++--
configure | 22 +++++++++----------
docs/GettingStarted.html | 1 +
docs/ReleaseNotes.html | 13 +++++++++++
.../2004-06-17-UnorderedCompares.c.tr | 2 +-
test/CFrontend/2005-02-20-AggregateSAVEEXPR.c | 2 +-
test/ExecutionEngine/parallel.ll | 2 +-
7 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index d19aea29eff..b5fcaa4a110 100644
--- 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 d801c9b02eb..b8261ff2d60 100755
--- 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 .
#
@@ -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 f493c5d5d62..70e87eea88b 100644
--- 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:
+- Release 1.6: RELEASE_16
- Release 1.5: RELEASE_15
- Release 1.4: RELEASE_14
- Release 1.3: RELEASE_13
diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index f557b123892..e5378ba9602 100644
--- a/docs/ReleaseNotes.html
+++ b/docs/ReleaseNotes.html
@@ -316,6 +316,19 @@ components, please contact us on the llvmdev list.
+
+
+
+
+
+
Known problems with the LLVM Core
diff --git a/test/CFrontend/2004-06-17-UnorderedCompares.c.tr b/test/CFrontend/2004-06-17-UnorderedCompares.c.tr
index 111273d2b4d..8b0939aa0cd 100644
--- 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
diff --git a/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c b/test/CFrontend/2005-02-20-AggregateSAVEEXPR.c
index a555bfd6c9d..e6e7b59f2a3 100644
--- 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
diff --git a/test/ExecutionEngine/parallel.ll b/test/ExecutionEngine/parallel.ll
index 6dc3f760d99..9f55d3dda4e 100644
--- 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"