Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/ccall.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// This file is a part of Julia. License is MIT: https://julialang.org/license

// --- the ccall, cglobal, and llvm intrinsics ---
#include "llvm/Support/Path.h" // for llvm::sys::path

// Map from symbol name (in a certain library) to its GV in sysimg and the
// DL handle address in the current session.
Expand Down Expand Up @@ -68,7 +69,8 @@ static bool runtime_sym_gvs(const char *f_lib, const char *f_name, MT &&M,
}
else {
std::string name = "ccalllib_";
name += f_lib;
name += llvm::sys::path::filename(f_lib);
name += std::to_string(globalUnique++);
runtime_lib = true;
auto &libgv = libMapGV[f_lib];
if (libgv.first == NULL) {
Expand Down
2 changes: 1 addition & 1 deletion src/gc.h
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ STATIC_INLINE unsigned ffs_u32(uint32_t bitvec)
_BitScanForward(&j, bitvec);
return j;
#else
return ffs(bitvec) - 1;
return __builtin_ffs(bitvec) - 1;
#endif
}
#endif
Expand Down