diff options
| author | Theo Buehler <tb@openbsd.org> | 2023-04-25 13:15:22 +0200 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2023-04-25 13:15:22 +0200 |
| commit | 10204764c4e70f02b044304e07773b6daa6f483f (patch) | |
| tree | 63237b7e1f1cb4060bfee7e776e67ba95cf9852f | |
| parent | 250713b30dfe57aeb97864e2ef843efe4310932a (diff) | |
| parent | 94763de52b947fbf7a6360f9dfc1e7b3363a9492 (diff) | |
| download | portable-10204764c4e70f02b044304e07773b6daa6f483f.tar.gz portable-10204764c4e70f02b044304e07773b6daa6f483f.tar.bz2 portable-10204764c4e70f02b044304e07773b6daa6f483f.zip | |
Land #847
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7847830..e05221c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -344,7 +344,7 @@ if(ENABLE_ASM) | |||
| 344 | endif() | 344 | endif() |
| 345 | add_definitions(-DHAVE_GNU_STACK) | 345 | add_definitions(-DHAVE_GNU_STACK) |
| 346 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") | 346 | elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") |
| 347 | set(HOST_ASM_MACOSX_X86_64 true) | 347 | set(ENABLE_ASM false) |
| 348 | elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) | 348 | elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) |
| 349 | set(HOST_ASM_MASM_X86_64 true) | 349 | set(HOST_ASM_MASM_X86_64 true) |
| 350 | ENABLE_LANGUAGE(ASM_MASM) | 350 | ENABLE_LANGUAGE(ASM_MASM) |
diff --git a/configure.ac b/configure.ac index 51e096b..6fe2ff4 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -122,7 +122,7 @@ AM_CONDITIONAL([HOST_ASM_ELF_MIPS64], | |||
| 122 | AM_CONDITIONAL([HOST_ASM_ELF_X86_64], | 122 | AM_CONDITIONAL([HOST_ASM_ELF_X86_64], |
| 123 | [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) | 123 | [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) |
| 124 | AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], | 124 | AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], |
| 125 | [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) | 125 | [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" == "xenabled"]) |
| 126 | AM_CONDITIONAL([HOST_ASM_MASM_X86_64], | 126 | AM_CONDITIONAL([HOST_ASM_MASM_X86_64], |
| 127 | [test "x$HOST_ABI" = "xmasm" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) | 127 | [test "x$HOST_ABI" = "xmasm" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) |
| 128 | AM_CONDITIONAL([HOST_ASM_MINGW64_X86_64], | 128 | AM_CONDITIONAL([HOST_ASM_MINGW64_X86_64], |