Merge branch 'master' into merge-3.0

This commit is contained in:
David Nadlinger
2011-12-04 18:15:21 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -250,7 +250,7 @@ set_target_properties(
target_link_libraries(${LDC_EXE} "${LLVM_LDFLAGS} ${LLVM_LIBRARIES}" ${LIBCONFIG_LDFLAGS} config++)
if(WIN32)
target_link_libraries(${LDC_EXE} imagehlp psapi)
elseif(UNIX)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(${LDC_EXE} dl)
endif(WIN32)

View File

@@ -1015,9 +1015,9 @@ namespace AsmParserx8664
{ "movs", Op_movs },
{ "movsb", Op_movsX },
{ "movsd", Op_movsd },
{ "movsq", Op_movsd },
{ "movshdup", Op_DstSrcSSE },
{ "movsldup", Op_DstSrcSSE },
{ "movsq", Op_movsd },
{ "movss", Op_DstSrcSSE },
{ "movsw", Op_movsX },
{ "movsx", Op_movsx }, // word-only, reg dest