Move Config.h from Host to Utility

[zturner]

Summary

Host/Config.h is where we have platform specific preprocessor defines that are configured at CMake time. Then, we can include this file lldb/Host/Config.h and read the value of defines. This is basically identical to what llvm does with llvm/Support/llvm-config.h, the only fundamental differences being: a) LLDB configures it into lldb/Host where as the spiritual equivalent to llvm/Support is lldb/Utility, and b) LLDB calls it Config.h and LLVM calls it llvm-config.h.

This patch brings LLDB in line with LLVM here by configuring into lldb/Utility/lldb-config.h, in part for consistency and in part for more practical reasons.

The practical reasons are that I want to use Socket.h from a new tool / library without having to link all of LLDB such as Clang, Python, etc, and that's not currently possible with the current layering, as linking to Host will link to everything.

So this is a necessary first step. llvm/Support's model for handling platform specific differences is quite convenient both from a usability as well as a maintenance perspective, and I'd like to gradually move towards that whenever an opportunity / need arises. So the immediate plan is to move config.h to Utility, and then start by moving pieces -- as necessary -- from Host to Utility until I can get Socket just by linking to lldbUtility.

[JDevlieghere]

Makes sense, no objections from me.

[jingham]

Utility is supposed to be a bunch of stand-alone utility files & headers that we gather together for convenience's sake.

Host is where we put all the code that is specific to one or another host, and any support files that requires. For instance, that's why PlatformLinux and friends are there, and all the independent platform directories. So it is odd to move platform specific defines from Host to Utility.

I don't care much about the name, but having this in Utility when it is setting Host defines and we have a place clearly set out for host support files doesn't seem right.

[zturner]

In D58654#1409974, @jingham wrote:

Utility is supposed to be a bunch of stand-alone utility files & headers that we gather together for convenience's sake.

Host is where we put all the code that is specific to one or another host, and any support files that requires. For instance, that's why PlatformLinux and friends are there, and all the independent platform directories. So it is odd to move platform specific defines from Host to Utility.

I don't care much about the name, but having this in Utility when it is setting Host defines and we have a place clearly set out for host support files doesn't seem right.

That is how Host started out, but I think that that distinction both a) hasn't played out the way we hoped for in practice, and b) isn't necessarily the right line to draw anyway. We have quite a few ifdefs scattered around the codebase for different platforms that are not in Host in places where we couldn't easily (or cleanly) make the code fit into that separation model. On the flip side, lots of stuff has crept into Host that isn't really host-specific, which is why the dependencies are so tangled up.

I think following the LLVM/Support model makes sense. It's "Utility", plus what we would normally think of as "Host". This is a lot cleaner than it sounds, and all of the ifdefs and platform specific defines end up only in private implementation files, with none exposed through headers.

To be honest, I don't mind if we call it something other than Host (for example it could be called System or something), but the practical issue with using Host today is that it still has a ways to go before it can be linked against without pulling in the rest of LLDB, and the changes needed to get there are not trivial, so it will take some more continued effort.

Regardless, in my mind Utility is exactly what you said, but that definition doesn't actually preclude Host-specific things. In fact, putting Host-specific abstractions there solves a lot of problems. Imagine, for example, someone wanted to create a debugging related tool that was not a full-fledged debugger. They might want to use lots of functionality that is in Utility and Host, but not bring in everything else. That's what Utility is to me. It's a set of abstractions that are useful for creating debugging-related tooling that someone can use for that purpose.

I don't necessarily care if it's in Utility or some other newly created library we call something else, but we need some immediate way of using these abstractions without linking against the rest of LLDB so that we're not blocked on finishing the layering split.

One option would be to just keep growing Utility with these kinds of classes and abstractions until we decide that it's too big, at which point a separation would probably fall out naturally (FWIW, this is how LLVM/Support and LLVM/ADT evolved into what they are)

[jingham]

There aren't many more platforms (OpenVMS?) that are likely to show up and need support for lldb, so maybe this is making too much of the matter. But having there be a well defined set of places where you need to look when porting lldb to a new host platform seems a useful design to me. The fact that we weren't strict enough and allowed Host platform dependencies to creep in where they don't belong doesn't argue we should just abandon trying to keep the places where a port sockets into lldb regular.

