Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/CMakeLists.txt b/CMakeLists.txt
- index 112b5d6..16db3ba 100644
- --- a/CMakeLists.txt
- +++ b/CMakeLists.txt
- @@ -538,12 +538,16 @@
- endif()
- endif()
- +message(STATUS ">>> CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR})
- +
- # If SWIFT_HOST_VARIANT_ARCH not given, try to detect from the CMAKE_SYSTEM_PROCESSOR.
- if(SWIFT_HOST_VARIANT_ARCH)
- set(SWIFT_HOST_VARIANT_ARCH_default, "${SWIFT_HOST_VARIANT_ARCH}")
- else()
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
- set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
- + elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
- + set(SWIFT_HOST_VARIANT_ARCH_default "i686")
- elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
- set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")
- elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64")
- @@ -613,10 +617,14 @@
- set(SWIFT_HOST_VARIANT "linux" CACHE STRING
- "Deployment OS for Swift host tools (the compiler) [linux].")
- + message(STATUS ">>> SWIFT_HOST_VARIANT_ARCH: " ${SWIFT_HOST_VARIANT_ARCH})
- +
- # Calculate the host triple
- if("${SWIFT_HOST_TRIPLE}" STREQUAL "")
- if("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "x86_64")
- set(SWIFT_HOST_TRIPLE "x86_64-unknown-linux-gnu")
- + elseif("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "i686")
- + set(SWIFT_HOST_TRIPLE "i686-unknown-linux-gnu")
- elseif("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "aarch64")
- set(SWIFT_HOST_TRIPLE "aarch64-unknown-linux-gnu")
- elseif("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "(powerpc64|powerpc64le)")
- diff --git a/stdlib/public/SwiftShims/LibcShims.h b/stdlib/public/SwiftShims/LibcShims.h
- index e726a62..5fd7826 100644
- --- a/stdlib/public/SwiftShims/LibcShims.h
- +++ b/stdlib/public/SwiftShims/LibcShims.h
- @@ -33,7 +33,9 @@
- // This declaration is not universally correct. We verify its correctness for
- // the current platform in the runtime code.
- -#if defined(__linux__) && defined (__arm__)
- +#if defined(__linux__) && defined(__arm__)
- +typedef int __swift_ssize_t;
- +#elif defined(__linux__) && defined(__i386__)
- typedef int __swift_ssize_t;
- #elif defined(_WIN32)
- #if defined(_M_ARM) || defined(_M_IX86)
- diff --git a/utils/build-script-impl b/utils/build-script-impl
- index 1bfbcc5..b058b22 100755
- --- a/utils/build-script-impl
- +++ b/utils/build-script-impl
- @@ -449,6 +449,9 @@
- --$(tolower "${PLAYGROUNDLOGGER_BUILD_TYPE}")
- )
- ;;
- + linux-i686)
- + SWIFT_HOST_VARIANT_ARCH="i686"
- + ;;
- linux-armv6)
- SWIFT_HOST_VARIANT_ARCH="armv6"
- SWIFT_HOST_TRIPLE="armv6-unknown-linux-gnueabihf"
- diff --git a/utils/swift_build_support/swift_build_support/targets.py b/utils/swift_build_support/swift_build_support/targets.py
- index f4b5bb0..690a3d3 100644
- --- a/utils/swift_build_support/swift_build_support/targets.py
- +++ b/utils/swift_build_support/swift_build_support/targets.py
- @@ -112,6 +112,7 @@
- is_simulator=True)
- Linux = Platform("linux", archs=[
- + "i686",
- "x86_64",
- "armv6",
- "armv7",
- @@ -174,6 +175,8 @@
- return StdlibDeploymentTarget.Linux.powerpc64le
- elif machine == 's390x':
- return StdlibDeploymentTarget.Linux.s390x
- + elif machine == 'i686':
- + return StdlibDeploymentTarget.Linux.i686
- elif system == 'Darwin':
- if machine == 'x86_64':
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement