D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-11 18:33:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-2.061-2

Browse Source
This commit is contained in:
kai
2013-01-26 17:40:24 +01:00
parent dc69c67bbe c0284bac2b
commit e68a0fa2a6
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gen/functions.cpp
View File

@@ -612,7 +612,16 @@ static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclarati
llvm::AttrListPtr oldAttrs = func->getAttributes();
#endif
for (size_t i = 0; i < oldAttrs.getNumSlots(); ++i) {
#if LDC_LLVM_VER >= 303
const unsigned Index = oldAttrs.getSlotIndex(i);
llvm::AttrBuilder &builder = llvm::AttrBuilder(oldAttrs.getSlotAttributes(i), Index).addAttribute(llvm::Attribute::None);
llvm::AttributeWithIndex curr = llvm::AttributeWithIndex::get(Index,
llvm::Attribute::get(
gIR->context(),
builder));
#else
llvm::AttributeWithIndex curr = oldAttrs.getSlot(i);
#endif
bool found = false;
for (size_t j = 0; j < newSize; ++j) {

10
runtime/CMakeLists.txt
View File

@@ -316,10 +316,12 @@ macro(build_runtime d_flags c_flags ld_flags lib_suffix path_suffix outlist_targ
dc(${f} "${d_flags}" "${RUNTIME_DIR}" "${target_suffix}" DCRT_O DCRT_BC)
endforeach()
# Always build zlib and other C parts of the runtime in release mode.
set_source_files_properties(${CORE_C} ${DCRT_C} PROPERTIES
COMPILE_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}"
)
if(NOT MSVC)
# Always build zlib and other C parts of the runtime in release mode.
set_source_files_properties(${CORE_C} ${DCRT_C} PROPERTIES
COMPILE_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}"
)
endif()
if(EXISTS ${RUNTIME_DIR})
set(GCCBUILTINS "${PROJECT_BINARY_DIR}/gccbuiltins_x86.di")