Merge pull request #107 from dotnet-bot/from-tfs

Merge changes from TFS

Author: jkotas

CMakeLists.txt

@@ -241,6 +241,8 @@ add_compile_options(-Wno-self-assign)
 add_compile_options(-Wno-bitfield-constant-conversion)
 add_compile_options(-Wno-unused-value)
 
+add_compile_options(-Wno-unknown-warning-option)
+
 #These seem to indicate real issues
 add_compile_options(-Wno-invalid-offsetof)
 add_compile_options(-Wno-return-type)

src/CMakeLists.txt

@@ -14,8 +14,10 @@ if(WIN32)
 enable_language(ASM_MASM)
 else(WIN32)
 enable_language(ASM)
-# This prevents inclusion of standard compiler headers
-add_compile_options(-nostdinc -nostdinc++)
+# This prevents inclusion of standard C compiler headers
+add_compile_options(-nostdinc)
+# This prevents inclusion of standard C++ compiler headers
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++")
 endif(WIN32)
 
 add_subdirectory(utilcode)

src/debug/daccess/daccess.cpp

@@ -4907,7 +4907,7 @@ ClrDataAccess::SetCodeNotifications(
     /* [in, size_is(numTokens)] */ ULONG32 flags[],
     /* [in] */ ULONG32 singleFlags)
 {
-    HRESULT status;
+    HRESULT status = E_UNEXPECTED;
 
     DAC_ENTER();
 

src/inc/ex.h

@@ -977,7 +977,7 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
                 CAutoTryCleanup<STATETYPE> __autoCleanupTry(__state);                   \
                 /* prevent annotations from being dropped by optimizations in debug */  \
                 INDEBUG(static bool __alwayszero;)                                      \
-                INDEBUG(if(!VolatileLoad(&__alwayszero)))                               \
+                INDEBUG(VolatileLoad(&__alwayszero);)                                   \
                 {                                                                       \
                     /* this is necessary for Rotor exception handling to work */        \
                     DEBUG_ASSURE_NO_RETURN_BEGIN(EX_TRY)                                \

src/pal/tests/CMakeLists.txt

@@ -10,5 +10,7 @@ add_definitions(-DPIC=1)
 add_definitions(-DBIT64=1)
 add_definitions(-D_WIN64=1)
 
+add_compile_options(-Wno-empty-body)
+
 add_subdirectory(palsuite)