Changeset c463e0a in OpenModelica

Timestamp:

2016-04-04T16:58:32+02:00 (8 years ago)

Author:

Adrian Pop <adrian.pop@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

25e182c0

Parents:

45d32fb

Message:

adapt to msys2 mingw32/mingw64 - ticket:2578

• adapt to msys2 mingw32/mingw64 - ticket:2578

• force qt4 build only on Linux

Files:

• OMEdit/OMEditGUI/CrashReport/backtrace.c (modified) (5 diffs)
• OMEdit/OMEditGUI/Makefile.omdev.mingw (modified) (2 diffs)
• OMEdit/OMEditGUI/OMEditGUI.pro (modified) (1 diff)
• OMEdit/OMEditGUI/Options/OptionsDialog.cpp (modified) (1 diff)
• OMEdit/OMEditGUI/Simulation/SimulationProcessThread.cpp (modified) (1 diff)
• qjson/CMakeLists.txt (modified) (1 diff)

OMEdit/OMEditGUI/CrashReport/backtrace.c

@@ -163 +163 @@
 }
 
+#if defined(__MINGW32__) && !defined(__MINGW64__) /* on 32 bit */
+#define REG_BP Ebp /* frame pointer */
+#define REG_IP Eip /* program counter */
+#define REG_SP Esp /* stack pointer */
+#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_I386
+#elif defined(__MINGW32__) && defined(__MINGW64__) /* on 64 bit */
+#define REG_BP Rbp /* frame pointer */
+#define REG_IP Rip /* program counter */
+#define REG_SP Rsp /* stack pointer */
+#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_AMD64
+#endif
+
 void
 _backtrace(struct output_buffer *ob, struct bfd_set *set, int depth , LPCONTEXT context)
@@ -173 +185 @@
   STACKFRAME frame;
   memset(&frame,0,sizeof(frame));
-#if defined(__MINGW32__) && (GCC_VERSION > 40900)
-  /* adrpo: this doesn't seem to be working for MinGW GCC 4.9.2 */
-#else
-  frame.AddrPC.Offset = context->Eip;
+
+  frame.AddrPC.Offset = context->REG_IP;     /* program counter */
   frame.AddrPC.Mode = AddrModeFlat;
-  frame.AddrStack.Offset = context->Esp;
+  frame.AddrStack.Offset = context->REG_SP;  /* stack pointer */
   frame.AddrStack.Mode = AddrModeFlat;
-  frame.AddrFrame.Offset = context->Ebp;
+  frame.AddrFrame.Offset = context->REG_BP;  /* frame pointer */
   frame.AddrFrame.Mode = AddrModeFlat;
-#endif
+
   HANDLE process = GetCurrentProcess();
   HANDLE thread = GetCurrentThread();
@@ -189 +199 @@
   char module_name_raw[MAX_PATH];
 
