Skip to content

Commit

Permalink
Add support for target-cpu=native
Browse files Browse the repository at this point in the history
  • Loading branch information
Julian Orth committed Mar 10, 2015
1 parent 638832e commit 660b48f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/rustllvm/PassWrapper.cpp
Expand Up @@ -14,6 +14,7 @@

#include "llvm/Support/CBindingWrapping.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Host.h"
#include "llvm/Target/TargetLibraryInfo.h"
#include "llvm/Transforms/IPO/PassManagerBuilder.h"

Expand Down Expand Up @@ -83,6 +84,11 @@ LLVMRustCreateTargetMachine(const char *triple,
return NULL;
}

StringRef real_cpu = cpu;
if (real_cpu == "native") {
real_cpu = sys::getHostCPUName();
}

TargetOptions Options;
Options.PositionIndependentExecutable = PositionIndependentExecutable;
Options.NoFramePointerElim = NoFramePointerElim;
Expand All @@ -96,7 +102,7 @@ LLVMRustCreateTargetMachine(const char *triple,
}

TargetMachine *TM = TheTarget->createTargetMachine(Trip.getTriple(),
cpu,
real_cpu,
feature,
Options,
RM,
Expand Down
5 changes: 5 additions & 0 deletions src/test/run-make/target-cpu-native/Makefile
@@ -0,0 +1,5 @@
-include ../tools.mk

all:
$(RUSTC) foo.rs -C target-cpu=native
$(call RUN,foo)
12 changes: 12 additions & 0 deletions src/test/run-make/target-cpu-native/foo.rs
@@ -0,0 +1,12 @@
// 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.

fn main() {
}

0 comments on commit 660b48f

Please sign in to comment.