From e757752e39a9584ee6fb4017db7bef58cfd7e8f1 Mon Sep 17 00:00:00 2001
From: Misha Brukman <brukman+llvm@gmail.com>
Date: Tue, 26 Oct 2004 16:15:18 +0000
Subject: [PATCH] * DataTypesFix.h moved to AIXDataTypesFix.h * Condition
#inclusion of AIXDataTypes.h on the _AIX preprocessor symbol to prevent
extra I/O on non-AIX systems. Thus, no #ifdef in AIXDataTypes.h
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17257 91177308-0d34-0410-b5e6-96231b3b80d8
---
.../{DataTypesFix.h => AIXDataTypesFix.h} | 20 ++++++++-----------
include/llvm/Support/DataTypes.h.in | 5 +++--
2 files changed, 11 insertions(+), 14 deletions(-)
rename include/llvm/Support/{DataTypesFix.h => AIXDataTypesFix.h} (70%)
diff --git a/include/llvm/Support/DataTypesFix.h b/include/llvm/Support/AIXDataTypesFix.h
similarity index 70%
rename from include/llvm/Support/DataTypesFix.h
rename to include/llvm/Support/AIXDataTypesFix.h
index c73998d1d3f..36b4488841e 100644
--- a/include/llvm/Support/DataTypesFix.h
+++ b/include/llvm/Support/AIXDataTypesFix.h
@@ -1,4 +1,4 @@
-//===-- include/Support/DataTypesFix.h - Fix datatype defs ------*- C++ -*-===//
+//===-- include/Support/AIXDataTypesFix.h - Fix datatype defs ---*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -13,17 +13,13 @@
//
//===----------------------------------------------------------------------===//
-#ifndef SUPPORT_DATATYPESFIX_H
-#define SUPPORT_DATATYPESFIX_H
+// No include guards desired!
-#include "llvm/Config/config.h"
-
-#if defined(_POWER) && defined(_AIX)
-// GCC is strict about defining large constants: they must have LL modifier.
-#undef INT64_MAX
-#define INT64_MAX 9223372036854775807LL
-#undef INT64_MIN
-#define INT64_MIN (-INT64_MAX-1)
+#ifndef SUPPORT_DATATYPES_H
+#error "AIXDataTypesFix.h must only be included via DataTypes.h!"
#endif
-#endif /* SUPPORT_DATATYPESFIX_H */
+// GCC is strict about defining large constants: they must have LL modifier.
+// These will be defined properly at the end of DataTypes.h
+#undef INT64_MAX
+#undef INT64_MIN
diff --git a/include/llvm/Support/DataTypes.h.in b/include/llvm/Support/DataTypes.h.in
index f5467b2220f..4fc2d079ae4 100644
--- a/include/llvm/Support/DataTypes.h.in
+++ b/include/llvm/Support/DataTypes.h.in
@@ -49,8 +49,9 @@
#include <stdint.h>
#endif
-// Fix AIX definitions of INT64_{MIN,MAX}
-#include "llvm/Support/DataTypesFix.h"
+#ifdef _AIX
+#include "llvm/Support/AIXDataTypesFix.h"
+#endif
// Handle incorrect definition of uint64_t as u_int64_t
#ifndef HAVE_UINT64_T