Move code

Author: jakeegan

compiler-rt/cmake/Modules/AddCompilerRT.cmake

@@ -582,23 +582,6 @@ macro(add_compiler_rt_script name)
     DESTINATION ${COMPILER_RT_INSTALL_BINARY_DIR})
 endmacro(add_compiler_rt_script src name)
 
-macro(add_compiler_rt_cfg target_name file_name component)
-  set(src_file "${CMAKE_CURRENT_SOURCE_DIR}/${file_name}")
-  get_compiler_rt_output_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} output_dir)
-  set(dst_file "${output_dir}/${file_name}")
-  add_custom_command(OUTPUT ${dst_file}
-    DEPENDS ${src_file}
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src_file} ${dst_file}
-    COMMENT "Copying ${file_name}...")
-  add_custom_target(${target_name} DEPENDS ${dst_file})
-  install(FILES ${file_name}
-    DESTINATION ${COMPILER_RT_INSTALL_LIBRARY_DIR}
-    COMPONENT ${component})
-  add_dependencies(${component} ${target_name})
-
-  set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT Misc")
-endmacro()
-
 # Builds custom version of libc++ and installs it in <prefix>.
 # Can be used to build sanitized versions of libc++ for running unit tests.
 # add_custom_libcxx(<name> <prefix>

compiler-rt/lib/asan/CMakeLists.txt

@@ -1,7 +1,6 @@
 # Build for the AddressSanitizer runtime support library.
 
 set(ASAN_SOURCES
-  asan_aix.cpp
   asan_allocator.cpp
   asan_activation.cpp
   asan_debugging.cpp
@@ -282,8 +281,6 @@ else()
       PARENT_TARGET asan)
   endif()
 
-  # On AIX, we only need the static libraries.
-  if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
   foreach(arch ${ASAN_SUPPORTED_ARCH})
     if (COMPILER_RT_HAS_VERSION_SCRIPT)
       if(WIN32)
@@ -385,18 +382,10 @@ else()
       endif()
     endif()
   endforeach()
-  endif()
 endif()
 
 add_compiler_rt_resource_file(asan_ignorelist asan_ignorelist.txt asan)
 
-# On AIX, we need to put asan.link_with_main_exec.txt and asan_cxx.link_with_main_exec.txt
-# to the build and install dir.
-if (${CMAKE_SYSTEM_NAME} MATCHES "AIX")
-  add_compiler_rt_cfg(asan_symbols asan.link_with_main_exec.txt asan)
-  add_compiler_rt_cfg(asan_cxx_symbols asan_cxx.link_with_main_exec.txt asan)
-endif()
-
 add_subdirectory(scripts)
 
 if(COMPILER_RT_INCLUDE_TESTS)

compiler-rt/lib/asan/asan.link_with_main_exec.txt

@@ -14,11 +14,7 @@
 #include "sanitizer_common/sanitizer_platform.h"
 #if SANITIZER_POSIX
 
-// tid_t is also defined in AIX header /usr/include/sys/types.h which is
-// included by system pthread.h
-#  define tid_t tid_t_temp
 #  include <pthread.h>
-#  undef tid_t
 #  include <signal.h>
 #  include <stdlib.h>
 #  include <sys/resource.h>
@@ -184,7 +180,7 @@ static void AfterFork(bool fork_child) {
 
 void InstallAtForkHandler() {
 #  if SANITIZER_SOLARIS || SANITIZER_NETBSD || SANITIZER_APPLE || \
-      (SANITIZER_LINUX && SANITIZER_SPARC) || SANITIZER_HAIKU || SANITIZER_AIX
+      (SANITIZER_LINUX && SANITIZER_SPARC) || SANITIZER_HAIKU
   // While other Linux targets use clone in internal_fork which doesn't
   // trigger pthread_atfork handlers, Linux/sparc64 uses __fork, causing a
   // hang.

compiler-rt/lib/asan/asan_aix.cpp

@@ -59,7 +59,6 @@ def is_valid_arch(s):
         "armv7s",
         "armv7k",
         "arm64",
-        "powerpc",
         "powerpc64",
         "powerpc64le",
         "s390x",
@@ -450,14 +449,7 @@ def __init__(self, plugin_proxy=None, dsym_hint_producer=None):
             # E.g. in Chrome several binaries may share a single .dSYM.
             self.dsym_hint_producer = dsym_hint_producer
             self.system = os.uname()[0]
-            if self.system not in [
-                "Linux",
-                "Darwin",
-                "FreeBSD",
-                "NetBSD",
-                "SunOS",
-                "AIX",
-            ]:
+            if self.system not in ["Linux", "Darwin", "FreeBSD", "NetBSD", "SunOS"]:
                 raise Exception("Unknown system")
             self.llvm_symbolizers = {}
             self.last_llvm_symbolizer = None

compiler-rt/lib/asan/asan_cxx.link_with_main_exec.txt

@@ -23,12 +23,7 @@ namespace __sanitizer {
 typedef CompactSizeClassMap InternalSizeClassMap;
 
 struct AP32 {
-// For AIX 64-bit, the mmap begin is at address 0x0a00000000000000ULL.
-#if SANITIZER_AIX && SANITIZER_WORDSIZE == 64
-  static const uptr kSpaceBeg = 0x0a00000000000000ULL;
-#else
   static const uptr kSpaceBeg = 0;
-#endif
   static const u64 kSpaceSize = SANITIZER_MMAP_RANGE_SIZE;
   static const uptr kMetadataSize = 0;
   typedef InternalSizeClassMap SizeClassMap;

compiler-rt/lib/asan/asan_posix.cpp

@@ -288,7 +288,6 @@ class SizeClassAllocator32 {
   uptr ComputeRegionId(uptr mem) const {
     if (SANITIZER_SIGN_EXTENDED_ADDRESSES)
       mem &= (kSpaceSize - 1);
-    mem -= kSpaceBeg;
     const uptr res = mem >> kRegionSizeLog;
     CHECK_LT(res, kNumPossibleRegions);
     return res;

compiler-rt/lib/asan/scripts/asan_symbolize.py

@@ -169,12 +169,7 @@ void ReserveShadowMemoryRange(uptr beg, uptr end, const char *name,
                      : !MmapFixedNoReserve(beg, size, name)) {
     Report(
         "ReserveShadowMemoryRange failed while trying to map 0x%zx bytes. "
-        "Perhaps you're using ulimit -v "
-#  if SANITIZER_AIX && SANITIZER_WORDSIZE == 32
-        "or using large address-space model for 32-bit XCOFF by using ldedit "
-        "or setting LDR_CNTRL=MAXDATA or compiling the binary with -bmaxdata "
-#  endif
-        "\n",
+        "Perhaps you're using ulimit -v or ulimit -d\n",
         size);
     Die();
   }