From c8d65a59a36400aaf85ff96b0c813f8fc53cd8bb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 3 Feb 2021 15:26:32 +0100 Subject: Remove unused config check for pre-XXH3 cache hashing References: 1460eebf2abe913df964e031eff081a57f043697 Gbp-Dch: Ignore --- CMake/CheckCxxTarget.cmake | 36 ------------------------------------ CMake/config.h.in | 4 ---- CMakeLists.txt | 5 ----- 3 files changed, 45 deletions(-) delete mode 100644 CMake/CheckCxxTarget.cmake diff --git a/CMake/CheckCxxTarget.cmake b/CMake/CheckCxxTarget.cmake deleted file mode 100644 index 17c32bfac..000000000 --- a/CMake/CheckCxxTarget.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# CMake support for target-based function multiversioning -# -# Copyright (C) 2019 Canonical Ltd -# -# Author: Julian Andres Klode . -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation files -# (the "Software"), to deal in the Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, sublicense, and/or sell copies of the Software, -# and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - - -include(CheckCXXSourceCompiles) -function(check_cxx_target var target code) - check_cxx_source_compiles( - " - __attribute__((target(\"${target}\"))) static int foo(int i) { return ${code}; } - __attribute__((target(\"default\"))) static int foo(int i) { return i; } - int main(int i, char **) { return foo(i); } - " ${var}) -endfunction() diff --git a/CMake/config.h.in b/CMake/config.h.in index 911d42464..8fa5e8b6f 100644 --- a/CMake/config.h.in +++ b/CMake/config.h.in @@ -80,9 +80,5 @@ /* Group of the root user */ #cmakedefine ROOT_GROUP "${ROOT_GROUP}" -/* defined if __builtin_ia32_crc32{s,d}i() exists in an sse4.2 target */ -#cmakedefine HAVE_FMV_SSE42_AND_CRC32 -#cmakedefine HAVE_FMV_SSE42_AND_CRC32DI - /* unrolling is faster combined with an optimizing compiler */ #define SHA2_UNROLL_TRANSFORM diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d9afba61..9e35f6e00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,11 +197,6 @@ else() set(RESOLV_LIBRARIES -lresolv) endif() -# Check multiversioning -include(CheckCxxTarget) -check_cxx_target(HAVE_FMV_SSE42_AND_CRC32 "sse4.2" "__builtin_ia32_crc32si(0,i)|__builtin_ia32_crc32hi(0,i)|__builtin_ia32_crc32qi(0,i)") -check_cxx_target(HAVE_FMV_SSE42_AND_CRC32DI "sse4.2" "__builtin_ia32_crc32di(0,i)") - # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -- cgit v1.2.3-18-g5258