-  while(StackWalk(IMAGE_FILE_MACHINE_I386,
+  while(StackWalk(IMAGE_FILE_MACHINE_NATIVE,
                   process,
                   thread,
@@ -206 +216 @@
     symbol->MaxNameLength = 254;
 
-    DWORD module_base = SymGetModuleBase(process, frame.AddrPC.Offset);
+    HINSTANCE module_base = (HINSTANCE)SymGetModuleBase(process, frame.AddrPC.Offset);
 
     const char * module_name = "[unknown module]";
     if (module_base &&
-        GetModuleFileNameA((HINSTANCE)module_base, module_name_raw, MAX_PATH)) {
+        GetModuleFileNameA(module_base, module_name_raw, (DWORD)MAX_PATH)) {
       module_name = module_name_raw;
       bc = get_bc(ob, set, module_name);
@@ -224 +234 @@
 
     if (file == NULL) {
-      DWORD dummy = 0;
-      if (SymGetSymFromAddr(process, frame.AddrPC.Offset, &dummy, symbol)) {
+      if (SymGetSymFromAddr(process, frame.AddrPC.Offset, NULL, symbol)) {
         file = symbol->Name;
       }

OMEdit/OMEditGUI/Makefile.omdev.mingw

@@ -19 +19 @@
   cp -p $(resourcedir)/*.qm $(builddir_share)/omedit/nls/
   cp -p ../bin/$(NAME)$(EXE) $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/libgcc_s_dw2-1.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/mingwm10.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/mingw/bin/libintl-8.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/mingw/bin/libiconv-2.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/QtCore4.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/QtGui4.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/QtNetwork4.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/QtSvg4.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/QtWebKit4.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/QtXml4.dll $(builddir_bin)
-  cp -puf $(OMDEV)/tools/OMTools/dll/QtXmlPatterns4.dll $(builddir_bin)
-  mkdir -p $(builddir_bin)/iconengines/
-  cp -puf $(OMDEV)/tools/OMTools/dll/qsvgicon4.dll $(builddir_bin)/iconengines/
 
 Resources/nls/qm.stamp: OMEditGUI.pro Resources/nls/*.ts
@@ -47 +34 @@
 parsergen:
   $(MAKE) -C Debugger/Parser -f Makefile.lib.omdev.mingw
-  
+
 build: version $(NAME)
   $(MAKE) -f Makefile

OMEdit/OMEditGUI/OMEditGUI.pro

@@ -66 +66 @@
     QMAKE_LFLAGS_RELEASE =
     # required for backtrace
-    LIBS += -L$$(OMDEV)/tools/mingw/bin -limagehlp -lbfd -lintl -liberty
+    # win32 vs. win64
+    UNAME = $$system(uname)
+    isEmpty(UNAME): UNAME = MINGW32
+    ISMINGW32 = $$find(UNAME, MINGW32)
+    message(uname: $$UNAME)
+    count( ISMINGW32, 1 ) {
+    LIBS += -L$$(OMDEV)/tools/msys/mingw32/bin -L$$(OMDEV)/tools/msys/mingw32/lib -L$$(OMDEV)/tools/msys/mingw32/lib/binutils -limagehlp -lbfd -lintl -liberty
+    } else {
+      LIBS += -L$$(OMDEV)/tools/msys/mingw64/bin -L$$(OMDEV)/tools/msys/mingw64/lib -L$$(OMDEV)/tools/msys/mingw64/lib/binutils -limagehlp -lbfd -lintl -liberty
+  }
   }
   LIBS += -L../OMEditGUI/Debugger/Parser -lGDBMIParser \

OMEdit/OMEditGUI/Options/OptionsDialog.cpp

@@ -3536 +3536 @@
   mpGDBPathLabel = new Label(tr("GDB Path:"));
 #ifdef WIN32
+#if defined(__MINGW32__) && !defined(__MINGW64__)
+  const char *sgdb = "/tools/msys/mingw32/bin/gdb.exe";
+#endif
+#if defined(__MINGW64__)
+  const char *sgdb = "/tools/msys/mingw64/bin/gdb.exe";
+#endif
   const char *OMDEV = getenv("OMDEV");
   if (QString(OMDEV).isEmpty()) {
-    mpGDBPathTextBox = new QLineEdit(QString(Helper::OpenModelicaHome).append("/MinGW/bin/gdb.exe"));
+    mpGDBPathTextBox = new QLineEdit(QString(Helper::OpenModelicaHome).append(sgdb));
   } else {
     QString qOMDEV = QString(OMDEV).replace("\\", "/");
-    mpGDBPathTextBox = new QLineEdit(QString(qOMDEV).append("/tools/mingw/bin/gdb.exe"));
+    mpGDBPathTextBox = new QLineEdit(QString(qOMDEV).append(sgdb));
   }
 #else

OMEdit/OMEditGUI/Simulation/SimulationProcessThread.cpp

@@ -77 +77 @@
   QStringList args;
 #ifdef WIN32
-  args << simulationOptions.getOutputFileName() << pSimulationPage->getTargetCompilerComboBox()->currentText() << "parallel" << numProcs << "0";
+#if defined(__MINGW32__) && defined(__MINGW64__) /* on 64 bit */
+  const char* omPlatform = "mingw64";
+#else
+  const char* omPlatform = "mingw32";
+#endif
+  args << simulationOptions.getOutputFileName() << pSimulationPage->getTargetCompilerComboBox()->currentText() << omPlatform << "parallel" << numProcs << "0";
   QString compilationProcessPath = QString(Helper::OpenModelicaHome) + "/share/omc/scripts/Compile.bat";
   mpCompilationProcess->start(compilationProcessPath, args);

qjson/CMakeLists.txt

@@ -42 +42 @@
 
 option(QT4_BUILD "Force building with Qt4 even if Qt5 is found")
+IF (WIN32)
+# set(QT4_BUILD ON)
+ELSE(WIN32)
 set(QT4_BUILD ON)
+ENDIF(WIN32)
 
 IF (NOT QT4_BUILD)