forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request rust-lang#20699 from vhbit/ios-archs
Better iOS support Reviewed-by: alexcrichton
- Loading branch information
Showing
25 changed files
with
746 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# aarch64-apple-ios configuration | ||
CFG_SDK_NAME_aarch64-apple-ios := iphoneos | ||
CFG_SDK_ARCHS_aarch64-apple-ios := arm64 | ||
ifneq ($(findstring darwin,$(CFG_OSTYPE)),) | ||
CFG_IOS_SDK_aarch64-apple-ios := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null) | ||
CFG_IOS_SDK_FLAGS_aarch64-apple-ios := -target aarch64-apple-darwin -isysroot $(CFG_IOS_SDK_aarch64-apple-ios) -mios-version-min=7.0 -arch arm64 | ||
CC_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos clang) | ||
CXX_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos clang++) | ||
CPP_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos clang++) | ||
AR_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos ar) | ||
endif | ||
CFG_LIB_NAME_aarch64-apple-ios = lib$(1).a | ||
CFG_LIB_GLOB_aarch64-apple-ios = lib$(1)-*.a | ||
CFG_LIB_SKIP_INSTALL_aarch64-apple-ios = 1 #lib$(1)-*.a | ||
CFG_STATIC_LIB_NAME_aarch64-apple-ios=lib$(1).a | ||
CFG_LIB_DSYM_GLOB_aarch64-apple-ios = lib$(1)-*.a.dSYM | ||
CFG_CFLAGS_aarch64-apple-ios := $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios) | ||
CFG_JEMALLOC_CFLAGS_aarch64-apple-ios := $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios) | ||
CFG_GCCISH_CFLAGS_aarch64-apple-ios := -Wall -Werror -fPIC $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios) | ||
CFG_GCCISH_CXXFLAGS_aarch64-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios) -I$(CFG_IOS_SDK_aarch64-apple-ios)/usr/include/c++/4.2.1 | ||
CFG_GCCISH_LINK_FLAGS_aarch64-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_aarch64-apple-ios) -Wl,-no_compact_unwind | ||
CFG_GCCISH_DEF_FLAG_aarch64-apple-ios := -Wl,-exported_symbols_list, | ||
CFG_GCCISH_PRE_LIB_FLAGS_aarch64-apple-ios := | ||
CFG_GCCISH_POST_LIB_FLAGS_aarch64-apple-ios := | ||
CFG_DEF_SUFFIX_aarch64-apple-ios := .darwin.def | ||
CFG_LLC_FLAGS_aarch64-apple-ios := -mattr=+neon,+cyclone,+fp-armv8 | ||
CFG_INSTALL_NAME_aarch64-apple-ios = -Wl,-install_name,@rpath/$(1) | ||
CFG_LIBUV_LINK_FLAGS_aarch64-apple-ios = | ||
CFG_EXE_SUFFIX_aarch64-apple-ios := | ||
CFG_WINDOWSY_aarch64-apple-ios := | ||
CFG_UNIXY_aarch64-apple-ios := 1 | ||
CFG_PATH_MUNGE_aarch64-apple-ios := true | ||
CFG_LDPATH_aarch64-apple-ios := | ||
CFG_RUN_aarch64-apple-ios = $(2) | ||
CFG_RUN_TARG_aarch64-apple-ios = $(call CFG_RUN_aarch64-apple-ios,,$(2)) | ||
CFG_GNU_TRIPLE_aarch64-apple-ios := aarch64-apple-ios |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# armv7-apple-ios configuration | ||
CFG_SDK_NAME_armv7-apple-ios := iphoneos | ||
CFG_SDK_ARCHS_armv7-apple-ios := armv7 | ||
ifneq ($(findstring darwin,$(CFG_OSTYPE)),) | ||
CFG_IOS_SDK_armv7-apple-ios := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null) | ||
CFG_IOS_SDK_FLAGS_armv7-apple-ios := -target armv7-apple-ios -isysroot $(CFG_IOS_SDK_armv7-apple-ios) -mios-version-min=7.0 | ||
CC_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos clang) | ||
CXX_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos clang++) | ||
CPP_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos clang++) | ||
AR_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos ar) | ||
endif | ||
CFG_LIB_NAME_armv7-apple-ios = lib$(1).a | ||
CFG_LIB_GLOB_armv7-apple-ios = lib$(1)-*.a | ||
CFG_LIB_SKIP_INSTALL_armv7-apple-ios = 1 #lib$(1)-*.a | ||
CFG_STATIC_LIB_NAME_armv7-apple-ios=lib$(1).a | ||
CFG_LIB_DSYM_GLOB_armv7-apple-ios = lib$(1)-*.a.dSYM | ||
CFG_JEMALLOC_CFLAGS_armv7-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_SDK_FLAGS_armv7-apple-ios) | ||
CFG_GCCISH_CFLAGS_armv7-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7-apple-ios) -mfpu=vfp3 -arch armv7 | ||
CFG_GCCISH_CXXFLAGS_armv7-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_armv7-apple-ios) -I$(CFG_IOS_SDK_armv7-apple-ios)/usr/include/c++/4.2.1 | ||
CFG_GCCISH_LINK_FLAGS_armv7-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_armv7-apple-ios) -Wl,-no_compact_unwind | ||
CFG_GCCISH_DEF_FLAG_armv7-apple-ios := -Wl,-exported_symbols_list, | ||
CFG_GCCISH_PRE_LIB_FLAGS_armv7-apple-ios := | ||
CFG_GCCISH_POST_LIB_FLAGS_armv7-apple-ios := | ||
CFG_DEF_SUFFIX_armv7-apple-ios := .darwin.def | ||
CFG_LLC_FLAGS_armv7-apple-ios := -mattr=+vfp3,+v7,+neon -march=arm | ||
CFG_INSTALL_NAME_armv7-apple-ios = -Wl,-install_name,@rpath/$(1) | ||
CFG_EXE_SUFFIX_armv7-apple-ios := | ||
CFG_WINDOWSY_armv7-apple-ios := | ||
CFG_UNIXY_armv7-apple-ios := 1 | ||
CFG_PATH_MUNGE_armv7-apple-ios := true | ||
CFG_LDPATH_armv7-apple-ios := | ||
CFG_RUN_armv7-apple-ios = $(2) | ||
CFG_RUN_TARG_armv7-apple-ios = $(call CFG_RUN_armv7-apple-ios,,$(2)) | ||
CFG_GNU_TRIPLE_armv7-apple-ios := armv7-apple-ios |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# armv7s-apple-ios configuration | ||
CFG_SDK_NAME_armv7s-apple-ios := iphoneos | ||
CFG_SDK_ARCHS_armv7s-apple-ios := armv7s | ||
ifneq ($(findstring darwin,$(CFG_OSTYPE)),) | ||
CFG_IOS_SDK_armv7s-apple-ios := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null) | ||
CFG_IOS_SDK_FLAGS_armv7s-apple-ios := -target armv7s-apple-ios -isysroot $(CFG_IOS_SDK_armv7s-apple-ios) -mios-version-min=7.0 | ||
CC_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos clang) | ||
CXX_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos clang++) | ||
CPP_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos clang++) | ||
AR_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos ar) | ||
endif | ||
CFG_LIB_NAME_armv7s-apple-ios = lib$(1).a | ||
CFG_LIB_GLOB_armv7s-apple-ios = lib$(1)-*.a | ||
CFG_LIB_SKIP_INSTALL_armv7s-apple-ios = 1 #lib$(1)-*.a | ||
CFG_STATIC_LIB_NAME_armv7s-apple-ios=lib$(1).a | ||
CFG_LIB_DSYM_GLOB_armv7s-apple-ios = lib$(1)-*.a.dSYM | ||
CFG_JEMALLOC_CFLAGS_armv7s-apple-ios := -arch armv7s -mfpu=vfp4 $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) | ||
CFG_GCCISH_CFLAGS_armv7s-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -mfpu=vfp4 -arch armv7s | ||
CFG_GCCISH_CXXFLAGS_armv7s-apple-ios := -fno-rtti $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios) -I$(CFG_IOS_SDK_armv7s-apple-ios)/usr/include/c++/4.2.1 | ||
CFG_GCCISH_LINK_FLAGS_armv7s-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK_armv7s-apple-ios) -Wl,-no_compact_unwind | ||
CFG_GCCISH_DEF_FLAG_armv7s-apple-ios := -Wl,-exported_symbols_list, | ||
CFG_GCCISH_PRE_LIB_FLAGS_armv7s-apple-ios := | ||
CFG_GCCISH_POST_LIB_FLAGS_armv7s-apple-ios := | ||
CFG_DEF_SUFFIX_armv7s-apple-ios := .darwin.def | ||
CFG_LLC_FLAGS_armv7s-apple-ios := -mattr=+vfp4,+v7,+neon | ||
CFG_INSTALL_NAME_armv7s-apple-ios = -Wl,-install_name,@rpath/$(1) | ||
CFG_EXE_SUFFIX_armv7s-apple-ios := | ||
CFG_WINDOWSY_armv7s-apple-ios := | ||
CFG_UNIXY_armv7s-apple-ios := 1 | ||
CFG_PATH_MUNGE_armv7s-apple-ios := true | ||
CFG_LDPATH_armv7s-apple-ios := | ||
CFG_RUN_armv7s-apple-ios = $(2) | ||
CFG_RUN_TARG_armv7s-apple-ios = $(call CFG_RUN_armv7s-apple-ios,,$(2)) | ||
CFG_GNU_TRIPLE_armv7s-apple-ios := armv7s-apple-ios |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# x86_64-apple-ios configuration | ||
CFG_SDK_NAME_x86_64-apple-ios := iphonesimulator | ||
CFG_SDK_ARCHS_x86_64-apple-ios := x86_64 | ||
ifneq ($(findstring darwin,$(CFG_OSTYPE)),) | ||
CFG_IOSSIM_SDK_x86_64-apple-ios := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null) | ||
CFG_IOSSIM_FLAGS_x86_64-apple-ios := -m64 -target x86_64-apple-ios -isysroot $(CFG_IOSSIM_SDK_x86_64-apple-ios) -mios-simulator-version-min=7.0 | ||
CC_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang) | ||
CXX_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++) | ||
CPP_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++) | ||
AR_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar) | ||
endif | ||
CFG_LIB_NAME_x86_64-apple-ios = lib$(1).a | ||
CFG_LIB_GLOB_x86_64-apple-ios = lib$(1)-*.a | ||
CFG_LIB_SKIP_INSTALL_x86_64-apple-ios = 1 #lib$(1)-*.a | ||
CFG_STATIC_LIB_NAME_x86_64-apple-ios=lib$(1).a | ||
CFG_LIB_DSYM_GLOB_x86_64-apple-ios = lib$(1)-*.a.dSYM | ||
CFG_CFLAGS_x86_64-apple-ios := $(CFG_IOSSIM_FLAGS_x86_64-apple-ios) | ||
CFG_JEMALLOC_CFLAGS_x86_64-apple-ios := $(CFG_IOSSIM_FLAGS_x86_64-apple-ios) | ||
CFG_GCCISH_CFLAGS_x86_64-apple-ios := -Wall -Werror -fPIC $(CFG_IOSSIM_FLAGS_x86_64-apple-ios) | ||
CFG_GCCISH_CXXFLAGS_x86_64-apple-ios := -fno-rtti $(CFG_IOSSIM_FLAGS_x86_64-apple-ios) -I$(CFG_IOSSIM_SDK_x86_64-apple-ios)/usr/include/c++/4.2.1 | ||
CFG_GCCISH_LINK_FLAGS_x86_64-apple-ios := -lpthread -Wl,-no_compact_unwind -m64 -Wl,-syslibroot $(CFG_IOSSIM_SDK_x86_64-apple-ios) | ||
CFG_GCCISH_DEF_FLAG_x86_64-apple-ios := -Wl,-exported_symbols_list, | ||
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-apple-ios := | ||
CFG_GCCISH_POST_LIB_FLAGS_x86_64-apple-ios := | ||
CFG_DEF_SUFFIX_x86_64-apple-ios := .darwin.def | ||
CFG_LLC_FLAGS_x86_64-apple-ios := | ||
CFG_INSTALL_NAME_x86_64-apple-ios = -Wl,-install_name,@rpath/$(1) | ||
CFG_LIBUV_LINK_FLAGS_x86_64-apple-ios := | ||
CFG_EXE_SUFFIX_x86_64-apple-ios := | ||
CFG_WINDOWSY_x86_64-apple-ios := | ||
CFG_UNIXY_x86_64-apple-ios := 1 | ||
CFG_PATH_MUNGE_x86_64-apple-ios := true | ||
CFG_LDPATH_x86_64-apple-ios := | ||
CFG_RUN_x86_64-apple-ios = $(2) | ||
CFG_RUN_TARG_x86_64-apple-ios = $(call CFG_RUN_x86_64-apple-ios,,$(2)) | ||
CFG_GNU_TRIPLE_i386-apple-ios := x86_64-apple-ios |
Submodule compiler-rt
updated
6 files
+3 −3 | Makefile | |
+4 −1 | lib/builtins/CMakeLists.txt | |
+1 −1 | lib/builtins/Makefile.mk | |
+22 −0 | lib/builtins/aarch64/Makefile.mk | |
+4 −0 | lib/builtins/clear_cache.c | |
+8 −2 | make/platform/triple.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
use target::{Target, TargetOptions}; | ||
use super::apple_ios_base::{opts, Arch}; | ||
|
||
pub fn target() -> Target { | ||
Target { | ||
// reference layout: e-m:o-i64:64-i128:128-n32:64-S128 | ||
data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ | ||
i128:128-f32:32:32-f64:64:64-v64:64:64-v128:128:128-\ | ||
a:0:64-n32:64-S128".to_string(), | ||
llvm_target: "arm64-apple-ios".to_string(), | ||
target_endian: "little".to_string(), | ||
target_pointer_width: "64".to_string(), | ||
arch: "aarch64".to_string(), | ||
target_os: "ios".to_string(), | ||
options: TargetOptions { | ||
features: "+neon,+fp-armv8,+cyclone".to_string(), | ||
eliminate_frame_pointer: false, | ||
.. opts(Arch::Arm64) | ||
}, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
use std::io::{Command, IoError, OtherIoError}; | ||
use target::TargetOptions; | ||
|
||
use self::Arch::*; | ||
|
||
#[allow(non_camel_case_types)] | ||
pub enum Arch { | ||
Armv7, | ||
Armv7s, | ||
Arm64, | ||
I386, | ||
X86_64 | ||
} | ||
|
||
impl Arch { | ||
pub fn to_string(&self) -> &'static str { | ||
match self { | ||
&Armv7 => "armv7", | ||
&Armv7s => "armv7s", | ||
&Arm64 => "arm64", | ||
&I386 => "i386", | ||
&X86_64 => "x86_64" | ||
} | ||
} | ||
} | ||
|
||
pub fn get_sdk_root(sdk_name: &str) -> String { | ||
let res = Command::new("xcrun") | ||
.arg("--show-sdk-path") | ||
.arg("-sdk") | ||
.arg(sdk_name) | ||
.spawn() | ||
.and_then(|c| c.wait_with_output()) | ||
.and_then(|output| { | ||
if output.status.success() { | ||
Ok(String::from_utf8(output.output).unwrap()) | ||
} else { | ||
Err(IoError { | ||
kind: OtherIoError, | ||
desc: "process exit with error", | ||
detail: String::from_utf8(output.error).ok()}) | ||
} | ||
}); | ||
|
||
match res { | ||
Ok(output) => output.trim().to_string(), | ||
Err(e) => panic!("failed to get {} SDK path: {}", sdk_name, e) | ||
} | ||
} | ||
|
||
fn pre_link_args(arch: Arch) -> Vec<String> { | ||
let sdk_name = match arch { | ||
Armv7 | Armv7s | Arm64 => "iphoneos", | ||
I386 | X86_64 => "iphonesimulator" | ||
}; | ||
|
||
let arch_name = arch.to_string(); | ||
|
||
vec!["-arch".to_string(), arch_name.to_string(), | ||
"-Wl,-syslibroot".to_string(), get_sdk_root(sdk_name)] | ||
} | ||
|
||
pub fn opts(arch: Arch) -> TargetOptions { | ||
TargetOptions { | ||
dynamic_linking: false, | ||
executables: true, | ||
// Although there is an experimental implementation of LLVM which | ||
// supports SS on armv7 it wasn't approved by Apple, see: | ||
// http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20140505/216350.html | ||
// It looks like it might be never accepted to upstream LLVM. | ||
// | ||
// SS might be also enabled on Arm64 as it has builtin support in LLVM | ||
// but I haven't tested it through yet | ||
morestack: false, | ||
pre_link_args: pre_link_args(arch), | ||
.. super::apple_base::opts() | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.