Commit 9866a5be authored by Raito Bezarius's avatar Raito Bezarius
Browse files

llvmPackages_5: drop 

While using very old compilers is a fair usecase, it induces a maintenance churn as
we collect more and more LLVM versions for the LLVM maintainers.

Especially when we need to backport uniform changes to the whole tree,
furthermore, it consumes and waste CI resources.
parent c7f0bbcf

pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp

index 00bd60bc24bb..17416b0bd3c0 100644

--- a/lib/Driver/ToolChains/CommonArgs.cpp

+++ b/lib/Driver/ToolChains/CommonArgs.cpp

@@ -376,8 +376,7 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,

   // as gold requires -plugin to come before any -plugin-opt that -Wl might

   // forward.

   CmdArgs.push_back("-plugin");

-  std::string Plugin =

-      ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so";

+  std::string Plugin = "@libllvmLibdir@" "/LLVMgold.so";

   CmdArgs.push_back(Args.MakeArgString(Plugin));

 

   // Try to pass driver level flags relevant to LTO code generation down to

pkgs/development/compilers/llvm/5/clang/default.nix

deleted100644 → 0
+0 −127
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3

, buildLlvmTools

, fixDarwinDylibNames

, enableManpages ? false

}:



let

  self = stdenv.mkDerivation ({

    pname = "clang";

    inherit version;



    src = fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s";



    unpackPhase = ''

      unpackFile $src

      mv cfe-${version}* clang

      sourceRoot=$PWD/clang

      unpackFile ${clang-tools-extra_src}

      mv clang-tools-extra-* $sourceRoot/tools/extra

    '';



    nativeBuildInputs = [ cmake python3 ]

      ++ lib.optional enableManpages python3.pkgs.sphinx

      ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;



    buildInputs = [ libxml2 libllvm ];



    cmakeFlags = [

      "-DCMAKE_CXX_FLAGS=-std=c++11"

      "-DLLVM_ENABLE_RTTI=ON"

      "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"

    ] ++ lib.optionals enableManpages [

      "-DCLANG_INCLUDE_DOCS=ON"

      "-DLLVM_ENABLE_SPHINX=ON"

      "-DSPHINX_OUTPUT_MAN=ON"

      "-DSPHINX_OUTPUT_HTML=OFF"

      "-DSPHINX_WARNINGS_AS_ERRORS=OFF"

    ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

      "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"

      "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"

    ];



    patches = [

      ../../common/clang/5-8-purity.patch

      ./gnu-install-dirs.patch

      (substituteAll {

        src = ./LLVMgold-path.patch;

        libllvmLibdir = "${libllvm.lib}/lib";

      })

    ];



    postPatch = ''

      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \

             -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \

             lib/Driver/ToolChains/*.cpp

    '' + lib.optionalString stdenv.hostPlatform.isMusl ''

      sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp

    '';



    outputs = [ "out" "lib" "dev" "python" ];



    postInstall = ''

      ln -sv $out/bin/clang $out/bin/cpp



      # Move libclang to 'lib' output

      moveToOutput "lib/libclang.*" "$lib"

      substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \

          --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."



      mkdir -p $python/bin $python/share/{clang,scan-view}

      mv $out/bin/{git-clang-format,scan-view} $python/bin

      if [ -e $out/bin/set-xcode-analyzer ]; then

        mv $out/bin/set-xcode-analyzer $python/bin

      fi

      mv $out/share/clang/*.py $python/share/clang

      mv $out/share/scan-view/*.py $python/share/scan-view

      rm $out/bin/c-index-test

      patchShebangs $python/bin



      mkdir -p $dev/bin

      cp bin/clang-tblgen $dev/bin

    '';



    passthru = {

      inherit libllvm;

      isClang = true;

      hardeningUnsupportedFlags = [ "fortify3" ];

    };



    meta = llvm_meta // {

      homepage = "https://clang.llvm.org/";

      description = "A C language family frontend for LLVM";

      longDescription = ''

        The Clang project provides a language front-end and tooling

        infrastructure for languages in the C language family (C, C++, Objective

        C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project.

        It aims to deliver amazingly fast compiles, extremely useful error and

        warning messages and to provide a platform for building great source

        level tools. The Clang Static Analyzer and clang-tidy are tools that

        automatically find bugs in your code, and are great examples of the sort

        of tools that can be built using the Clang frontend as a library to

        parse C/C++ code.

      '';

      mainProgram = "clang";

    };

  } // lib.optionalAttrs enableManpages {

    pname = "clang-manpages";



    buildPhase = ''

      make docs-clang-man

    '';



    installPhase = ''

      mkdir -p $out/share/man/man1

      # Manually install clang manpage

      cp docs/man/*.1 $out/share/man/man1/

    '';



    outputs = [ "out" ];



    doCheck = false;



    meta = llvm_meta // {

      description = "man page for Clang ${version}";

    };

  });

in self

pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch

deleted100644 → 0
+0 −242
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 2667b1d6892e..87c5ad58738f 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3)

 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )

   project(Clang)

 

+  include(GNUInstallDirs)

+

   # Rely on llvm-config.

   set(CONFIG_OUTPUT)

   find_program(LLVM_CONFIG "llvm-config")

@@ -344,7 +346,7 @@ include_directories(BEFORE

 

 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

   install(DIRECTORY include/clang include/clang-c

-    DESTINATION include

+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     FILES_MATCHING

     PATTERN "*.def"

     PATTERN "*.h"

@@ -353,7 +355,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     )

 

   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang

-    DESTINATION include

+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     FILES_MATCHING

     PATTERN "CMakeFiles" EXCLUDE

     PATTERN "*.inc"

@@ -361,7 +363,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     )

 

   install(PROGRAMS utils/bash-autocomplete.sh

-    DESTINATION share/clang

+    DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

     )

 endif()

 

diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake

index e657059744a4..19da44638fe6 100644

--- a/cmake/modules/AddClang.cmake

+++ b/cmake/modules/AddClang.cmake

@@ -99,9 +99,9 @@ macro(add_clang_library name)

       install(TARGETS ${name}

         COMPONENT ${name}

         ${export_to_clangtargets}

-        LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

-        ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

-        RUNTIME DESTINATION bin)

+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}

+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}

+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

 

       if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)

         add_custom_target(install-${name}

@@ -143,7 +143,7 @@ macro(add_clang_tool name)

 

     install(TARGETS ${name}

       ${export_to_clangtargets}

-      RUNTIME DESTINATION bin

+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

       COMPONENT ${name})

 

     if(NOT CMAKE_CONFIGURATION_TYPES)

@@ -160,5 +160,5 @@ endmacro()

 macro(add_clang_symlink name dest)

   add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)

   # Always generate install targets

-  llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE)

+  llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE)

 endmacro()

diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt

index a621c02644e3..e140efc9c83c 100644

--- a/lib/Headers/CMakeLists.txt

+++ b/lib/Headers/CMakeLists.txt

@@ -129,13 +129,13 @@ install(

   FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h

   COMPONENT clang-headers

   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

-  DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)

+  DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)

 

 install(

   FILES ${cuda_wrapper_files}

   COMPONENT clang-headers

   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

-  DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers)

+  DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers)

 

 if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's.

   add_custom_target(install-clang-headers

diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt

index ad990e010eef..92e52d05afb9 100644

--- a/tools/c-index-test/CMakeLists.txt

+++ b/tools/c-index-test/CMakeLists.txt

@@ -48,7 +48,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH

        "@executable_path/../../lib")

   else()

-    set(INSTALL_DESTINATION bin)

+    set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR})

   endif()

 

   install(TARGETS c-index-test

diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt

index 04151a8e0331..13918d91c4ba 100644

--- a/tools/clang-check/CMakeLists.txt

+++ b/tools/clang-check/CMakeLists.txt

@@ -19,4 +19,4 @@ target_link_libraries(clang-check

   )

 

 install(TARGETS clang-check

-  RUNTIME DESTINATION bin)

+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt

index a13633eaefc4..9b0094783690 100644

--- a/tools/clang-format/CMakeLists.txt

+++ b/tools/clang-format/CMakeLists.txt

@@ -20,20 +20,20 @@ if( LLVM_USE_SANITIZE_COVERAGE )

 endif()

 

 install(PROGRAMS clang-format-bbedit.applescript

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS clang-format-diff.py

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS clang-format-sublime.py

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS clang-format.el

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS clang-format.py

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-format)

 install(PROGRAMS git-clang-format

-  DESTINATION bin

+  DESTINATION ${CMAKE_INSTALL_BINDIR}

   COMPONENT clang-format)

diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt

index 6161d08ae587..a003292d1676 100644

--- a/tools/clang-offload-bundler/CMakeLists.txt

+++ b/tools/clang-offload-bundler/CMakeLists.txt

@@ -21,4 +21,4 @@ target_link_libraries(clang-offload-bundler

   ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS}

   )

 

-install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin)

+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt

index 771e3bdea6f0..d1396e62b28f 100644

--- a/tools/clang-rename/CMakeLists.txt

+++ b/tools/clang-rename/CMakeLists.txt

@@ -14,11 +14,11 @@ target_link_libraries(clang-rename

   clangToolingRefactor

   )

 

-install(TARGETS clang-rename RUNTIME DESTINATION bin)

+install(TARGETS clang-rename RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

 

 install(PROGRAMS clang-rename.py

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-rename)

 install(PROGRAMS clang-rename.el

-  DESTINATION share/clang

+  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

   COMPONENT clang-rename)

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt

index 2dd670307636..1fe576f77ddb 100644

--- a/tools/libclang/CMakeLists.txt

+++ b/tools/libclang/CMakeLists.txt

@@ -121,7 +121,7 @@ endif()

 if(INTERNAL_INSTALL_PREFIX)

   set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include")

 else()

-  set(LIBCLANG_HEADERS_INSTALL_DESTINATION include)

+  set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

 endif()

 

 install(DIRECTORY ../../include/clang-c

diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt

index 380379300b09..adfd58ed5f7d 100644

--- a/tools/scan-build/CMakeLists.txt

+++ b/tools/scan-build/CMakeLists.txt

@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD)

                          ${CMAKE_BINARY_DIR}/bin/

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})

-    install(PROGRAMS bin/${BinFile} DESTINATION bin)

+    install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR})

   endforeach()

 

   foreach(LibexecFile ${LibexecFiles})

@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD)

                          ${CMAKE_BINARY_DIR}/libexec/

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile})

-    install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec)

+    install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})

   endforeach()

 

   foreach(ManPage ${ManPages})

@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD)

                          ${CMAKE_BINARY_DIR}/share/scan-build/

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile})

-    install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build)

+    install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build)

   endforeach()

 

   add_custom_target(scan-build ALL DEPENDS ${Depends})

diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt

index b305ca562a72..554bcb379061 100644

--- a/tools/scan-view/CMakeLists.txt

+++ b/tools/scan-view/CMakeLists.txt

@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW)

                          ${CMAKE_BINARY_DIR}/bin/

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})

-    install(PROGRAMS bin/${BinFile} DESTINATION bin)

+    install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR})

   endforeach()

 

   foreach(ShareFile ${ShareFiles})

@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW)

                          ${CMAKE_BINARY_DIR}/share/scan-view/

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile})

-    install(FILES share/${ShareFile} DESTINATION share/scan-view)

+    install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view)

   endforeach()

 

   add_custom_target(scan-view ALL DEPENDS ${Depends})

pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
diff -ur compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake

--- compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake	2017-05-25 00:53:24.000000000 +0900

+++ compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake	2020-05-10 03:24:24.937433155 +0900

@@ -24,7 +24,7 @@

 

 

 set(ARM64 aarch64)

-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k)

+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l)

 set(X86 i386 i686)

 set(X86_64 x86_64)

 set(MIPS32 mips mipsel)

diff -ur compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt

--- compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt	2017-07-13 04:33:30.000000000 +0900

+++ compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt	2020-05-10 03:24:45.945075423 +0900

@@ -444,6 +444,7 @@

 set(armv7_SOURCES ${arm_SOURCES})

 set(armv7s_SOURCES ${arm_SOURCES})

 set(armv7k_SOURCES ${arm_SOURCES})

+set(armv7l_SOURCES ${arm_SOURCES})

 set(arm64_SOURCES ${aarch64_SOURCES})

 

 # macho_embedded archs

pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch

deleted100644 → 0
+0 −155
Original line number Diff line number Diff line 
From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001

From: Will Dietz <w@wdtz.org>

Date: Tue, 19 Sep 2017 13:13:06 -0500

Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that

 needs it



---

 cmake/Modules/AddCompilerRT.cmake |  8 ------

 test/asan/CMakeLists.txt          | 52 ---------------------------------------

 test/tsan/CMakeLists.txt          | 47 -----------------------------------

 3 files changed, 107 deletions(-)



diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake

index bc5fb9ff7..b64eb4246 100644

--- a/cmake/Modules/AddCompilerRT.cmake

+++ b/cmake/Modules/AddCompilerRT.cmake

@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)

         set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")

         set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")

       endif()

-      if(APPLE)

-        # Ad-hoc sign the dylibs

-        add_custom_command(TARGET ${libname}

-          POST_BUILD  

-          COMMAND codesign --sign - $<TARGET_FILE:${libname}>

-          WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}

-        )

-      endif()

     endif()

     install(TARGETS ${libname}

       ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}

diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt

index 8bfc15b5c..f23d0f71a 100644

--- a/test/asan/CMakeLists.txt

+++ b/test/asan/CMakeLists.txt

@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH})

   endif()

 endforeach()

 

-# iOS and iOS simulator test suites

-# These are not added into "check-all", in order to run these tests, use

-# "check-asan-iossim-x86_64" and similar. They also require that an extra env

-# variable to select which iOS device or simulator to use, e.g.:

-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"

-if(APPLE)

-  set(EXCLUDE_FROM_ALL ON)

-

-  set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})

-  set(ASAN_TEST_IOS "1")

-  pythonize_bool(ASAN_TEST_IOS)

-  set(ASAN_TEST_DYNAMIC True)

-

-  foreach(arch ${DARWIN_iossim_ARCHS})

-    set(ASAN_TEST_IOSSIM "1")

-    pythonize_bool(ASAN_TEST_IOSSIM)

-    set(ASAN_TEST_TARGET_ARCH ${arch})

-    set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")

-    set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")

-    get_bits_for_arch(${arch} ASAN_TEST_BITS)

-    string(TOUPPER ${arch} ARCH_UPPER_CASE)

-    set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")

-    configure_lit_site_cfg(

-      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in

-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg

-      )

-    add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests"

-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/

-      DEPENDS ${ASAN_TEST_DEPS})

-  endforeach()

-

-  foreach (arch ${DARWIN_ios_ARCHS})

-    set(ASAN_TEST_IOSSIM "0")

-    pythonize_bool(ASAN_TEST_IOSSIM)

-    set(ASAN_TEST_TARGET_ARCH ${arch})

-    set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")

-    set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios")

-    get_bits_for_arch(${arch} ASAN_TEST_BITS)

-    string(TOUPPER ${arch} ARCH_UPPER_CASE)

-    set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")

-    configure_lit_site_cfg(

-      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in

-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg

-      )

-    add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests"

-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/

-      DEPENDS ${ASAN_TEST_DEPS})

-  endforeach()

-

-  set(EXCLUDE_FROM_ALL OFF)

-endif()

-

 # Add unit tests.

 if(COMPILER_RT_INCLUDE_TESTS)

   set(ASAN_TEST_DYNAMIC False)

diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt

index a68908612..cde0accb5 100644

--- a/test/tsan/CMakeLists.txt

+++ b/test/tsan/CMakeLists.txt

@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH})

   list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})

 endforeach()

 

-# iOS and iOS simulator test suites

-# These are not added into "check-all", in order to run these tests, use

-# "check-tsan-iossim-x86_64" and similar. They also require an extra environment

-# variable to select which iOS device or simulator to use, e.g.:

-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"

-if(APPLE)

-  set(EXCLUDE_FROM_ALL ON)

-

-  set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})

-  set(TSAN_TEST_IOS "1")

-  pythonize_bool(TSAN_TEST_IOS)

-

-  set(arch "x86_64")

-  set(TSAN_TEST_IOSSIM "1")

-  pythonize_bool(TSAN_TEST_IOSSIM)

-  set(TSAN_TEST_TARGET_ARCH ${arch})

-  set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")

-  set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")

-  string(TOUPPER ${arch} ARCH_UPPER_CASE)

-  set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")

-  configure_lit_site_cfg(

-    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in

-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg

-    )

-  add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"

-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/

-    DEPENDS ${TSAN_TEST_DEPS})

-

-  set(arch "arm64")

-  set(TSAN_TEST_IOSSIM "0")

-  pythonize_bool(TSAN_TEST_IOSSIM)

-  set(TSAN_TEST_TARGET_ARCH ${arch})

-  set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")

-  set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios")

-  string(TOUPPER ${arch} ARCH_UPPER_CASE)

-  set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")

-  configure_lit_site_cfg(

-    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in

-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg

-    )

-  add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"

-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/

-    DEPENDS ${TSAN_TEST_DEPS})

-

-  set(EXCLUDE_FROM_ALL OFF)

-endif()

-

 if(COMPILER_RT_INCLUDE_TESTS)

   configure_lit_site_cfg(

     ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in

-- 

2.14.1