From d5ef2f915c1490e570a7c394ddbaeb896d8a1469 Mon Sep 17 00:00:00 2001 From: Adeel Date: Mon, 20 Apr 2020 17:55:16 +0000 Subject: [PATCH] Address PR feedback --- src/coreclr/src/debug/daccess/CMakeLists.txt | 2 +- src/coreclr/src/dlls/dbgshim/CMakeLists.txt | 2 +- src/coreclr/src/dlls/mscordac/CMakeLists.txt | 8 ++++---- src/coreclr/src/dlls/mscordbi/CMakeLists.txt | 2 +- .../src/dlls/mscoree/coreclr/CMakeLists.txt | 4 ++-- src/coreclr/src/ilasm/CMakeLists.txt | 2 +- src/coreclr/src/ildasm/exe/CMakeLists.txt | 2 +- src/coreclr/src/jit/CMakeLists.txt | 2 +- src/coreclr/src/pal/src/CMakeLists.txt | 4 ++-- src/coreclr/src/pal/src/exception/seh.cpp | 4 ---- src/coreclr/src/pal/src/include/pal/context.h | 4 ++-- src/coreclr/src/pal/src/thread/context.cpp | 16 ++++++++++------ .../pal_sxs/test1/CMakeLists.txt | 6 +++--- src/coreclr/src/tools/crossgen/CMakeLists.txt | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/coreclr/src/debug/daccess/CMakeLists.txt b/src/coreclr/src/debug/daccess/CMakeLists.txt index 88742fb4edd..6d18ad64fde 100644 --- a/src/coreclr/src/debug/daccess/CMakeLists.txt +++ b/src/coreclr/src/debug/daccess/CMakeLists.txt @@ -63,4 +63,4 @@ if(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_ ) add_dependencies(daccess dactablerva_header) -endif() +endif(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS) diff --git a/src/coreclr/src/dlls/dbgshim/CMakeLists.txt b/src/coreclr/src/dlls/dbgshim/CMakeLists.txt index 22bc4577206..8f3ef4a3330 100644 --- a/src/coreclr/src/dlls/dbgshim/CMakeLists.txt +++ b/src/coreclr/src/dlls/dbgshim/CMakeLists.txt @@ -43,7 +43,7 @@ endif(CLR_CMAKE_HOST_OSX) if(CLR_CMAKE_HOST_SUNOS) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-M,${EXPORTS_FILE}) -endif() +endif(CLR_CMAKE_HOST_SUNOS) add_library_clr(dbgshim SHARED ${DBGSHIM_SOURCES}) diff --git a/src/coreclr/src/dlls/mscordac/CMakeLists.txt b/src/coreclr/src/dlls/mscordac/CMakeLists.txt index 60c2ee41530..40ddab33301 100644 --- a/src/coreclr/src/dlls/mscordac/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscordac/CMakeLists.txt @@ -33,7 +33,7 @@ else(CLR_CMAKE_HOST_WIN32) if(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS) generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE}) - endif() + endif(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS) if(CLR_CMAKE_HOST_LINUX) @@ -89,17 +89,17 @@ if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE}) -endif() +endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) if(CLR_CMAKE_HOST_OSX) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-exported_symbols_list,${EXPORTS_FILE}) -endif() +endif(CLR_CMAKE_HOST_OSX) if(CLR_CMAKE_HOST_SUNOS) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-M,${EXPORTS_FILE}) -endif() +endif(CLR_CMAKE_HOST_SUNOS) # Create object library to enable creation of proper dependency of mscordaccore.exp on mscordac.obj and # mscordaccore on both the mscordaccore.exp and mscordac.obj. diff --git a/src/coreclr/src/dlls/mscordbi/CMakeLists.txt b/src/coreclr/src/dlls/mscordbi/CMakeLists.txt index ccd71027888..9d0a4e7596c 100644 --- a/src/coreclr/src/dlls/mscordbi/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscordbi/CMakeLists.txt @@ -58,7 +58,7 @@ endif(CLR_CMAKE_HOST_OSX) if(CLR_CMAKE_HOST_SUNOS) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-M,${EXPORTS_FILE}) -endif() +endif(CLR_CMAKE_HOST_SUNOS) add_library_clr(mscordbi SHARED ${MSCORDBI_SOURCES}) target_precompile_header(TARGET mscordbi HEADER stdafx.h) diff --git a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt index 44e61280fee..b25aa7eb7a0 100644 --- a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -59,12 +59,12 @@ else(CLR_CMAKE_HOST_WIN32) if(CLR_CMAKE_TARGET_ANDROID AND CLR_CMAKE_HOST_ARCH_ARM) set(EXPORTS_LINKER_OPTION "${EXPORTS_LINKER_OPTION} -Wl,--no-warn-shared-textrel") - endif() + endif(CLR_CMAKE_TARGET_ANDROID AND CLR_CMAKE_HOST_ARCH_ARM) if(CLR_CMAKE_HOST_SUNOS) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-M,${EXPORTS_FILE}) - endif() + endif(CLR_CMAKE_HOST_SUNOS) endif (CLR_CMAKE_HOST_WIN32) diff --git a/src/coreclr/src/ilasm/CMakeLists.txt b/src/coreclr/src/ilasm/CMakeLists.txt index 2f44dbd861b..94fe6b83d3a 100644 --- a/src/coreclr/src/ilasm/CMakeLists.txt +++ b/src/coreclr/src/ilasm/CMakeLists.txt @@ -61,7 +61,7 @@ if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CL # ensure proper resolving of circular references between a subset of the libraries. set(START_LIBRARY_GROUP -Wl,--start-group) set(END_LIBRARY_GROUP -Wl,--end-group) -endif() +endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS) _add_executable(ilasm ${ILASM_SOURCES} diff --git a/src/coreclr/src/ildasm/exe/CMakeLists.txt b/src/coreclr/src/ildasm/exe/CMakeLists.txt index 57499c4d86f..87a0fa01f82 100644 --- a/src/coreclr/src/ildasm/exe/CMakeLists.txt +++ b/src/coreclr/src/ildasm/exe/CMakeLists.txt @@ -56,7 +56,7 @@ if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CL # ensure proper resolving of circular references between a subset of the libraries. set(START_LIBRARY_GROUP -Wl,--start-group) set(END_LIBRARY_GROUP -Wl,--end-group) -endif() +endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS) _add_executable(ildasm ${ILDASM_SOURCES} diff --git a/src/coreclr/src/jit/CMakeLists.txt b/src/coreclr/src/jit/CMakeLists.txt index 5093ce9a016..582d11d6d40 100644 --- a/src/coreclr/src/jit/CMakeLists.txt +++ b/src/coreclr/src/jit/CMakeLists.txt @@ -322,7 +322,7 @@ else() elseif(CLR_CMAKE_HOST_SUNOS) # Add linker exports file option set(JIT_EXPORTS_LINKER_OPTION -Wl,-M,${JIT_EXPORTS_FILE}) - endif() + endif(CLR_CMAKE_HOST_SUNOS) set(SHARED_LIB_SOURCES ${SOURCES}) endif() diff --git a/src/coreclr/src/pal/src/CMakeLists.txt b/src/coreclr/src/pal/src/CMakeLists.txt index 253f36e2641..1a393638322 100644 --- a/src/coreclr/src/pal/src/CMakeLists.txt +++ b/src/coreclr/src/pal/src/CMakeLists.txt @@ -1,7 +1,7 @@ if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_FREEBSD) # On OSX and *BSD, we use the libunwind that's part of the OS set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 1) -endif() +endif(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_FREEBSD) if(NOT DEFINED ENV{ROOTFS_DIR}) include_directories(SYSTEM /usr/local/include) @@ -113,7 +113,7 @@ set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -Wl,--no if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") add_compile_options(-Wno-unused-result) -endif() +endif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") set(ARCH_SOURCES arch/${PAL_ARCH_SOURCES_DIR}/context2.S diff --git a/src/coreclr/src/pal/src/exception/seh.cpp b/src/coreclr/src/pal/src/exception/seh.cpp index 259b963a033..f194156509d 100644 --- a/src/coreclr/src/pal/src/exception/seh.cpp +++ b/src/coreclr/src/pal/src/exception/seh.cpp @@ -323,8 +323,6 @@ PAL_ERROR SEHEnable(CPalThread *pthrCurrent) #if HAVE_MACH_EXCEPTIONS return pthrCurrent->EnableMachExceptions(); #elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__sun) - // TODO: This needs to be implemented. Cannot put an ASSERT here - // because it will make other parts of PAL fail. return NO_ERROR; #else// HAVE_MACH_EXCEPTIONS #error not yet implemented @@ -349,8 +347,6 @@ PAL_ERROR SEHDisable(CPalThread *pthrCurrent) { #if HAVE_MACH_EXCEPTIONS return pthrCurrent->DisableMachExceptions(); - // TODO: This needs to be implemented. Cannot put an ASSERT here - // because it will make other parts of PAL fail. #elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__sun) return NO_ERROR; #else // HAVE_MACH_EXCEPTIONS diff --git a/src/coreclr/src/pal/src/include/pal/context.h b/src/coreclr/src/pal/src/include/pal/context.h index 74822ad20d1..9313fc51653 100644 --- a/src/coreclr/src/pal/src/include/pal/context.h +++ b/src/coreclr/src/pal/src/include/pal/context.h @@ -144,8 +144,8 @@ using asm_sigcontext::_xstate; #define FPREG_StatusWord(uc) (FPREG_Fpstate(uc)->sw) #define FPREG_MxCsr_Mask(uc) (FPREG_Fpstate(uc)->mxcsr_mask) -// on Solaris, fctw and __fx_rsvd are uint8_t, whereas on linux ftw is uint16_t, -// so we use split and join these two uint8_t members at callsites. +// on SunOS, fctw and __fx_rsvd are uint8_t, whereas on linux ftw is uint16_t, +// so we use split and join technique for these two uint8_t members at call sites. #define FPREG_TagWord1(uc) (FPREG_Fpstate(uc)->fctw) #define FPREG_TagWord2(uc) (FPREG_Fpstate(uc)->__fx_rsvd) #else diff --git a/src/coreclr/src/pal/src/thread/context.cpp b/src/coreclr/src/pal/src/thread/context.cpp index 746bf2d1bad..435b04715ed 100644 --- a/src/coreclr/src/pal/src/thread/context.cpp +++ b/src/coreclr/src/pal/src/thread/context.cpp @@ -430,19 +430,21 @@ void CONTEXTToNativeContext(CONST CONTEXT *lpContext, native_context_t *native) } #undef ASSIGN_REG -#if (HAVE_GREGSET_T || HAVE_GREGSET_T) && !HAVE_FPREGS_WITH_CW +#if !HAVE_FPREGS_WITH_CW +#if HAVE_GREGSET_T || HAVE_GREGSET_T #if HAVE_GREGSET_T if (native->uc_mcontext.fpregs == nullptr) #elif HAVE___GREGSET_T if (native->uc_mcontext.__fpregs == nullptr) -#endif +#endif // HAVE_GREGSET_T { // If the pointer to the floating point state in the native context // is not valid, we can't copy floating point registers regardless of // whether CONTEXT_FLOATING_POINT is set in the CONTEXT's flags. return; } -#endif +#endif // HAVE_GREGSET_T || HAVE_GREGSET_T +#endif // !HAVE_FPREGS_WITH_CW if ((lpContext->ContextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT) { @@ -544,12 +546,13 @@ void CONTEXTFromNativeContext(const native_context_t *native, LPCONTEXT lpContex } #undef ASSIGN_REG -#if (HAVE_GREGSET_T || HAVE___GREGSET_T) && !HAVE_FPREGS_WITH_CW +#if !HAVE_FPREGS_WITH_CW +#if HAVE_GREGSET_T || HAVE___GREGSET_T #if HAVE_GREGSET_T if (native->uc_mcontext.fpregs == nullptr) #elif HAVE___GREGSET_T if (native->uc_mcontext.__fpregs == nullptr) -#endif +#endif // HAVE_GREGSET_T { // Reset the CONTEXT_FLOATING_POINT bit(s) and the CONTEXT_XSTATE bit(s) so it's // clear that the floating point and extended state data in the CONTEXT is not @@ -566,7 +569,8 @@ void CONTEXTFromNativeContext(const native_context_t *native, LPCONTEXT lpContex // Bail out regardless of whether the caller wanted CONTEXT_FLOATING_POINT or CONTEXT_XSTATE return; } -#endif +#endif // HAVE_GREGSET_T || HAVE___GREGSET_T +#endif // !HAVE_FPREGS_WITH_CW if ((contextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT) { diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt index 293d3c43eb1..ff2588ce21a 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt @@ -20,16 +20,16 @@ generate_exports_file(${DEF_SOURCES1} ${EXPORTS_FILE1}) if(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD) set(EXPORTS_LINKER_OPTION1 -Wl,--version-script=${EXPORTS_FILE1}) -endif() +endif(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD) if(CLR_CMAKE_TARGET_OSX) set(EXPORTS_LINKER_OPTION1 -Wl,-exported_symbols_list,${EXPORTS_FILE1}) -endif() +endif(CLR_CMAKE_HOST_OSX) if(CLR_CMAKE_HOST_SUNOS) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-M,${EXPORTS_FILE}) -endif() +endif(CLR_CMAKE_HOST_SUNOS) set(DLL1SOURCES dlltest1.cpp) add_library(paltest_pal_sxs_test1_dll1 SHARED ${DLL1SOURCES}) diff --git a/src/coreclr/src/tools/crossgen/CMakeLists.txt b/src/coreclr/src/tools/crossgen/CMakeLists.txt index 2d6b94b5184..685ba73c11f 100644 --- a/src/coreclr/src/tools/crossgen/CMakeLists.txt +++ b/src/coreclr/src/tools/crossgen/CMakeLists.txt @@ -35,7 +35,7 @@ if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CL # ensure proper resolving of circular references between a subset of the libraries. set(START_LIBRARY_GROUP -Wl,--start-group) set(END_LIBRARY_GROUP -Wl,--end-group) -endif() +endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS) target_link_libraries(crossgen ${START_LIBRARY_GROUP} # Start group of libraries that have circular references -- 2.34.1