Title: [147608] branches/dfgFourthTier
- Revision
- 147608
- Author
- [email protected]
- Date
- 2013-04-03 22:09:00 -0700 (Wed, 03 Apr 2013)
Log Message
fourthTier: Include LLVM headers with surrounding #pragmas instead of using my #define
https://bugs.webkit.org/show_bug.cgi?id=113921
Source/_javascript_Core:
Reviewed by Oliver Hunt.
The LLVM community wants us to continue including all of LLVM's C++ headers. Change
to using #pragma's to disable warnings that they cannot handle.
* ftl/FTLLLVMHeaders.h:
Tools:
Reviewed by Oliver Hunt.
The LLVM community wants us to continue including all of LLVM's C++ headers. Change
the export script to do this.
* Scripts/export-llvm-build:
Modified Paths
Diff
Modified: branches/dfgFourthTier/Source/_javascript_Core/ChangeLog (147607 => 147608)
--- branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-04-04 03:52:37 UTC (rev 147607)
+++ branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-04-04 05:09:00 UTC (rev 147608)
@@ -1,5 +1,17 @@
2013-04-03 Filip Pizlo <[email protected]>
+ fourthTier: Include LLVM headers with surrounding #pragmas instead of using my #define
+ https://bugs.webkit.org/show_bug.cgi?id=113921
+
+ Reviewed by Oliver Hunt.
+
+ The LLVM community wants us to continue including all of LLVM's C++ headers. Change
+ to using #pragma's to disable warnings that they cannot handle.
+
+ * ftl/FTLLLVMHeaders.h:
+
+2013-04-03 Filip Pizlo <[email protected]>
+
fourthTier: Everyone should know about the FTL
https://bugs.webkit.org/show_bug.cgi?id=113897
Modified: branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLLVMHeaders.h (147607 => 147608)
--- branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLLVMHeaders.h 2013-04-04 03:52:37 UTC (rev 147607)
+++ branches/dfgFourthTier/Source/_javascript_Core/ftl/FTLLLVMHeaders.h 2013-04-04 05:09:00 UTC (rev 147608)
@@ -30,16 +30,30 @@
#if ENABLE(FTL_JIT)
+// It is necessary to include LLVM headers via this file, because:
+// - LLVM requires defining things that we don't normally define, and
+// - LLVM includes its C++ headers from its C headers, and its C++
+// headers don't compile cleanly with our warnings.
+
#define __STDC_LIMIT_MACROS
#define __STDC_CONSTANT_MACROS
-#define LLVM_DO_NOT_INCLUDE_CPP_HEADERS
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-noreturn"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
+
#include <llvm-c/Analysis.h>
#include <llvm-c/ExecutionEngine.h>
#include <llvm-c/Core.h>
#include <llvm-c/Target.h>
#include <llvm-c/Transforms/Scalar.h>
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
#endif // ENABLE(FTL_JIT)
#endif // FTLLLVMHeaders_h
Modified: branches/dfgFourthTier/Tools/ChangeLog (147607 => 147608)
--- branches/dfgFourthTier/Tools/ChangeLog 2013-04-04 03:52:37 UTC (rev 147607)
+++ branches/dfgFourthTier/Tools/ChangeLog 2013-04-04 05:09:00 UTC (rev 147608)
@@ -1,3 +1,15 @@
+2013-04-03 Filip Pizlo <[email protected]>
+
+ fourthTier: Include LLVM headers with surrounding #pragmas instead of using my #define
+ https://bugs.webkit.org/show_bug.cgi?id=113921
+
+ Reviewed by Oliver Hunt.
+
+ The LLVM community wants us to continue including all of LLVM's C++ headers. Change
+ the export script to do this.
+
+ * Scripts/export-llvm-build:
+
2013-03-29 Filip Pizlo <[email protected]>
fourthTier: Check in a known-good build of LLVM into WebKitLibraries, and have a story for updating it
Modified: branches/dfgFourthTier/Tools/Scripts/export-llvm-build (147607 => 147608)
--- branches/dfgFourthTier/Tools/Scripts/export-llvm-build 2013-04-04 03:52:37 UTC (rev 147607)
+++ branches/dfgFourthTier/Tools/Scripts/export-llvm-build 2013-04-04 05:09:00 UTC (rev 147608)
@@ -85,16 +85,9 @@
| directory |
directory = Pathname.new(directory).realpath
Dir.chdir($llvmPath) {
- mysys("svn", "export", "include/llvm-c", directory + "llvm-c")
-
- Dir.mkdir(directory + "llvm")
- Dir.mkdir(directory + "llvm/Config")
- mysys("cp", "include/llvm/Config/llvm-config.h", directory + "llvm" + "Config")
-
- Dir.mkdir(directory + "llvm/Support")
- mysys("cp", "include/llvm/Support/DataTypes.h", directory + "llvm" + "Support")
+ mysys("svn", "export", "include", directory + "include")
}
- Dir.chdir(directory) {
+ Dir.chdir(directory + "include") {
mysys("tar", "-cyvf", $currentPath + $includePackage, ".")
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
