Advertisement
ionel71089

swift ubuntu 32bit

Nov 22nd, 2017
384
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.50 KB | None | 0 0
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 112b5d6..16db3ba 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -538,12 +538,16 @@
  6.    endif()
  7.  endif()
  8.  
  9. +message(STATUS ">>> CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR})
  10. +
  11.  # If SWIFT_HOST_VARIANT_ARCH not given, try to detect from the CMAKE_SYSTEM_PROCESSOR.
  12.  if(SWIFT_HOST_VARIANT_ARCH)
  13.    set(SWIFT_HOST_VARIANT_ARCH_default, "${SWIFT_HOST_VARIANT_ARCH}")
  14.  else()
  15.    if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
  16.      set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
  17. +  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
  18. +    set(SWIFT_HOST_VARIANT_ARCH_default "i686")
  19.    elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
  20.      set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")
  21.    elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64")
  22. @@ -613,10 +617,14 @@
  23.    set(SWIFT_HOST_VARIANT "linux" CACHE STRING
  24.        "Deployment OS for Swift host tools (the compiler) [linux].")
  25.  
  26. +  message(STATUS ">>> SWIFT_HOST_VARIANT_ARCH: " ${SWIFT_HOST_VARIANT_ARCH})
  27. +
  28.    # Calculate the host triple
  29.    if("${SWIFT_HOST_TRIPLE}" STREQUAL "")
  30.      if("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "x86_64")
  31.        set(SWIFT_HOST_TRIPLE "x86_64-unknown-linux-gnu")
  32. +    elseif("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "i686")
  33. +      set(SWIFT_HOST_TRIPLE "i686-unknown-linux-gnu")
  34.      elseif("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "aarch64")
  35.        set(SWIFT_HOST_TRIPLE "aarch64-unknown-linux-gnu")
  36.      elseif("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "(powerpc64|powerpc64le)")
  37. diff --git a/stdlib/public/SwiftShims/LibcShims.h b/stdlib/public/SwiftShims/LibcShims.h
  38. index e726a62..5fd7826 100644
  39. --- a/stdlib/public/SwiftShims/LibcShims.h
  40. +++ b/stdlib/public/SwiftShims/LibcShims.h
  41. @@ -33,7 +33,9 @@
  42.  
  43.  // This declaration is not universally correct.  We verify its correctness for
  44.  // the current platform in the runtime code.
  45. -#if defined(__linux__) && defined (__arm__)
  46. +#if defined(__linux__) && defined(__arm__)
  47. +typedef           int __swift_ssize_t;
  48. +#elif defined(__linux__) && defined(__i386__)
  49.  typedef           int __swift_ssize_t;
  50.  #elif defined(_WIN32)
  51.  #if defined(_M_ARM) || defined(_M_IX86)
  52. diff --git a/utils/build-script-impl b/utils/build-script-impl
  53. index 1bfbcc5..b058b22 100755
  54. --- a/utils/build-script-impl
  55. +++ b/utils/build-script-impl
  56. @@ -449,6 +449,9 @@
  57.                          --$(tolower "${PLAYGROUNDLOGGER_BUILD_TYPE}")
  58.                      )
  59.                      ;;
  60. +                linux-i686)
  61. +                    SWIFT_HOST_VARIANT_ARCH="i686"
  62. +                    ;;
  63.                  linux-armv6)
  64.                      SWIFT_HOST_VARIANT_ARCH="armv6"
  65.                      SWIFT_HOST_TRIPLE="armv6-unknown-linux-gnueabihf"
  66. diff --git a/utils/swift_build_support/swift_build_support/targets.py b/utils/swift_build_support/swift_build_support/targets.py
  67. index f4b5bb0..690a3d3 100644
  68. --- a/utils/swift_build_support/swift_build_support/targets.py
  69. +++ b/utils/swift_build_support/swift_build_support/targets.py
  70. @@ -112,6 +112,7 @@
  71.                                           is_simulator=True)
  72.  
  73.      Linux = Platform("linux", archs=[
  74. +   "i686",
  75.          "x86_64",
  76.          "armv6",
  77.          "armv7",
  78. @@ -174,6 +175,8 @@
  79.                  return StdlibDeploymentTarget.Linux.powerpc64le
  80.              elif machine == 's390x':
  81.                  return StdlibDeploymentTarget.Linux.s390x
  82. +       elif machine == 'i686':
  83. +       return StdlibDeploymentTarget.Linux.i686
  84.  
  85.          elif system == 'Darwin':
  86.              if machine == 'x86_64':
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement