Changeset 69912 in vbox

Timestamp:

Dec 3, 2017 7:08:13 PM (7 years ago)

Author:

vboxsync

Message:

VBoxCompilerPlugInGcc.cpp: Beat it into working with gcc 5.4 on ubuntu/WSL.

File:

• trunk/src/bldprogs/VBoxCompilerPlugInsGcc.cpp (modified) (3 diffs)

trunk/src/bldprogs/VBoxCompilerPlugInsGcc.cpp

@@ -39 +39 @@
 #include "tree.h"
 #include "tree-pass.h"
+#if __GNUC__ == 5 && __GNUC_MINOR__ == 4
+# include "tree-ssa-alias.h"
+# include "gimple-expr.h"
+#endif
 #include "gimple.h"
 #if RT_GNUC_PREREQ(4, 9)
@@ -368 +372 @@
         expanded_location   XLoc    = expand_location_to_spelling_point(hLoc);
         int                 cchLine = 0;
-# if RT_GNUC_PREREQ(5,0)
+# if RT_GNUC_PREREQ(6,0)
         const char         *pszLine = location_get_source_line(XLoc.file, XLoc.line, &cchLine);
+# elif RT_GNUC_PREREQ(5,0)
+        const char         *pszLine = location_get_source_line(XLoc, &cchLine);
 # else
         const char         *pszLine = location_get_source_line(XLoc);
@@ -698 +704 @@
                     else
                         error_at(gimple_location(hStmt),
-                                 "Call has only %d arguments; %s() format string is argument #%u (1-based), thus missing\n",
-                                 cCallArgs, DECL_NAME(hFnDecl) ? IDENTIFIER_POINTER(DECL_NAME(hFnDecl)) : "<unamed>",State.iFmt);
+                                 "Call has only %d arguments; %s() format string is argument #%lu (1-based), thus missing\n",
+                                 cCallArgs, DECL_NAME(hFnDecl) ? IDENTIFIER_POINTER(DECL_NAME(hFnDecl)) : "<unamed>", State.iFmt);
                 }
             }