mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-19 16:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stack-canaries] fixed stack canaries on arm linux

Browse Source
This commit is contained in:
A1029384756
2026-06-13 01:52:19 -04:00
parent 3598e351a4
commit 8bd95d4082
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/build_settings.cpp
View File

@@ -1952,18 +1952,9 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta
}
}
// note: there are some stack protection toolchain issues on arm
// platforms that will clash with PIC/PIE:
// `unresolvable R_AARCH64_ADR_PREL_PG_HI21 relocation against symbol`
if (metrics->os == TargetOs_linux &&
metrics->arch != TargetArch_arm32 &&
metrics->arch != TargetArch_arm64
) {
if (bc->stack_protector == StackProtector_Default) {
bc->stack_protector = StackProtector_Ssp;
}
} else if (metrics->os == TargetOs_windows ||
if (metrics->os == TargetOs_windows ||
metrics->os == TargetOs_darwin ||
metrics->os == TargetOs_linux ||
metrics->os == TargetOs_freebsd ||
metrics->os == TargetOs_openbsd ||
metrics->os == TargetOs_netbsd) {

22
src/llvm_backend.cpp
View File

@@ -3154,32 +3154,12 @@ gb_internal bool lb_generate_code(lbGenerator *gen) {
// NOTE(bill, 2021-05-04): Target machines must be unique to each module because they are not thread safe
auto target_machines = array_make<LLVMTargetMachineRef>(permanent_allocator(), 0, gen->modules.count);
// NOTE(dweiler): Dynamic libraries require position-independent code.
LLVMRelocMode reloc_mode = LLVMRelocDefault;
if (build_context.build_mode == BuildMode_DynamicLibrary) {
reloc_mode = LLVMRelocPIC;
}
switch (build_context.reloc_mode) {
case RelocMode_Default:
break;
case RelocMode_Static:
reloc_mode = LLVMRelocStatic;
break;
case RelocMode_PIC:
reloc_mode = LLVMRelocPIC;
break;
case RelocMode_DynamicNoPIC:
reloc_mode = LLVMRelocDynamicNoPic;
break;
}
for (auto const &entry : gen->modules) {
LLVMTargetMachineRef target_machine = LLVMCreateTargetMachine(
target, target_triple, (const char *)llvm_cpu.text,
llvm_features,
code_gen_level,
reloc_mode,
get_reloc_mode(),
code_mode);
lbModule *m = entry.value;
m->target_machine = target_machine;

29
src/llvm_backend_general.cpp
View File

@@ -1,5 +1,6 @@
gb_internal void lb_add_debug_local_variable(lbProcedure *p, LLVMValueRef ptr, Type *type, Token const &token);
gb_internal LLVMValueRef llvm_const_string_internal(lbModule *m, Type *t, LLVMValueRef data, LLVMValueRef len);
gb_internal LLVMRelocMode get_reloc_mode();
gb_global Entity *lb_global_type_info_data_entity = {};
gb_global lbAddr lb_global_type_info_member_types = {};
@@ -65,6 +66,12 @@ gb_internal WORKER_TASK_PROC(lb_init_module_worker_proc) {
"RtLibUseGOT", 11,
LLVMValueAsMetadata(LLVMConstInt(LLVMInt32TypeInContext(m->ctx), 1, true)));
}
LLVMAddModuleFlag(m->mod,
LLVMModuleFlagBehaviorWarning,
"PIC Level", 9,
LLVMValueAsMetadata(LLVMConstInt(LLVMInt32TypeInContext(m->ctx), get_reloc_mode(), true)));
if (build_context.ODIN_DEBUG) {
enum {DEBUG_METADATA_VERSION = 3};
@@ -3667,3 +3674,25 @@ gb_internal void lb_set_linkage_from_entity_flags(lbModule *m, LLVMValueRef valu
LLVMSetLinkage(value, LLVMLinkOnceAnyLinkage);
}
}
LLVMRelocMode get_reloc_mode() {
// NOTE(dweiler): Dynamic libraries require position-independent code.
LLVMRelocMode reloc_mode = LLVMRelocDefault;
if (build_context.build_mode == BuildMode_DynamicLibrary) {
reloc_mode = LLVMRelocPIC;
}
switch (build_context.reloc_mode) {
case RelocMode_Default:
break;
case RelocMode_Static:
reloc_mode = LLVMRelocStatic;
break;
case RelocMode_PIC:
reloc_mode = LLVMRelocPIC;
break;
case RelocMode_DynamicNoPIC:
reloc_mode = LLVMRelocDynamicNoPic;
break;
}
return reloc_mode;
}