Репозиторий Sisyphus
Последнее обновление: 15 июля 2020 | Пакетов: 17706 | Посещений: 18883362
en ru br
Репозитории ALT

Группа :: Разработка/C
Пакет: llvm7.0

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: compiler-rt-alt-i586-arch.patch
Скачать


diff --git a/projects/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/projects/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
index e565171..b0917ad 100644
--- a/projects/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
+++ b/projects/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
@@ -179,7 +179,7 @@ macro(detect_target_arch)
   elseif(__X86_64)
     add_default_target_arch(x86_64)
   elseif(__I386)
-    add_default_target_arch(i386)
+    add_default_target_arch(i586)
   elseif(__MIPS64) # must be checked before __MIPS
     add_default_target_arch(mips64)
   elseif(__MIPS)
diff --git a/projects/compiler-rt/cmake/base-config-ix.cmake b/projects/compiler-rt/cmake/base-config-ix.cmake
index 91fe249..5d3e948 100644
--- a/projects/compiler-rt/cmake/base-config-ix.cmake
+++ b/projects/compiler-rt/cmake/base-config-ix.cmake
@@ -161,7 +161,7 @@ macro(test_targets)
           endif()
         else()
           test_target_arch(x86_64 "" "-m64")
-          test_target_arch(i386 __i386__ "-m32")
+          test_target_arch(i586 __i386__ "-m32")
         endif()
       else()
         if (CMAKE_SIZEOF_VOID_P EQUAL 4)
diff --git a/projects/compiler-rt/cmake/config-ix.cmake b/projects/compiler-rt/cmake/config-ix.cmake
index f3935ff..aa34be0 100644
--- a/projects/compiler-rt/cmake/config-ix.cmake
+++ b/projects/compiler-rt/cmake/config-ix.cmake
@@ -177,7 +177,7 @@ endmacro()
 set(ARM64 aarch64)
 set(ARM32 arm armhf)
 set(HEXAGON hexagon)
-set(X86 i386)
+set(X86 i586)
 set(X86_64 x86_64)
 set(MIPS32 mips mipsel)
 set(MIPS64 mips64 mips64el)
diff --git a/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py b/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
index 68b6f09..a48bb9f 100755
--- a/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
+++ b/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
@@ -39,7 +39,7 @@ def sysroot_path_filter(binary_name):
   return sysroot_path + binary_name
 
 def is_valid_arch(s):
-  return s in ["i386", "x86_64", "x86_64h", "arm", "armv6", "armv7", "armv7s",
+  return s in ["i586", "x86_64", "x86_64h", "arm", "armv6", "armv7", "armv7s",
                "armv7k", "arm64", "powerpc64", "powerpc64le", "s390x", "s390"]
 
 def guess_arch(addr):
@@ -47,7 +47,7 @@ def guess_arch(addr):
   if len(addr) > 10:
     return 'x86_64'
   else:
-    return 'i386'
+    return 'i586'
 
 class Symbolizer(object):
   def __init__(self):
diff --git a/projects/compiler-rt/test/asan/CMakeLists.txt b/projects/compiler-rt/test/asan/CMakeLists.txt
index e6d1df5..0a6124f 100644
--- a/projects/compiler-rt/test/asan/CMakeLists.txt
+++ b/projects/compiler-rt/test/asan/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
 macro(get_bits_for_arch arch bits)
   if (${arch} MATCHES "x86_64|powerpc64|powerpc64le|aarch64|arm64|mips64|mips64el|s390x")
     set(${bits} 64)
-  elseif (${arch} MATCHES "i386|arm|mips|mipsel")
+  elseif (${arch} MATCHES "i586|arm|mips|mipsel")
     set(${bits} 32)
   else()
     message(FATAL_ERROR "Unknown target architecture: ${arch}")
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin