Merge pull request #2958 from jkotas/arm-fixes

Fix build breaks in Linux ARM build

4 files changed, 4 insertions, 15 deletions

diff --git a/src/inc/corhost.h b/src/inc/corhost.h
index 483580d47f..4a3a65a35f 100644
--- a/src/inc/corhost.h
+++ b/src/inc/corhost.h
@@ -45,12 +45,6 @@ class DangerousNonHostedSpinLock;
 
 #define INVALID_STACK_BASE_MARKER_FOR_CHECK_STATE 2
 
-#ifndef _WIN64
-#if (_WIN32_WINNT < 0x0500)
-typedef VOID (__stdcall *WAITORTIMERCALLBACK)(PVOID, BOOL);
-#endif
-#endif
-
 class AppDomain;
 class Assembly;
 
diff --git a/src/jit/lower.cpp b/src/jit/lower.cpp
index f7eadbaf4c..976d347516 100644
--- a/src/jit/lower.cpp
+++ b/src/jit/lower.cpp
@@ -146,9 +146,10 @@ genTreeOps getHiOper(genTreeOps oper)
     case GT_OR:  return GT_OR;      break;
     case GT_AND: return GT_AND;     break;
     case GT_XOR: return GT_XOR;     break;
+    default:
+        assert(!"getHiOper called for invalid oper");
+        return GT_NONE;
     }
-    assert(!"getHiOper called for invalid oper");
-    return GT_NONE;
 }
 #endif // !defined(_TARGET_64BIT_)
 
diff --git a/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp b/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp
index 667f62ecfd..b78cfa8dbe 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp
+++ b/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp
@@ -18,7 +18,7 @@ extern "C" int InitializeDllTest2();
 extern "C" int DllTest1();
 extern "C" int DllTest2();
 
-int __cdecl main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 #ifndef __FreeBSD__
     if (0 != InitializeDllTest1())
diff --git a/src/strongname/api/common.h b/src/strongname/api/common.h
index 4b5c4979b4..c83685cc0c 100644
--- a/src/strongname/api/common.h
+++ b/src/strongname/api/common.h
@@ -380,12 +380,6 @@ extern DummyGlobalContract ___contract;
 
 #endif // defined(_DEBUG)
 
-// For down level platform compiles.
-#if !defined(_WIN64) && (_WIN32_WINNT < 0x0500) 
-typedef VOID (__stdcall *WAITORTIMERCALLBACK)(PVOID, BOOL);
-#endif
-
-
 
 // All files get to see all of these .inl files to make sure all files
 // get the benefit of inlining.