[llvm-commits] CVS: llvm/include/Support/Annotation.h BitSetVector.h Casting.h CommandLine.h DataTypes.h Signals.h TarjanSCCIterator.h Timer.h Tree.h hash_map hash_set ilist iterator slist

John Criswell criswell at choi.cs.uiuc.edu
Mon Jun 23 13:51:01 PDT 2003


Changes in directory llvm/include/Support:

Annotation.h updated: 1.8 -> 1.8.2.1
BitSetVector.h updated: 1.5 -> 1.5.2.1
Casting.h updated: 1.5 -> 1.5.2.1
CommandLine.h updated: 1.12 -> 1.12.2.1
DataTypes.h updated: 1.8 -> 1.8.2.1
Signals.h updated: 1.2 -> 1.2.2.1
TarjanSCCIterator.h updated: 1.5 -> 1.5.2.1
Timer.h updated: 1.6 -> 1.6.2.1
Tree.h updated: 1.3 -> 1.3.2.1
hash_map updated: 1.6 -> 1.6.2.1
hash_set updated: 1.6 -> 1.6.2.1
ilist updated: 1.6 -> 1.6.2.1
iterator updated: 1.2 -> 1.2.2.1
slist updated: 1.2 -> 1.2.2.1

---
Log message:

Initial checkin of autoconf code.



---
Diffs of the changes:

Index: llvm/include/Support/Annotation.h
diff -u llvm/include/Support/Annotation.h:1.8 llvm/include/Support/Annotation.h:1.8.2.1
--- llvm/include/Support/Annotation.h:1.8	Wed Jun 11 09:01:21 2003
+++ llvm/include/Support/Annotation.h	Mon Jun 23 13:50:38 2003
@@ -16,7 +16,8 @@
 #define SUPPORT_ANNOTATION_H
 
 #include <string>
-#include <assert.h>
+#include "Config/assert.h"
+
 class AnnotationID;
 class Annotation;
 class Annotable;


Index: llvm/include/Support/BitSetVector.h
diff -u llvm/include/Support/BitSetVector.h:1.5 llvm/include/Support/BitSetVector.h:1.5.2.1
--- llvm/include/Support/BitSetVector.h:1.5	Wed Jun 11 09:01:21 2003
+++ llvm/include/Support/BitSetVector.h	Mon Jun 23 13:50:38 2003
@@ -31,7 +31,7 @@
 #include <functional>
 #include <iostream>
 
-#include <assert.h>
+#include "Config/assert.h"
 
 #define WORDSIZE (32U)
 


Index: llvm/include/Support/Casting.h
diff -u llvm/include/Support/Casting.h:1.5 llvm/include/Support/Casting.h:1.5.2.1
--- llvm/include/Support/Casting.h:1.5	Thu May 29 10:07:48 2003
+++ llvm/include/Support/Casting.h	Mon Jun 23 13:50:38 2003
@@ -8,7 +8,7 @@
 #ifndef SUPPORT_CASTING_H
 #define SUPPORT_CASTING_H
 
-#include <assert.h>
+#include "Config/assert.h"
 
 //===----------------------------------------------------------------------===//
 //                          isa<x> Support Templates


Index: llvm/include/Support/CommandLine.h
diff -u llvm/include/Support/CommandLine.h:1.12 llvm/include/Support/CommandLine.h:1.12.2.1
--- llvm/include/Support/CommandLine.h:1.12	Wed Jun 11 09:01:21 2003
+++ llvm/include/Support/CommandLine.h	Mon Jun 23 13:50:38 2003
@@ -19,7 +19,7 @@
 #include <cstdarg>
 #include "boost/type_traits/object_traits.hpp"
 
-#include <assert.h>
+#include "Config/assert.h"
 
 /// cl Namespace - This namespace contains all of the command line option
 /// processing machinery.  It is intentionally a short name to make qualified


Index: llvm/include/Support/DataTypes.h
diff -u llvm/include/Support/DataTypes.h:1.8 llvm/include/Support/DataTypes.h:1.8.2.1
--- llvm/include/Support/DataTypes.h:1.8	Wed Jun 11 14:44:48 2003
+++ llvm/include/Support/DataTypes.h	Mon Jun 23 13:50:38 2003
@@ -19,44 +19,21 @@
 #ifndef LLVM_SUPPORT_DATATYPES_H
 #define LLVM_SUPPORT_DATATYPES_H
 
