From d0673231d451d2265dcae229b17e67eb35a288ff Mon Sep 17 00:00:00 2001
From: Andrey Guskov <andrey.y.guskov@intel.com>
Date: Wed, 21 Jan 2015 18:52:00 +0300
Subject: [PATCH] Suppressed unneeded bitcode export warnings

---
 builtins.cpp | 27 ++++++++++++++++++++-------
 builtins.h   |  3 ++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/builtins.cpp b/builtins.cpp
index aa7b86d0..97b07fa9 100644
--- a/builtins.cpp
+++ b/builtins.cpp
@@ -782,7 +782,7 @@ lSetInternalFunctions(llvm::Module *module) {
  */
 void
 AddBitcodeToModule(const unsigned char *bitcode, int length,
-                   llvm::Module *module, SymbolTable *symbolTable) {
+                   llvm::Module *module, SymbolTable *symbolTable, bool warn) {
     llvm::StringRef sb = llvm::StringRef((char *)bitcode, length);
 #if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5)
     llvm::MemoryBuffer *bcBuf = llvm::MemoryBuffer::getMemBuffer(sb);
@@ -852,7 +852,8 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
             // DataLayout or library DataLayout to be empty.
 #if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+
             if (!VerifyDataLayoutCompatibility(module->getDataLayoutStr(),
-                                               bcModule->getDataLayoutStr())) {
+                                               bcModule->getDataLayoutStr())
+                && warn) {
               Warning(SourcePos(), "Module DataLayout is incompatible with "
                       "library DataLayout:\n"
                       "Module  DL: %s\n"
@@ -862,7 +863,8 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
             }
 #else
             if (!VerifyDataLayoutCompatibility(module->getDataLayout(),
-                                               bcModule->getDataLayout())) {
+                                               bcModule->getDataLayout())
+                && warn) {
               Warning(SourcePos(), "Module DataLayout is incompatible with "
                       "library DataLayout:\n"
                       "Module  DL: %s\n"
@@ -1026,19 +1028,30 @@ void
 DefineStdlib(SymbolTable *symbolTable, llvm::LLVMContext *ctx, llvm::Module *module,
              bool includeStdlibISPC) {
     bool runtime32 = g->target->is32Bit();
+    bool warn = g->target->getISA() != Target::GENERIC;
+
+#define EXPORT_MODULE_COND_WARN(export_module, warnings)        \
+    extern unsigned char export_module[];                       \
+    extern int export_module##_length;                          \
+    AddBitcodeToModule(export_module, export_module##_length,   \
+                       module, symbolTable, warnings);
 
 #define EXPORT_MODULE(export_module)                            \
     extern unsigned char export_module[];                       \
     extern int export_module##_length;                          \
     AddBitcodeToModule(export_module, export_module##_length,   \
-                       module, symbolTable);
+                       module, symbolTable, true);
 
-    // Add the definitions from the compiled builtins-c.c file
+    // Add the definitions from the compiled builtins.c file.
+    // When compiling for "generic" target family, data layout warnings for
+    // "builtins_bitcode_c" have to be switched off: its DL is incompatible
+    // with the DL of "generic". Anyway, AddBitcodeToModule() corrects this
+    // automatically if DLs differ (by copying module`s DL to export`s DL).
     if (runtime32) {
-        EXPORT_MODULE(builtins_bitcode_c_32);
+        EXPORT_MODULE_COND_WARN(builtins_bitcode_c_32, warn);
     }
     else {
-        EXPORT_MODULE(builtins_bitcode_c_64);
+        EXPORT_MODULE_COND_WARN(builtins_bitcode_c_64, warn);
     }
 
     // Next, add the target's custom implementations of the various needed
diff --git a/builtins.h b/builtins.h
index 28f58430..16fddb2c 100644
--- a/builtins.h
+++ b/builtins.h
@@ -56,6 +56,7 @@ void DefineStdlib(SymbolTable *symbolTable, llvm::LLVMContext *ctx, llvm::Module
                   bool includeStdlib);
 
 void AddBitcodeToModule(const unsigned char *bitcode, int length,
-                        llvm::Module *module, SymbolTable *symbolTable = NULL);
+                        llvm::Module *module, SymbolTable *symbolTable = NULL,
+                        bool warn = true);
 
 #endif // ISPC_STDLIB_H