<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hi Kamil,<div class=""><br class=""></div><div class="">I think this commit breaks the modules build.</div><div class=""><br class=""></div><div class="">I’m getting:</div><div class=""><br class=""></div><div class=""><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">FAILED: lib/Support/CMakeFiles/LLVMSupport.dir/ARMBuildAttrs.cpp.o </span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -DGTEST_HAS_RTTI=0 -DLLVM_BUILD_GLOBAL_ISEL -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -Ilib/Support -I/Users/vk/src/<a href="http://llvm.org" class="">llvm.org</a>-master/llvm/lib/Support -Iinclude -I/Users/vk/src/<a href="http://llvm.org" class="">llvm.org</a>-master/llvm/include -fPIC -fvisibility-inlines-hidden -Werror=date-time -std=c++11 -fmodules -fmodules-cache-path=/Volumes/Builds/<a href="http://llvm.org" class="">llvm.org</a>-master-R/module.cache -fcxx-modules -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wstring-conversion -fcolor-diagnostics -O3 -DNDEBUG -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -fno-exceptions -fno-rtti -MD -MT lib/Support/CMakeFiles/LLVMSupport.dir/ARMBuildAttrs.cpp.o -MF lib/Support/CMakeFiles/LLVMSupport.dir/ARMBuildAttrs.cpp.o.d -o lib/Support/CMakeFiles/LLVMSupport.dir/ARMBuildAttrs.cpp.o -c /Users/vk/src/<a href="http://llvm.org" class="">llvm.org</a>-master/llvm/lib/Support/ARMBuildAttrs.cpp</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">While building module 'LLVM_Utils' imported from /Users/vk/src/<a href="http://llvm.org" class="">llvm.org</a>-master/llvm/lib/Support/ARMBuildAttrs.cpp:10:</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">In file included from <module-includes>:176:</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(255, 255, 255); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">/Users/vk/src/<a href="http://llvm.org" class="">llvm.org</a>-master/llvm/include/llvm/Support/Solaris/sys/regset.h:17:2: </span><span style="font-variant-ligatures: no-common-ligatures; color: #d53bd3" class="">warning: </span><span style="font-variant-ligatures: no-common-ligatures" class="">#include_next is a language extension [-Wgnu-include-next]</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">#include_next <sys/regset.h></span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(52, 188, 38); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> ^</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(255, 255, 255); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">/Users/vk/src/<a href="http://llvm.org" class="">llvm.org</a>-master/llvm/include/llvm/Support/Solaris/sys/regset.h:17:15: </span><span style="font-variant-ligatures: no-common-ligatures; color: #c33720" class="">fatal error: </span><span style="font-variant-ligatures: no-common-ligatures" class="">'sys/regset.h' file not found</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">#include_next <sys/regset.h></span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(52, 188, 38); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> ^~~~~~~~~~~~~~</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(255, 255, 255); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">/Users/vk/src/<a href="http://llvm.org" class="">llvm.org</a>-master/llvm/lib/Support/ARMBuildAttrs.cpp:10:10: </span><span style="font-variant-ligatures: no-common-ligatures; color: #c33720" class="">fatal error: </span><span style="font-variant-ligatures: no-common-ligatures" class="">could not build module 'LLVM_Utils'</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">#include "llvm/ADT/StringRef.h"</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(52, 188, 38); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">1 warning and 2 errors generated.</span></div></div><div class=""><br class=""></div><div class="">Reproducer:</div><div class=""><br class=""></div><div class=""><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="text-decoration: underline ; font-variant-ligatures: no-common-ligatures" class="">$ cmake</span><span style="font-variant-ligatures: no-common-ligatures" class=""> -G Ninja \</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> -DCMAKE_BUILD_TYPE:STRING=Release \</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> -DLLVM_ENABLE_ASSERTIONS:BOOL=Off \</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> -DLLVM_INCLUDE_TESTS:BOOL=On \</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> -DLLVM_ENABLE_MODULES=On \</span></div><div style="margin: 0px; font-size: 13px; line-height: normal; font-family: Monaco; color: rgb(244, 244, 244); background-color: rgb(0, 0, 0);" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> ~/src/<a href="http://llvm.org" class="">llvm.org</a>-master/llvm</span></div></div><div class=""><br class=""></div><div class="">vedant</div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Jun 22, 2017, at 6:18 AM, Kamil Rytarowski via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Author: kamil<br class="">Date: Thu Jun 22 08:18:46 2017<br class="">New Revision: 306002<br class=""><br class="">URL: <a href="http://llvm.org/viewvc/llvm-project?rev=306002&view=rev" class="">http://llvm.org/viewvc/llvm-project?rev=306002&view=rev</a><br class="">Log:<br class="">[Solaris] replace Solaris.h hack with a set of better hacks<br class=""><br class="">Summary:<br class="">Got rid of unwieldy -include Solaris.h portability solution, replacing it with interposed header and moving endian defines into Host.h.<br class=""><br class="">Fixes PR28370.<br class=""><br class="">Reviewers: joerg, alekseyshl, mgorny<br class=""><br class="">Reviewed By: joerg<br class=""><br class="">Subscribers: llvm-commits, mgorny, ro, krytarowski<br class=""><br class="">Patch by Fedor Sergeev.<br class=""><br class="">Differential Revision: <a href="https://reviews.llvm.org/D3413" class="">https://reviews.llvm.org/D3413</a><br class=""><br class="">Added:<br class=""> llvm/trunk/include/llvm/Support/Solaris/<br class=""> llvm/trunk/include/llvm/Support/Solaris/sys/<br class=""> llvm/trunk/include/llvm/Support/Solaris/sys/regset.h<br class=""> - copied, changed from r306001, llvm/trunk/include/llvm/Support/Solaris.h<br class="">Removed:<br class=""> llvm/trunk/include/llvm/Support/Solaris.h<br class="">Modified:<br class=""> llvm/trunk/CMakeLists.txt<br class=""> llvm/trunk/include/llvm/Support/Host.h<br class=""> llvm/trunk/include/llvm/module.modulemap<br class=""><br class="">Modified: llvm/trunk/CMakeLists.txt<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=306002&r1=306001&r2=306002&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=306002&r1=306001&r2=306002&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/CMakeLists.txt (original)<br class="">+++ llvm/trunk/CMakeLists.txt Thu Jun 22 08:18:46 2017<br class="">@@ -804,7 +804,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBS<br class=""> endif(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")<br class=""><br class=""> if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )<br class="">- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include llvm/Support/Solaris.h")<br class="">+ # special hack for Solaris to handle crazy system sys/regset.h<br class="">+ include_directories("${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/Solaris")<br class=""> endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS )<br class=""><br class=""> # Make sure we don't get -rdynamic in every binary. For those that need it,<br class=""><br class="">Modified: llvm/trunk/include/llvm/Support/Host.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Host.h?rev=306002&r1=306001&r2=306002&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Host.h?rev=306002&r1=306001&r2=306002&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/Support/Host.h (original)<br class="">+++ llvm/trunk/include/llvm/Support/Host.h Thu Jun 22 08:18:46 2017<br class="">@@ -21,6 +21,16 @@<br class=""> #include <endian.h><br class=""> #elif defined(_AIX)<br class=""> #include <sys/machine.h><br class="">+#elif defined(__sun)<br class="">+/* Solaris provides _BIG_ENDIAN/_LITTLE_ENDIAN selector in sys/types.h */<br class="">+#include <sys/types.h><br class="">+#define BIG_ENDIAN 4321<br class="">+#define LITTLE_ENDIAN 1234<br class="">+#if defined(_BIG_ENDIAN)<br class="">+#define BYTE_ORDER BIG_ENDIAN<br class="">+#else<br class="">+#define BYTE_ORDER LITTLE_ENDIAN<br class="">+#endif<br class=""> #else<br class=""> #if !defined(BYTE_ORDER) && !defined(LLVM_ON_WIN32)<br class=""> #include <machine/endian.h><br class=""><br class="">Removed: llvm/trunk/include/llvm/Support/Solaris.h<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Solaris.h?rev=306001&view=auto" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Solaris.h?rev=306001&view=auto</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/Support/Solaris.h (original)<br class="">+++ llvm/trunk/include/llvm/Support/Solaris.h (removed)<br class="">@@ -1,49 +0,0 @@<br class="">-/*===- llvm/Support/Solaris.h ------------------------------------*- C++ -*-===*<br class="">- *<br class="">- * The LLVM Compiler Infrastructure<br class="">- *<br class="">- * This file is distributed under the University of Illinois Open Source<br class="">- * License. See LICENSE.TXT for details.<br class="">- *<br class="">- *===----------------------------------------------------------------------===*<br class="">- *<br class="">- * This file contains portability fixes for Solaris hosts.<br class="">- *<br class="">- *===----------------------------------------------------------------------===*/<br class="">-<br class="">-#ifndef LLVM_SUPPORT_SOLARIS_H<br class="">-#define LLVM_SUPPORT_SOLARIS_H<br class="">-<br class="">-#include <sys/regset.h><br class="">-#include <sys/types.h><br class="">-<br class="">-/* Solaris doesn't have endian.h. SPARC is the only supported big-endian ISA. */<br class="">-#define BIG_ENDIAN 4321<br class="">-#define LITTLE_ENDIAN 1234<br class="">-#if defined(__sparc) || defined(__sparc__)<br class="">-#define BYTE_ORDER BIG_ENDIAN<br class="">-#else<br class="">-#define BYTE_ORDER LITTLE_ENDIAN<br class="">-#endif<br class="">-<br class="">-#undef CS<br class="">-#undef DS<br class="">-#undef ES<br class="">-#undef FS<br class="">-#undef GS<br class="">-#undef SS<br class="">-#undef EAX<br class="">-#undef ECX<br class="">-#undef EDX<br class="">-#undef EBX<br class="">-#undef ESP<br class="">-#undef EBP<br class="">-#undef ESI<br class="">-#undef EDI<br class="">-#undef EIP<br class="">-#undef UESP<br class="">-#undef EFL<br class="">-#undef ERR<br class="">-#undef TRAPNO<br class="">-<br class="">-#endif<br class=""><br class="">Copied: llvm/trunk/include/llvm/Support/Solaris/sys/regset.h (from r306001, llvm/trunk/include/llvm/Support/Solaris.h)<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Solaris/sys/regset.h?p2=llvm/trunk/include/llvm/Support/Solaris/sys/regset.h&p1=llvm/trunk/include/llvm/Support/Solaris.h&r1=306001&r2=306002&rev=306002&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Solaris/sys/regset.h?p2=llvm/trunk/include/llvm/Support/Solaris/sys/regset.h&p1=llvm/trunk/include/llvm/Support/Solaris.h&r1=306001&r2=306002&rev=306002&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/Support/Solaris.h (original)<br class="">+++ llvm/trunk/include/llvm/Support/Solaris/sys/regset.h Thu Jun 22 08:18:46 2017<br class="">@@ -1,4 +1,4 @@<br class="">-/*===- llvm/Support/Solaris.h ------------------------------------*- C++ -*-===*<br class="">+/*===- llvm/Support/Solaris/sys/regset.h ------------------------*- C++ -*-===*<br class=""> *<br class=""> * The LLVM Compiler Infrastructure<br class=""> *<br class="">@@ -7,24 +7,14 @@<br class=""> *<br class=""> *===----------------------------------------------------------------------===*<br class=""> *<br class="">- * This file contains portability fixes for Solaris hosts.<br class="">+ * This file works around excessive name space pollution from the system header<br class="">+ * on Solaris hosts.<br class=""> *<br class=""> *===----------------------------------------------------------------------===*/<br class=""><br class="">-#ifndef LLVM_SUPPORT_SOLARIS_H<br class="">-#define LLVM_SUPPORT_SOLARIS_H<br class="">+#ifndef LLVM_SUPPORT_SOLARIS_SYS_REGSET_H<br class=""><br class="">-#include <sys/regset.h><br class="">-#include <sys/types.h><br class="">-<br class="">-/* Solaris doesn't have endian.h. SPARC is the only supported big-endian ISA. */<br class="">-#define BIG_ENDIAN 4321<br class="">-#define LITTLE_ENDIAN 1234<br class="">-#if defined(__sparc) || defined(__sparc__)<br class="">-#define BYTE_ORDER BIG_ENDIAN<br class="">-#else<br class="">-#define BYTE_ORDER LITTLE_ENDIAN<br class="">-#endif<br class="">+#include_next <sys/regset.h><br class=""><br class=""> #undef CS<br class=""> #undef DS<br class=""><br class="">Modified: llvm/trunk/include/llvm/module.modulemap<br class="">URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap?rev=306002&r1=306001&r2=306002&view=diff" class="">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap?rev=306002&r1=306001&r2=306002&view=diff</a><br class="">==============================================================================<br class="">--- llvm/trunk/include/llvm/module.modulemap (original)<br class="">+++ llvm/trunk/include/llvm/module.modulemap Thu Jun 22 08:18:46 2017<br class="">@@ -275,9 +275,6 @@ module LLVM_Utils {<br class=""> umbrella "Support"<br class=""> module * { export * }<br class=""><br class="">- // Exclude this; it's only included on Solaris.<br class="">- exclude header "Support/Solaris.h"<br class="">-<br class=""> // Exclude this; it's fundamentally non-modular.<br class=""> exclude header "Support/PluginLoader.h"<br class=""><br class=""><br class=""><br class="">_______________________________________________<br class="">llvm-commits mailing list<br class=""><a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits<br class=""></div></div></blockquote></div><br class=""></div></body></html>