-#define __STDC_LIMIT_MACROS 1
-#include <inttypes.h>
-
-#ifdef __linux__
-#  include <endian.h>
-#  if BYTE_ORDER == LITTLE_ENDIAN
-#    undef BIG_ENDIAN
-#  else
-#    undef LITTLE_ENDIAN
-#  endif
-#else
-#  if (BSD >= 199103)
-#    include <machine/endian.h>
-#  endif
-#endif
-
-#ifdef __sparc__
-#  include <sys/types.h>
-#  ifdef _LITTLE_ENDIAN
-#    define LITTLE_ENDIAN 1
-#  else
-#    define BIG_ENDIAN 1
-#  endif
-#endif
-
 //
-// Convert the information from the header files into our own local
-// endian macros.  We do this because various strange systems define both
-// BIG_ENDIAN and LITTLE_ENDIAN, and we don't want to conflict with them.
+// Un-define these constants so that we can re-define only the one that we want
+// (which is really to say that we'll define LITTLE_ENDIAN if the machine is
+// little endian, and not define anything otherwise).
 //
-// Don't worry; once we introduce autoconf, this will look a lot nicer.
-// 
-#ifdef LITTLE_ENDIAN
-#define ENDIAN_LITTLE
+#include "Config/config.h"
+
+#define __STDC_LIMIT_MACROS 1
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
 #endif
 
-#ifdef BIG_ENDIAN
-#define ENDIAN_BIG
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
 #endif
 
 #if (defined(ENDIAN_LITTLE) && defined(ENDIAN_BIG))


Index: llvm/include/Support/Signals.h
diff -u llvm/include/Support/Signals.h:1.2 llvm/include/Support/Signals.h:1.2.2.1
--- llvm/include/Support/Signals.h:1.2	Wed Dec 11 21:43:30 2002
+++ llvm/include/Support/Signals.h	Mon Jun 23 13:50:38 2003
@@ -10,6 +10,11 @@
 
 #include <string>
 
+//
+// This will include the signal handler return type.
+//
+#include "Config/config.h"
+
 // RemoveFileOnSignal - This function registers signal handlers to ensure that
 // if a signal gets delivered that the named file is removed.
 //


Index: llvm/include/Support/TarjanSCCIterator.h
diff -u llvm/include/Support/TarjanSCCIterator.h:1.5 llvm/include/Support/TarjanSCCIterator.h:1.5.2.1
--- llvm/include/Support/TarjanSCCIterator.h:1.5	Wed Jun 11 09:01:21 2003
+++ llvm/include/Support/TarjanSCCIterator.h	Mon Jun 23 13:50:38 2003
@@ -21,7 +21,7 @@
 #include <stack>
 #include <map>
 
-#include <assert.h>
+#include "Config/assert.h"
 
 //--------------------------------------------------------------------------
 // class SCC : A simple representation of an SCC in a generic Graph.


Index: llvm/include/Support/Timer.h
diff -u llvm/include/Support/Timer.h:1.6 llvm/include/Support/Timer.h:1.6.2.1
--- llvm/include/Support/Timer.h:1.6	Wed Jun 11 09:01:21 2003
+++ llvm/include/Support/Timer.h	Mon Jun 23 13:50:38 2003
@@ -29,7 +29,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <assert.h>
+#include "Config/assert.h"
 
 class TimerGroup;
 


