Make build work on MinGW

[loladiro]

Summary

I was building LLDB under mingw (x64-4.8.1-posix-seh-rev5) today and these are the changes I needed to make the build work. It would be good if people with different windows configurations could make sure this doesn't break something else.

I also fixed the Makefile in Interpreter. It used to check for DISABLE_PYTHON but was then changed to check for MinGw (DISABLE_PYTHON is defined automatically for MinGW, but I think it's a valid use case to define it even on other platforms). It now checks for both and actually disables the build of LLDWrapPython if requested to do so (before it would still call the target).

[zturner]

Assuming you created this diff with git, would it be possible to use -U999999 in the future? It helps to be able to browse the rest of the file to get more context.

include/lldb/Host/windows/win32.h

57

Is this supposed to be #ifndef instead of #ifdef? As it stands, this changes the behavior on native Win32.

source/Utility/PseudoTerminal.cpp

23–27

Little confused about what's going on here and why we're messing with pid_t in two different places (this file and win32.h) with different conditions. Is it possible to centralize all the logic about what's going on with pid_t into win32.h?

tools/driver/Driver.cpp

919–924

Can win32.h contain a definition of mkstemp? Not a fan of pre-processor directives in source files, where avoidable.

[loladiro]

Yeah, I usually do the -U999999 thing, but forgot this time.

include/lldb/Host/windows/win32.h

57

Yes, I think you might be right about that.

source/Utility/PseudoTerminal.cpp

23–27

Yes, I think that would be a good idea. I was trying to do the inverse condition of the one in win32.h here, to avoid it being defined twice. I think we should unify it in win32.h if possible.

tools/driver/Driver.cpp

919–924

Sure, that doesn't sound like a bad idea.

[zturner]

I actually think a better solution is to just stop building PseudoTerminal
stuff on Windows. That's a larger change, but I suspect I'll do it at some
point in the future.

include/lldb/Host/windows/win32.h

 #include <stdarg.h>
 #include <time.h>
 
+extern "C" {
 // posix utilities
+#ifndef __MINGW32__
 int vasprintf(char **ret, const char *fmt, va_list ap);
+#endif
 char * strcasestr(const char *s, const char* find);
 char* realpath(const char * name, char * resolved);
 

 typedef unsigned short mode_t;
 
 #ifdef LLDB_DISABLE_PYTHON
+#ifdef __MINGW32__
 typedef uint32_t pid_t;
 #endif
+#endif
 
 int usleep(uint32_t useconds);
 

 #define snprintf _snprintf
 #endif
 
+#ifndef __MINGW32__
 // timespec
 struct timespec
 {
     time_t tv_sec;
     long   tv_nsec;
 };
-
+#endif
+} // extern "C"
 
 #endif  // LLDB_lldb_win32_h_

lib/Makefile

 ifeq ($(HOST_OS),MingW)
   USEDLIBS += lldbHostWindows.a \
               lldbPluginProcessElfCore.a \
+              lldbPluginProcessWindows.a \
               lldbPluginJITLoaderGDB.a
 endif
 

source/Host/windows/EditLineWin.cpp

 static char *
 el_get_s (char *buffer, int chars)
 {
+#ifdef __MINGW32__
+    return fgets(buffer,chars,stdin);
+#else
     return gets_s(buffer, chars);
+#endif
 }
 #else
 

source/Host/windows/Windows.cpp

 #include <cerrno>
 #include <ctype.h>
 
+extern "C" {
+#ifndef __MINGW32__
 int vasprintf(char **ret, const char *fmt, va_list ap)
 {
     char *buf;

     va_end(ap2);
     return len;
 }
+#endif
 
 char* strcasestr(const char *s, const char* find)
 {

 }
 
 #endif // _MSC_VER
+}
 No newline at end of file

source/Interpreter/Makefile

 include $(LLDB_LEVEL)/../../Makefile.config
 
 ifneq ($(HOST_OS),MingW)
+ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
+DO_BUILD = 1
 BUILT_SOURCES := LLDBWrapPython.cpp
 endif
+endif
 
 include $(LLDB_LEVEL)/Makefile
 -include $(PROJ_OBJ_DIR)/LLDBWrapPython.cpp.d
 
+ifeq ($(DO_BUILD),1)
 # Drop -Wfour-char-constants,  which we are not currently clean with.
 EXTRA_OPTIONS += -Wno-four-char-constants
 

 
 clean-local::
   $(Verb) $(RM) -f LLDBWrapPython.cpp lldb.py
+endif
 No newline at end of file

source/Plugins/Makefile

 
 ifeq ($(HOST_OS),MingW)
 DIRS += Process/elf-core
+DIRS += Process/Windows
 DIRS += JITLoader/GDB
 endif
 

source/Utility/PseudoTerminal.cpp

 
 #ifdef _WIN32
 #include "lldb/Host/windows/win32.h"
+
+#ifndef __MINGW32__
+#ifndef LLDB_DISABLE_PYTHON
 typedef uint32_t pid_t;
+#endif
+#endif
 // empty functions
 int posix_openpt(int flag) { return 0; }
 

tools/driver/Driver.cpp

 //
 //===----------------------------------------------------------------------===//
 
+#include <signal.h>
+
 #include "Driver.h"
 
+#ifdef __MINGW32__
+#include <sys/stat.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

         
         if (lldb_temp_dir_spec.GetPath(lldb_cmds_file, sizeof(lldb_cmds_file)))
         {
+#ifndef __MINGW32__
             int fd = mkstemp(lldb_cmds_file);
+#else
+            mktemp(lldb_cmds_file);
+            int fd = open(lldb_cmds_file,S_IRUSR|S_IWUSR|O_RDWR);
+#endif
             if (fd == -1)
             {
                 fprintf(stderr, "error: can't create temporary file for LLDB commands\n");

   exit (signo);
 }
 
+#ifndef _WIN32
 void
 sigtstp_handler (int signo)
 {

     kill (getpid(), signo);
     signal (signo, sigcont_handler);
 }
+#endif
 
 int
 main (int argc, char const *argv[], const char *envp[])

     
     SBHostOS::ThreadCreated ("<lldb.driver.main-thread>");
 
+#ifndef __MINGW32__
     signal (SIGPIPE, SIG_IGN);
     signal (SIGWINCH, sigwinch_handler);
-    signal (SIGINT, sigint_handler);
     signal (SIGTSTP, sigtstp_handler);
     signal (SIGCONT, sigcont_handler);
+#endif
+    signal (SIGINT, sigint_handler);
 
     // Create a scope for driver so that the driver object will destroy itself
     // before SBDebugger::Terminate() is called.