Skip to content

Commit

Permalink
Add the PNaCl/JS targets to the backend.
Browse files Browse the repository at this point in the history
  • Loading branch information
DiamondLovesYou committed Oct 22, 2015
1 parent d3f4978 commit e497d4a
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 2 deletions.
41 changes: 41 additions & 0 deletions src/librustc_back/target/le32_unknown_nacl.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2015 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 super::{Target, TargetOptions};

pub fn target() -> Target {
let opts = TargetOptions {
linker: "pnacl-clang".to_string(),
ar: "pnacl-ar".to_string(),

pre_link_args: vec!("--pnacl-exceptions=sjlj".to_string(),
"--target=le32-unknown-nacl".to_string(),
"-Wl,--start-group".to_string()),
post_link_args: vec!("-Wl,--end-group".to_string()),
dynamic_linking: false,
executables: true,
exe_suffix: ".pexe".to_string(),
no_compiler_rt: false,
linker_is_gnu: true,
allow_asm: false,
archive_format: "gnu".to_string(),
.. Default::default()
};
Target {
llvm_target: "le32-unknown-nacl".to_string(),
target_endian: "little".to_string(),
target_pointer_width: "32".to_string(),
target_os: "nacl".to_string(),
target_env: "newlib".to_string(),
target_vendor: "unknown".to_string(),
arch: "le32".to_string(),
options: opts,
}
}
4 changes: 3 additions & 1 deletion src/librustc_back/target/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,9 @@ impl Target {
i686_pc_windows_gnu,

x86_64_pc_windows_msvc,
i686_pc_windows_msvc
i686_pc_windows_msvc,

le32_unknown_nacl
);


Expand Down
1 change: 0 additions & 1 deletion src/librustc_trans/trans/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,6 @@ fn declare_intrinsic(ccx: &CrateContext, key: &str) -> Option<ValueRef> {

ifn!("llvm.trap", fn() -> void);
ifn!("llvm.debugtrap", fn() -> void);
ifn!("llvm.frameaddress", fn(t_i32) -> i8p);

ifn!("llvm.powi.f32", fn(t_f32, t_i32) -> t_f32);
ifn!("llvm.powi.f64", fn(t_f64, t_i32) -> t_f64);
Expand Down

0 comments on commit e497d4a

Please sign in to comment.