Index: llvm/include/Support/Tree.h
diff -u llvm/include/Support/Tree.h:1.3 llvm/include/Support/Tree.h:1.3.2.1
--- llvm/include/Support/Tree.h:1.3	Wed Jun 11 09:01:21 2003
+++ llvm/include/Support/Tree.h	Mon Jun 23 13:50:38 2003
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include <assert.h>
+#include "Config/assert.h"
 
 template<class ConcreteTreeNode, class Payload>
 class Tree {


Index: llvm/include/Support/hash_map
diff -u llvm/include/Support/hash_map:1.6 llvm/include/Support/hash_map:1.6.2.1
--- llvm/include/Support/hash_map:1.6	Fri Jan 31 22:14:28 2003
+++ llvm/include/Support/hash_map	Mon Jun 23 13:50:38 2003
@@ -17,23 +17,25 @@
 //  3.0.4       std      ext/hash_map
 //  3.1      __gnu_cxx   ext/hash_map
 //
-#if __GNUC__ == 3
-#include <ext/hash_map>
 
-#ifndef HASH_NAMESPACE
-#if __GNUC_MINOR__ == 0
-#define HASH_NAMESPACE std
-#else
+#include "Config/config.h"
+
+#ifdef HAVE_GNU_EXT_HASH_MAP
+
+#include <ext/hash_map>
 #define HASH_NAMESPACE __gnu_cxx
-#endif
-#endif
 
 #else
 
-#include <hash_map>
-#ifndef HASH_NAMESPACE
+#ifdef HAVE_STD_EXT_HASH_MAP
+#include <ext/hash_map>
 #define HASH_NAMESPACE std
+
+#else
+#include <hash_map>
+#define HASH_NAMESPACE
 #endif
+
 #endif
 
 using HASH_NAMESPACE::hash_map;


Index: llvm/include/Support/hash_set
diff -u llvm/include/Support/hash_set:1.6 llvm/include/Support/hash_set:1.6.2.1
--- llvm/include/Support/hash_set:1.6	Fri Nov  8 08:07:33 2002
+++ llvm/include/Support/hash_set	Mon Jun 23 13:50:38 2003
@@ -17,23 +17,25 @@
 //  3.0.4       std      ext/hash_set
 //  3.1      __gnu_cxx   ext/hash_set
 //
-#if __GNUC__==3
-#include <ext/hash_set>
 
-#ifndef HASH_NAMESPACE
-#if __GNUC_MINOR__ == 0
-#define HASH_NAMESPACE std
-#else
+#include "Config/config.h"
+
+#ifdef HAVE_GNU_EXT_HASH_SET
+
+#include <ext/hash_set>
 #define HASH_NAMESPACE __gnu_cxx
-#endif
-#endif
 
 #else
 
-#include <hash_set>
-#ifndef HASH_NAMESPACE
+#ifdef HAVE_STD_EXT_HASH_SET
+#include <ext/hash_set>
 #define HASH_NAMESPACE std
+
+#else
+#include <hash_set>
+#define HASH_NAMESPACE
 #endif
+
 #endif
 
 using HASH_NAMESPACE::hash_set;


Index: llvm/include/Support/ilist
diff -u llvm/include/Support/ilist:1.6 llvm/include/Support/ilist:1.6.2.1
--- llvm/include/Support/ilist:1.6	Wed Apr 23 11:17:53 2003
+++ llvm/include/Support/ilist	Mon Jun 23 13:50:38 2003
@@ -31,7 +31,7 @@
 #ifndef INCLUDED_SUPPORT_ILIST
 #define INCLUDED_SUPPORT_ILIST
 
-#include <assert.h>
+#include "Config/assert.h"
 #include <algorithm>
 #include <Support/iterator>
 


Index: llvm/include/Support/iterator
diff -u llvm/include/Support/iterator:1.2 llvm/include/Support/iterator:1.2.2.1
--- llvm/include/Support/iterator:1.2	Wed Jul 24 17:07:13 2002
+++ llvm/include/Support/iterator	Mon Jun 23 13:50:38 2003
@@ -19,9 +19,11 @@
 #ifndef SUPPORT_ITERATOR_H
 #define SUPPORT_ITERATOR_H
 
+#include "Config/config.h"
+
 #include <iterator>
 
-#if __GNUC__ == 3
+#ifdef HAVE_STD_ITERATOR
 
 // Define stupid wrappers around std::iterator...
 template<class Ty, class PtrDiffTy>
@@ -35,6 +37,7 @@
 };
 
 #else
+
 // Just use bidirectional_iterator directly.
 using std::bidirectional_iterator;
 using std::forward_iterator;


Index: llvm/include/Support/slist
diff -u llvm/include/Support/slist:1.2 llvm/include/Support/slist:1.2.2.1
--- llvm/include/Support/slist:1.2	Sun Feb 23 22:40:35 2003
+++ llvm/include/Support/slist	Mon Jun 23 13:50:38 2003
@@ -10,6 +10,8 @@
 #ifndef SUPPORT_SLIST_H
 #define SUPPORT_SLIST_H
 
+#include "Config/config.h"
+
 // Compiler Support Matrix
 //
 // Version   Namespace   Header File
@@ -17,18 +19,19 @@
 //  3.0.4       std      ext/slist
 //  3.1      __gnu_cxx   ext/slist
 //
-#if __GNUC__ == 3
+
+#ifdef HAVE_EXT_SLIST
 #include <ext/slist>
+#else
+#include <slist>
+#endif
 
-#if __GNUC_MINOR__ == 0
+#if HAVE_EXT_SLIST == std
 using std::slist;
-#else
-using __gnu_cxx::slist;
 #endif
 
-#else
-// GCC 2.x
-#include <slist>
+#if HAVE_EXT_SLIST == gnu
+using __gnu_cxx::slist;
 #endif
 
 #endif





More information about the llvm-commits mailing list