Skip to content

Specify -z notext on linux-musl-x86 and riscv64 #83682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 5 commits into from
Apr 25, 2023
Merged

Specify -z notext on linux-musl-x86 and riscv64 #83682

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65877a9
Specify -z notext on linux-musl-x86
am11 Mar 20, 2023
737f37e
Merge branch 'main' into feature/build/linux-musl-x86
am11 Apr 24, 2023
465f01e
Fix riscv64 build with clang/lld v15+
am11 Apr 24, 2023
cde6b8f
Inline visibility attribute
am11 Apr 24, 2023
e71b1f5
Fix gcc build
am11 Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if(CLR_CMAKE_HOST_UNIX)
endif()
endif()

if(CLR_CMAKE_TARGET_LINUX AND CLR_CMAKE_TARGET_ARCH_I386)
if(CLR_CMAKE_TARGET_LINUX AND (CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_RISCV64))
add_linker_flag(-Wl,-z,notext)
endif()

Expand Down
1 change: 1 addition & 0 deletions src/coreclr/jit/instr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,6 +1487,7 @@ instruction CodeGen::ins_Move_Extend(var_types srcType, bool srcInReg)
return INS_vmov;
#else
NYI("ins_Move_Extend");
return INS_invalid;
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/exceptionhandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5857,7 +5857,7 @@ struct _Unwind_Exception;
// This is a personality routine for TheUMEntryPrestub and UMThunkStub Unix asm stubs.
// An exception propagating through these stubs is an unhandled exception.
// This function dumps managed stack trace and terminates the current process.
EXTERN_C _Unwind_Reason_Code
DLLEXPORT EXTERN_C _Unwind_Reason_Code
UnhandledExceptionHandlerUnix(
IN int version,
IN _Unwind_Action action,
Expand Down