[llvm-commits] [release_18] CVS: llvm/runtime/GCCLibraries/libc/LICENSE.TXT qsort.c remove.c

[Tanya Lattner]

Changes in directory llvm/runtime/GCCLibraries/libc:

LICENSE.TXT updated: 1.2.22.1 -> 1.2.22.2
qsort.c updated: 1.2 -> 1.2.32.1
remove.c updated: 1.1 -> 1.1.4.1
---
Log message:

Merge from mainline


---
Diffs of the changes:  (+25 -1)

 LICENSE.TXT |    9 +++++++++
 qsort.c     |   10 ++++++++++
 remove.c    |    7 ++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)


Index: llvm/runtime/GCCLibraries/libc/LICENSE.TXT
diff -u llvm/runtime/GCCLibraries/libc/LICENSE.TXT:1.2.22.1 llvm/runtime/GCCLibraries/libc/LICENSE.TXT:1.2.22.2
--- llvm/runtime/GCCLibraries/libc/LICENSE.TXT:1.2.22.1	Fri Jul 28 13:40:05 2006
+++ llvm/runtime/GCCLibraries/libc/LICENSE.TXT	Tue Aug  8 23:32:10 2006
@@ -6,3 +6,12 @@
 
 Portions of glibc also contain copyrights and licenses from third parties.
 Those are listed in LICENSES.
+
+FSF copyright and warranty disclaimer:
+Copyright (C) 1991, 1992, 1996, 1997, 1999 Free Software Foundation, Inc.
+Copyright (C) 1995,96,97,2002 Free Software Foundation, Inc.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.


Index: llvm/runtime/GCCLibraries/libc/qsort.c
diff -u llvm/runtime/GCCLibraries/libc/qsort.c:1.2 llvm/runtime/GCCLibraries/libc/qsort.c:1.2.32.1
--- llvm/runtime/GCCLibraries/libc/qsort.c:1.2	Thu May 29 17:12:35 2003
+++ llvm/runtime/GCCLibraries/libc/qsort.c	Tue Aug  8 23:32:10 2006
@@ -1,3 +1,13 @@
+//===-- qsort.c - The qsort function for the LLVM libc Library ----*- C -*-===//
+// 
+// This code is a modified form of the qsort() function from the GNU C
+// library.
+//
+// Modifications:
+//  2003/05/29 - Code disabled for compilation.  Line wrapping changed.
+//
+//===----------------------------------------------------------------------===//
+
 /* Copyright (C) 1991, 1992, 1996, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Douglas C. Schmidt (schmidt at ics.uci.edu).


Index: llvm/runtime/GCCLibraries/libc/remove.c
diff -u llvm/runtime/GCCLibraries/libc/remove.c:1.1 llvm/runtime/GCCLibraries/libc/remove.c:1.1.4.1
--- llvm/runtime/GCCLibraries/libc/remove.c:1.1	Mon Nov 28 09:49:15 2005
+++ llvm/runtime/GCCLibraries/libc/remove.c	Tue Aug  8 23:32:10 2006
@@ -1,6 +1,11 @@
 //===-- remove.c - The remove function for the LLVM libc Library --*- C -*-===//
 // 
-// A lot of this code is ripped gratuitously from glibc and libiberty.
+// This code is a modified form of the remove() function from the GNU C
+// library.
+//
+// Modifications:
+//  2005/11/28 - Added to LLVM tree.  Functions renamed to allow compilation.
+//               Code to control symbol linkage types removed.
 //
 //===----------------------------------------------------------------------===//