Merge pull request #4 from DhruvSrivastavaX/aix-llvm-flag

Replaced __AIX__ with LLVM's _AIX

Author: DhruvSrivastavaX

clang/test/SemaCXX/class-layout.cpp

@@ -639,7 +639,7 @@ namespace PR37275 {
 #pragma pack(pop)
 }
 
-#endif // !defined(__MVS__) && !defined(__AIX__)
+#endif // !defined(__MVS__) && !defined(_AIX)
 
 namespace non_pod {
 struct t1 {

lldb/CMakeLists.txt

@@ -38,10 +38,6 @@ endif()
 include(LLDBConfig)
 include(AddLLDB)
 
-if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
-  add_definitions("-D__AIX__")
-endif()
-
 # Define the LLDB_CONFIGURATION_xxx matching the build type.
 if(uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
   add_definitions(-DLLDB_CONFIGURATION_DEBUG)

lldb/include/lldb/Host/HostGetOpt.h

@@ -9,7 +9,7 @@
 #ifndef LLDB_HOST_HOSTGETOPT_H
 #define LLDB_HOST_HOSTGETOPT_H
 
-#if !defined(_MSC_VER) && !defined(__NetBSD__) && !defined(__AIX__)
+#if !defined(_MSC_VER) && !defined(__NetBSD__) && !defined(_AIX)
 
 #include <getopt.h>
 #include <unistd.h>

lldb/include/lldb/Host/HostInfo.h

@@ -55,7 +55,7 @@
 #elif defined(__APPLE__)
 #include "lldb/Host/macosx/HostInfoMacOSX.h"
 #define HOST_INFO_TYPE HostInfoMacOSX
-#elif defined(__AIX__)
+#elif defined(_AIX)
 #include "lldb/Host/aix/HostInfoAIX.h"
 #define HOST_INFO_TYPE HostInfoAIX
 #else

lldb/include/lldb/Host/XML.h

@@ -11,7 +11,7 @@
 
 #include "lldb/Host/Config.h"
 
-#if defined(__AIX__)
+#if defined(_AIX)
 //FIXME for AIX
 #undef LLDB_ENABLE_LIBXML2
 #endif

lldb/include/lldb/Host/common/GetOptInc.h

@@ -11,11 +11,11 @@
 
 #include "lldb/lldb-defines.h"
 
-#if defined(_MSC_VER) || defined(__AIX__)
+#if defined(_MSC_VER) || defined(_AIX)
 #define REPLACE_GETOPT
 #define REPLACE_GETOPT_LONG
 #endif
-#if defined(_MSC_VER) || defined(__NetBSD__) || defined(__AIX__)
+#if defined(_MSC_VER) || defined(__NetBSD__) || defined(_AIX)
 #define REPLACE_GETOPT_LONG_ONLY
 #endif
 

lldb/include/lldb/Target/Process.h

@@ -65,7 +65,7 @@
 #include "llvm/Support/Threading.h"
 #include "llvm/Support/VersionTuple.h"
 
-#if defined(__AIX__)
+#if defined(_AIX)
 struct ld_xinfo;
 #endif
 
@@ -1884,7 +1884,7 @@ class Process : public std::enable_shared_from_this<Process>,
   Status GetMemoryRegionInfo(lldb::addr_t load_addr,
                              MemoryRegionInfo &range_info);
 
-#if defined(__AIX__)
+#if defined(_AIX)
   Status GetLDXINFO(struct ld_xinfo *info_ptr);
 #endif
 
@@ -2823,7 +2823,7 @@ void PruneThreadPlans();
         "Process::DoGetMemoryRegionInfo() not supported");
   }
 
-#if defined(__AIX__)
+#if defined(_AIX)
   virtual Status DoGetLDXINFO(struct ld_xinfo *info_ptr) {
     return Status("Process::DoGetLDXINFO() not supported");
   }

lldb/include/lldb/Target/RegisterContextUnwind.h

@@ -67,7 +67,7 @@ class RegisterContextUnwind : public lldb_private::RegisterContext {
 
   bool ReadPC(lldb::addr_t &start_pc);
 
-#ifdef __AIX__
+#ifdef _AIX
   bool ReadLR(lldb::addr_t &lr);
 #endif
 

lldb/source/Core/Mangled.cpp

@@ -167,7 +167,7 @@ static char *GetItaniumDemangledStr(const char *M) {
            "Expected demangled_size to return length including trailing null");
   }
 
-#if !defined(__AIX__)  
+#if !defined(_AIX)  
   if (Log *log = GetLog(LLDBLog::Demangle)) {
     if (demangled_cstr)
       LLDB_LOGF(log, "demangled itanium: %s -> \"%s\"", M, demangled_cstr);

lldb/source/Core/Section.cpp

@@ -263,7 +263,7 @@ bool Section::ResolveContainedAddress(addr_t offset, Address &so_addr,
 
 bool Section::ContainsFileAddress(addr_t vm_addr) const {
   const addr_t file_addr = GetFileAddress();
-#ifdef __AIX__
+#ifdef _AIX
   if (file_addr == 0)
     return false;
 #endif