diff options
| author | Julian Andres Klode <jak@debian.org> | 2021-02-09 09:38:48 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2021-02-09 09:38:48 +0000 |
| commit | cb60beb83610783f664da0bbe1cdb7211aaba90f (patch) | |
| tree | a594f98222c256e6cec1a97c87305083823f0c91 /CMake | |
| parent | 4c3383746f2974be5fdec86616f45fd85948a9aa (diff) | |
| parent | 131d0e3a261076da715102cb79275988cac810d1 (diff) | |
Merge branch 'pu/fuzzerpatches' into 'master'
Various patches uplifted from unfinished fuzzer branches
See merge request apt-team/apt!158
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/CheckCxxTarget.cmake | 36 | ||||
| -rw-r--r-- | CMake/config.h.in | 4 |
2 files changed, 0 insertions, 40 deletions
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 <jak@debian.org>. -# -# 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 |