It's fine to have a staging area ("WillBeHost"?) to help pull out the classes that it is simple to pull out of host. But I'd rather not glom them all into Utility, which is already becoming a little incoherent.

[zturner]

In D58654#1410080, @jingham wrote:

There aren't many more platforms (OpenVMS?) that are likely to show up and need support for lldb, so maybe this is making too much of the matter. But having there be a well defined set of places where you need to look when porting lldb to a new host platform seems a useful design to me. The fact that we weren't strict enough and allowed Host platform dependencies to creep in where they don't belong doesn't argue we should just abandon trying to keep the places where a port sockets into lldb regular.

It's fine to have a staging area ("WillBeHost"?) to help pull out the classes that it is simple to pull out of host. But I'd rather not glom them all into Utility, which is already becoming a little incoherent.

How about "System" then? FTR, I'm also fine eventually renaming it back to Host once all the layering issues are addressed. The important thing is that if it's really just a set of platform-specific abstractions, it shouldn't really depend on anything else (except perhaps Utility).

I guess one advantage to having them be together though is that often even the Utility code itself needs to make use of platform-specific abstractions. You can already see this anywhere that lldb/Utility calls into llvm/Support to do things like read from the file system or start a thread (TBH, I'm actually not even sure it does any of those things, but it seems reasonable that it might want to). So if we make a library called System, then it's possible that System ends up depending on Utility and Utility ends up depending on System. Despite all of mine (and others') push for proper layering, this is one area where I'm actually ok with it. LLVM has the same issue here, where ADT and Support depend on each other and just linked together into one big .lib, despite being in separate folders.

But it's something to keep in mind.

Anyway, does that seem reasonable? Put it in a new folder called System?

[labath]

I also think it would be great to group all host-specific functionality into a common library (other than Utility, since that already has a lot of other stuff in it).

I understand the desire to start with a clean slate for a new tool, so a new would-be-host folder might be a good middle ground between using host as-is and shoving everything into Utility. It will create some "git blame" churn, but probably won't be that bad overall. I probably wouldn't do it that way, because I think we're not far from "fixing" Host (you can help by reviewing D58167, I am waiting for your responses on the comments there), and I don't think it would be so bad to "accidentally" depend on everything in the interim. However, this seems fine too.

So, bottom line, if everyone is ok with the "staging" System folder, then I am too.

[zturner]

Moved to System instead of Utility

[JDevlieghere]

I'm not a fan of introducing another library for this. Without a clear timeline of "fixing" Host it's basically as temporary as anything else in software development. I also think it's confusing (e,g, new files should go where?). If you really want a clean slate we should move everything in System that doesn't depend on anything other than Utility until Host is empty, but I'm sure everyone agrees that unrealistic and not worth the churn.

For the record I also very much support a Host library instead of having everything in Utility. That being said, I could see the config file being special enough (in that everything depends on it) to be the exception.

It seems like we could drop the dependencies on Core and Symbol by moving Symbols somewhere else. How much work would there be left after Pavel's patch?

[zturner]

In D58654#1410817, @JDevlieghere wrote:

I'm not a fan of introducing another library for this. Without a clear timeline of "fixing" Host it's basically as temporary as anything else in software development. I also think it's confusing (e,g, new files should go where?). If you really want a clean slate we should move everything in System that doesn't depend on anything other than Utility until Host is empty, but I'm sure everyone agrees that unrealistic and not worth the churn.

For the record I also very much support a Host library instead of having everything in Utility. That being said, I could see the config file being special enough (in that everything depends on it) to be the exception.

It seems like we could drop the dependencies on Core and Symbol by moving Symbols somewhere else. How much work would there be left after Pavel's patch?

Moving Symbols somewhere else isn't exactly easy though. There's a lot of interdependencies that are slightly different on every Host platform, so it creates a lot of breakage doing things this way.

FWIW, I actually wouldn't mind moving everything out of Host into System until Host is basically empty. My next step after this patch was going to be to move MainLoop followed by Socket into System (those are my actual goals anyway). In some ways, approaching the dependency problem from both directions this way is more effective than approaching it from only one side, as this way eventually Host becomes so small that you can just take whatever is left over and have it be subsumed by some other target (probably Core or Symbols).

All of that said, I'm not as sold that having a separate library just for Host is even terribly useful. I'll go along with it if that's what everyone wants, but at the end of the day, this library (whether it be called Host, or System, or something else) will almost certainly depend on Utility, and Utility will almost certainly depend on it (for the same reason that Utility currently depends on llvm/Support). This is why in LLVM/Support there are both non-Host specific things, such as StringExtras.h, and host specific things, such as FileSystem.h, Thread.h, etc. I don't think that's actually so bad in practice.

So my vote is honestly still to just put this in Utility for consistency with LLVM, but I can agree with System or something as part of a transition if it gets us closer to being able to use these utility classes without a dependency on the whole debugger.

[labath]

BTW, what's the reason that you have to have this split now? I understand its attractiveness from a Zen perspective, but it seems to me that at the end of the day, it doesn't have that much impact on the new code you're about to write. It seems to me you could still enforce a clean layering on the new code by just saying "only ever include stuff from Host or Utility". The fact that Host transitively pulls in the kitchen sink is unfortunate, but I don't think it should impact you much. And when we finally clean up Host (which is something that we'll do eventually, and I hope not too far from now), then the new code will magically stop depending on the whole world without any extra effort.

In D58654#1410852, @zturner wrote:

In D58654#1410817, @JDevlieghere wrote:

I'm not a fan of introducing another library for this. Without a clear timeline of "fixing" Host it's basically as temporary as anything else in software development. I also think it's confusing (e,g, new files should go where?). If you really want a clean slate we should move everything in System that doesn't depend on anything other than Utility until Host is empty, but I'm sure everyone agrees that unrealistic and not worth the churn.

For the record I also very much support a Host library instead of having everything in Utility. That being said, I could see the config file being special enough (in that everything depends on it) to be the exception.

I would actually say that almost nothing should depend on the config file :). I mean this in the sense that the dependencies should be encapsulated similarly to how llvm encapsulates all of the external dependencies and the rest of the code should just use those abstractions.

However, I too have come to the conclusion that the config file could be an exception. My reason for that is that for instance our XML abstraction seems to be misplaced in the Host library. It's kind of true that whether libxml is present is a feature of the host system, but that's a fairly odd way of looking at things. Right not I am incubating this idea of creating a "Formats" library which would house the minidump parser, gdb-remote protocol support code and similar, XML support seems like it could fit nicely there. Having the LIBXML_AVAILABLE macro in an easily accessible place would help make that happen.

It seems like we could drop the dependencies on Core and Symbol by moving Symbols somewhere else. How much work would there be left after Pavel's patch?

Yea, symbols is going to be the trickiest part. I've been preparing myself (both code-wise and mentally) to tackle that by first removing all the other easy obstacles first. I have a sort of an idea on how to handle that, but I don't want to go into that here.

I suppose one way to make progress here would be to move Symbols into some weird temporary package. Then cleaning up the rest of Host should be easy, and the temporary package could disappear as soon as Symbols has been dealt with. It might make my job of cleaning it up easier, as I could just move the modularized functionality back into Host piece by piece. It shouldn't even create additional history churn, as that code will need to be rewritten anyway.

[JDevlieghere]

In D58654#1410852, @zturner wrote:

In D58654#1410817, @JDevlieghere wrote:

I'm not a fan of introducing another library for this. Without a clear timeline of "fixing" Host it's basically as temporary as anything else in software development. I also think it's confusing (e,g, new files should go where?). If you really want a clean slate we should move everything in System that doesn't depend on anything other than Utility until Host is empty, but I'm sure everyone agrees that unrealistic and not worth the churn.

For the record I also very much support a Host library instead of having everything in Utility. That being said, I could see the config file being special enough (in that everything depends on it) to be the exception.

It seems like we could drop the dependencies on Core and Symbol by moving Symbols somewhere else. How much work would there be left after Pavel's patch?

Moving Symbols somewhere else isn't exactly easy though. There's a lot of interdependencies that are slightly different on every Host platform, so it creates a lot of breakage doing things this way.

FWIW, I actually wouldn't mind moving everything out of Host into System until Host is basically empty. My next step after this patch was going to be to move MainLoop followed by Socket into System (those are my actual goals anyway). In some ways, approaching the dependency problem from both directions this way is more effective than approaching it from only one side, as this way eventually Host becomes so small that you can just take whatever is left over and have it be subsumed by some other target (probably Core or Symbols).

All of that said, I'm not as sold that having a separate library just for Host is even terribly useful. I'll go along with it if that's what everyone wants, but at the end of the day, this library (whether it be called Host, or System, or something else) will almost certainly depend on Utility, and Utility will almost certainly depend on it (for the same reason that Utility currently depends on llvm/Support). This is why in LLVM/Support there are both non-Host specific things, such as StringExtras.h, and host specific things, such as FileSystem.h, Thread.h, etc. I don't think that's actually so bad in practice.

So my vote is honestly still to just put this in Utility for consistency with LLVM, but I can agree with System or something as part of a transition if it gets us closer to being able to use these utility classes without a dependency on the whole debugger.

In D58654#1411084, @labath wrote:

BTW, what's the reason that you have to have this split now? I understand its attractiveness from a Zen perspective, but it seems to me that at the end of the day, it doesn't have that much impact on the new code you're about to write. It seems to me you could still enforce a clean layering on the new code by just saying "only ever include stuff from Host or Utility". The fact that Host transitively pulls in the kitchen sink is unfortunate, but I don't think it should impact you much. And when we finally clean up Host (which is something that we'll do eventually, and I hope not too far from now), then the new code will magically stop depending on the whole world without any extra effort.

In D58654#1410852, @zturner wrote:

In D58654#1410817, @JDevlieghere wrote:

I'm not a fan of introducing another library for this. Without a clear timeline of "fixing" Host it's basically as temporary as anything else in software development. I also think it's confusing (e,g, new files should go where?). If you really want a clean slate we should move everything in System that doesn't depend on anything other than Utility until Host is empty, but I'm sure everyone agrees that unrealistic and not worth the churn.

For the record I also very much support a Host library instead of having everything in Utility. That being said, I could see the config file being special enough (in that everything depends on it) to be the exception.

I would actually say that almost nothing should depend on the config file :). I mean this in the sense that the dependencies should be encapsulated similarly to how llvm encapsulates all of the external dependencies and the rest of the code should just use those abstractions.

However, I too have come to the conclusion that the config file could be an exception. My reason for that is that for instance our XML abstraction seems to be misplaced in the Host library. It's kind of true that whether libxml is present is a feature of the host system, but that's a fairly odd way of looking at things. Right not I am incubating this idea of creating a "Formats" library which would house the minidump parser, gdb-remote protocol support code and similar, XML support seems like it could fit nicely there. Having the LIBXML_AVAILABLE macro in an easily accessible place would help make that happen.

It seems like we could drop the dependencies on Core and Symbol by moving Symbols somewhere else. How much work would there be left after Pavel's patch?

Yea, symbols is going to be the trickiest part. I've been preparing myself (both code-wise and mentally) to tackle that by first removing all the other easy obstacles first. I have a sort of an idea on how to handle that, but I don't want to go into that here.

I suppose one way to make progress here would be to move Symbols into some weird temporary package. Then cleaning up the rest of Host should be easy, and the temporary package could disappear as soon as Symbols has been dealt with. It might make my job of cleaning it up easier, as I could just move the modularized functionality back into Host piece by piece. It shouldn't even create additional history churn, as that code will need to be rewritten anyway.

I think this inverted approach makes more sense than pulling everything out of host that doesn't depend on anything outside of Utility. Seems like that would create less churn, leave host as the canonical library, and have the same effect. Zachary, how do you feel about that?

[zturner]

In D58654#1411084, @labath wrote:

BTW, what's the reason that you have to have this split now? I understand its attractiveness from a Zen perspective, but it seems to me that at the end of the day, it doesn't have that much impact on the new code you're about to write. It seems to me you could still enforce a clean layering on the new code by just saying "only ever include stuff from Host or Utility". The fact that Host transitively pulls in the kitchen sink is unfortunate, but I don't think it should impact you much. And when we finally clean up Host (which is something that we'll do eventually, and I hope not too far from now), then the new code will magically stop depending on the whole world without any extra effort.

I suppose that actually is fine.

[JDevlieghere]

I believe this isn't relevant anymore after moving Symbols?

lldb/cmake/XcodeHeaderGenerator/CMakeLists.txt

 cmake_minimum_required(VERSION 3.4.3)
 
 project(XcodeConfig C CXX)
 
 set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
   "${CMAKE_CURRENT_SOURCE_DIR}/.."
   "${CMAKE_CURRENT_SOURCE_DIR}/../modules"
   )
 
 set(LLDB_CONFIG_HEADER_INPUT
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lldb/Host/Config.h.cmake)
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../include/lldb/System/lldb-config.h.cmake)
 
 include(LLDBGenerateConfig)

lldb/cmake/modules/LLDBGenerateConfig.cmake

else()
     set(LLDB_HAVE_EL_RFUNC_T 1)
   endif()
   set(CMAKE_REQUIRED_LIBRARIES)
   set(CMAKE_REQUIRED_INCLUDES)
   set(CMAKE_EXTRA_INCLUDE_FILES)
 endif()
 
 if(NOT LLDB_CONFIG_HEADER_INPUT)
- set(LLDB_CONFIG_HEADER_INPUT ${LLDB_INCLUDE_ROOT}/lldb/Host/Config.h.cmake)
+ set(LLDB_CONFIG_HEADER_INPUT ${LLDB_INCLUDE_ROOT}/lldb/System/lldb-config.h.cmake)
 endif()
 
 if(NOT LLDB_CONFIG_HEADER_OUTPUT)
- set(LLDB_CONFIG_HEADER_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/lldb/Host/Config.h)
+ set(LLDB_CONFIG_HEADER_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/lldb/System/lldb-config.h)
 endif()
 
 # This should be done at the end
 configure_file(
   ${LLDB_CONFIG_HEADER_INPUT}
   ${LLDB_CONFIG_HEADER_OUTPUT}
   )

lldb/include/lldb/Host/MainLoop.h

 //===-- MainLoop.h ----------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef lldb_Host_MainLoop_h_
 #define lldb_Host_MainLoop_h_
 
-#include "lldb/Host/Config.h"
 #include "lldb/Host/MainLoopBase.h"
+#include "lldb/System/lldb-config.h"
 #include "llvm/ADT/DenseMap.h"
 #include <csignal>
 
 #if !HAVE_PPOLL && !HAVE_SYS_EVENT_H && !defined(__ANDROID__)
 #define SIGNAL_POLLING_UNSUPPORTED 1
 #endif
 
 namespace lldb_private {

lldb/include/lldb/Host/Terminal.h

 //===-- Terminal.h ----------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef liblldb_Terminal_h_
 #define liblldb_Terminal_h_
 #if defined(__cplusplus)
 
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/lldb-private.h"
 
 struct termios;
 
 namespace lldb_private {
 
 class Terminal {
 public:

lldb/include/lldb/Host/linux/Uio.h

 //===-- Uio.h ---------------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef liblldb_Host_linux_Uio_h_
 #define liblldb_Host_linux_Uio_h_
 
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 #include <sys/uio.h>
 
 // We shall provide our own implementation of process_vm_readv if it is not
 // present
 #if !HAVE_PROCESS_VM_READV
 ssize_t process_vm_readv(::pid_t pid, const struct iovec *local_iov,
                          unsigned long liovcnt, const struct iovec *remote_iov,
                          unsigned long riovcnt, unsigned long flags);
 #endif
 
 #endif // liblldb_Host_linux_Uio_h_

lldb/include/lldb/System/lldb-config.h

 //===-- Config.h ------------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLDB_HOST_CONFIG_H
-#define LLDB_HOST_CONFIG_H
- 
+#ifndef LLDB_UTILITY_CONFIG_H
+#define LLDB_UTILITY_CONFIG_H
 #if defined(__APPLE__)
 
 // This block of code only exists to keep the Xcode project working in the
 // absence of a configuration step.
 #define LLDB_CONFIG_TERMIOS_SUPPORTED 1
 
 #define LLDB_EDITLINE_USE_WCHAR 1
 
 #define LLDB_HAVE_EL_RFUNC_T 1
 
 #define HAVE_SYS_EVENT_H 1
 
 #define HAVE_PPOLL 0
 
 #define HAVE_SIGACTION 1
 
 #define HAVE_LIBCOMPRESSION 1
 
 #else
 
 #error This file is only used by the Xcode build.
 
 #endif
 
-#endif // #ifndef LLDB_HOST_CONFIG_H
+#endif // #ifndef LLDB_UTILITY_CONFIG_H

lldb/include/lldb/System/lldb-config.h.cmake

 //===-- Config.h -----------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLDB_HOST_CONFIG_H
-#define LLDB_HOST_CONFIG_H
+#ifndef LLDB_UTILITY_CONFIG_H
+#define LLDB_UTILITY_CONFIG_H
 
 #cmakedefine LLDB_CONFIG_TERMIOS_SUPPORTED
 
 #cmakedefine01 LLDB_EDITLINE_USE_WCHAR
 
 #cmakedefine01 LLDB_HAVE_EL_RFUNC_T
 
 #cmakedefine LLDB_DISABLE_POSIX

 #cmakedefine01 HAVE_PROCESS_VM_READV
 
 #cmakedefine01 HAVE_NR_PROCESS_VM_READV
 
 #ifndef HAVE_LIBCOMPRESSION
 #cmakedefine HAVE_LIBCOMPRESSION
 #endif
 
-#endif // #ifndef LLDB_HOST_CONFIG_H
+#endif // #ifndef LLDB_UTILITY_CONFIG_H

lldb/include/lldb/Target/Process.h

 //===-- Process.h -----------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef liblldb_Process_h_
 #define liblldb_Process_h_
 
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include <limits.h>
 
 #include <chrono>
 #include <list>
 #include <memory>
 #include <mutex>
 #include <string>

lldb/source/Host/common/File.cpp

 #include <unistd.h>
 #endif
 
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/Errno.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Process.h"
 
-#include "lldb/Host/Config.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/Host.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/Log.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
 static const char *GetStreamOpenModeFromOptions(uint32_t options) {

lldb/source/Host/common/HostInfoBase.cpp

 //===-- HostInfoBase.cpp ----------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Host/HostInfoBase.h"
 #include "lldb/Utility/ArchSpec.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/StreamString.h"

lldb/source/Host/common/ProcessLaunchInfo.cpp

 //===-- ProcessLaunchInfo.cpp -----------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include <climits>
 
-#include "lldb/Host/Config.h"
 #include "lldb/Host/FileAction.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Host/ProcessLaunchInfo.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/StreamString.h"
 
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/FileSystem.h"
 
 #if !defined(_WIN32)
 #include <limits.h>

lldb/source/Host/common/PseudoTerminal.cpp

 //===-- PseudoTerminal.cpp --------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Host/PseudoTerminal.h"
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include "llvm/Support/Errno.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #if defined(TIOCSCTTY)
 #include <sys/ioctl.h>

lldb/source/Host/common/Socket.cpp

 //===-- Socket.cpp ----------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Host/Socket.h"
 
-#include "lldb/Host/Config.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/SocketAddress.h"
 #include "lldb/Host/StringConvert.h"
 #include "lldb/Host/common/TCPSocket.h"
 #include "lldb/Host/common/UDPSocket.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/RegularExpression.h"
 
 #include "llvm/ADT/STLExtras.h"
 
 #ifndef LLDB_DISABLE_POSIX
 #include "lldb/Host/posix/DomainSocket.h"
 

lldb/source/Host/common/TCPSocket.cpp

 //===-- TCPSocket.cpp -------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #if defined(_MSC_VER)
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
 
 #include "lldb/Host/common/TCPSocket.h"
 
-#include "lldb/Host/Config.h"
 #include "lldb/Host/MainLoop.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Utility/Log.h"
 
 #include "llvm/Config/llvm-config.h"
 #include "llvm/Support/raw_ostream.h"
 
 #ifndef LLDB_DISABLE_POSIX
 #include <arpa/inet.h>
 #include <netinet/tcp.h>

lldb/source/Host/common/Terminal.cpp

 //===-- Terminal.cpp --------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Host/Terminal.h"
 
-#include "lldb/Host/Config.h"
 #include "lldb/Host/PosixApi.h"
+#include "lldb/System/lldb-config.h"
 #include "llvm/ADT/STLExtras.h"
 
 #include <fcntl.h>
 #include <signal.h>
 
 #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
 #include <termios.h>
 #endif

lldb/source/Host/common/UDPSocket.cpp

 //===-- UDPSocket.cpp -------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Host/common/UDPSocket.h"
 
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Utility/Log.h"
 
 #ifndef LLDB_DISABLE_POSIX
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #endif
 
 #include <memory>

lldb/source/Host/linux/HostInfoLinux.cpp

 //===-- HostInfoLinux.cpp ---------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Host/linux/HostInfoLinux.h"
-#include "lldb/Host/Config.h"
 #include "lldb/Host/FileSystem.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Utility/Log.h"
 
 #include "llvm/Support/Threading.h"
 
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/utsname.h>

lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp

 //===-- ConnectionFileDescriptorPosix.cpp -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #if defined(__APPLE__)
 // Enable this special support for Apple builds where we can have unlimited
 // select bounds. We tried switching to poll() and kqueue and we were panicing
 // the kernel, so we have to stick with select for now.
 #define _DARWIN_UNLIMITED_SELECT
 #endif
 
 #include "lldb/Host/posix/ConnectionFileDescriptorPosix.h"
-#include "lldb/Host/Config.h"
 #include "lldb/Host/Socket.h"
 #include "lldb/Host/SocketAddress.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Utility/SelectHelper.h"
 #include "lldb/Utility/Timeout.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>

lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp

 //===-- PlatformFreeBSD.cpp -------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "PlatformFreeBSD.h"
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include <stdio.h>
 #ifndef LLDB_DISABLE_POSIX
 #include <sys/utsname.h>
 #endif
 
 #include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Breakpoint/BreakpointSite.h"

lldb/source/Plugins/Platform/Kalimba/PlatformKalimba.cpp

 //===-- PlatformKalimba.cpp ---------------------------------------*- C++
 //-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "PlatformKalimba.h"
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleList.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Target/Process.h"

lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp

 //===-- PlatformLinux.cpp ---------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "PlatformLinux.h"
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include <stdio.h>
 #ifndef LLDB_DISABLE_POSIX
 #include <sys/utsname.h>
 #endif
 
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/PluginManager.h"

lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp

 //===-- PlatformMacOSX.cpp --------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "PlatformMacOSX.h"
-#include "lldb/Host/Config.h"
-
+#include "lldb/System/lldb-config.h"
 
 #include <sstream>
 
 #include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleList.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"

lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp

 //===-- PlatformNetBSD.cpp -------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "PlatformNetBSD.h"
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include <stdio.h>
 #ifndef LLDB_DISABLE_POSIX
 #include <sys/utsname.h>
 #endif
 
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/PluginManager.h"

lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp

 //===-- PlatformOpenBSD.cpp -------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "PlatformOpenBSD.h"
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include <stdio.h>
 #ifndef LLDB_DISABLE_POSIX
 #include <sys/utsname.h>
 #endif
 
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/PluginManager.h"

lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp

 //===-- PlatformRemoteGDBServer.cpp -----------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "PlatformRemoteGDBServer.h"
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleList.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/StreamFile.h"

lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp

 //===-- InferiorCallPOSIX.cpp -----------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "InferiorCallPOSIX.h"
 #include "lldb/Core/Address.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/Core/ValueObject.h"
 #include "lldb/Expression/DiagnosticManager.h"
-#include "lldb/Host/Config.h"
 #include "lldb/Symbol/ClangASTContext.h"
 #include "lldb/Symbol/SymbolContext.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/ThreadPlanCallFunction.h"
 
 #ifndef LLDB_DISABLE_POSIX
 #include <sys/mman.h>

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h

 
 #include <condition_variable>
 #include <mutex>
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "lldb/Core/Communication.h"
-#include "lldb/Host/Config.h"
 #include "lldb/Host/HostThread.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Utility/Args.h"
 #include "lldb/Utility/Listener.h"
 #include "lldb/Utility/Predicate.h"
 #include "lldb/Utility/StringExtractorGDBRemote.h"
 #include "lldb/lldb-public.h"
 
 namespace lldb_private {
 namespace process_gdb_remote {

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

 #include "lldb/Utility/LLDBAssert.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/State.h"
 #include "lldb/Utility/StreamString.h"
 
 #include "ProcessGDBRemote.h"
 #include "ProcessGDBRemoteLog.h"
 #include "lldb/Host/Config.h"
-#include "lldb/Utility/StringExtractorGDBRemote.h"
+#include "lldb/System/lldb-config.h"
 
 #include "llvm/ADT/StringSwitch.h"
 
 #if defined(__APPLE__)
 #define HAVE_LIBCOMPRESSION
 #include <compression.h>
 #endif
 

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp

 //===-- GDBRemoteCommunicationReplayServer.cpp ------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include <errno.h>
 
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include "GDBRemoteCommunicationReplayServer.h"
 #include "ProcessGDBRemoteLog.h"
 
 // C Includes
 // C++ Includes
 #include <cstring>
 

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp

 //===-- GDBRemoteCommunicationServer.cpp ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include <errno.h>
 
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include "GDBRemoteCommunicationServer.h"
 
 #include <cstring>
 
 #include "ProcessGDBRemoteLog.h"
 #include "lldb/Utility/StreamString.h"
 #include "lldb/Utility/StringExtractorGDBRemote.h"

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp

 #ifdef __APPLE__
 #include <TargetConditionals.h>
 #endif
 
 #include <chrono>
 #include <cstring>
 
 #include "lldb/Core/ModuleSpec.h"
-#include "lldb/Host/Config.h"
 #include "lldb/Host/File.h"
 #include "lldb/Host/FileAction.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Host/SafeMachO.h"
 #include "lldb/Interpreter/OptionArgParser.h"
 #include "lldb/Symbol/ObjectFile.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Utility/Endian.h"
 #include "lldb/Utility/JSON.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/StreamGDBRemote.h"
 #include "lldb/Utility/StreamString.h"
 #include "llvm/ADT/Triple.h"

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp

 //===-- GDBRemoteCommunicationServerLLGS.cpp --------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include <errno.h>
 
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include "GDBRemoteCommunicationServerLLGS.h"
 #include "lldb/Utility/StreamGDBRemote.h"
 
 #include <chrono>
 #include <cstring>
 #include <thread>
 

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp

 #include <csignal>
 #include <cstring>
 #include <mutex>
 #include <sstream>
 
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Threading.h"
 
-#include "lldb/Host/Config.h"
 #include "lldb/Host/ConnectionFileDescriptor.h"
 #include "lldb/Host/FileAction.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/HostInfo.h"
+#include "lldb/System/lldb-config.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/UnixSignals.h"
 #include "lldb/Utility/JSON.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/StreamGDBRemote.h"
 #include "lldb/Utility/StreamString.h"
 #include "lldb/Utility/StructuredData.h"

lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

 //===-- ProcessGDBRemote.cpp ------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Host/Config.h"
+#include "lldb/System/lldb-config.h"
 
 #include <errno.h>
 #include <stdlib.h>
 #ifndef LLDB_DISABLE_POSIX
 #include <netinet/in.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <unistd.h>

lldb/unittests/Host/SocketTest.cpp

 //===-- SocketTest.cpp ------------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include <cstdio>
 #include <functional>
 #include <thread>
 
 #include "gtest/gtest.h"
 
-#include "lldb/Host/Config.h"
 #include "lldb/Host/Socket.h"
 #include "lldb/Host/common/TCPSocket.h"
 #include "lldb/Host/common/UDPSocket.h"
+#include "lldb/System/lldb-config.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 
 #ifndef LLDB_DISABLE_POSIX
 #include "lldb/Host/posix/DomainSocket.h"
 #endif
 
 using namespace lldb_private;