From baa4ebc11902f7c06aff2a63c0cd9828cdc9e968 Mon Sep 17 00:00:00 2001 From: Michael Neumann Date: Thu, 3 Sep 2015 16:37:53 +0200 Subject: [PATCH 1/2] Drop 32-bit architecture (i686) support for DragonFly. DragonFly no longer supports this architecture since 4.0. --- .../target/i686_unknown_dragonfly.rs | 27 ------------------- src/librustc_back/target/mod.rs | 1 - 2 files changed, 28 deletions(-) delete mode 100644 src/librustc_back/target/i686_unknown_dragonfly.rs diff --git a/src/librustc_back/target/i686_unknown_dragonfly.rs b/src/librustc_back/target/i686_unknown_dragonfly.rs deleted file mode 100644 index f2478e6d0dbfe..0000000000000 --- a/src/librustc_back/target/i686_unknown_dragonfly.rs +++ /dev/null @@ -1,27 +0,0 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -use target::Target; - -pub fn target() -> Target { - let mut base = super::dragonfly_base::opts(); - base.cpu = "pentium4".to_string(); - base.pre_link_args.push("-m32".to_string()); - - Target { - llvm_target: "i686-unknown-dragonfly".to_string(), - target_endian: "little".to_string(), - target_pointer_width: "32".to_string(), - arch: "x86".to_string(), - target_os: "dragonfly".to_string(), - target_env: "".to_string(), - options: base, - } -} diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index 1f3b823d008d5..e2c3ab08af825 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -384,7 +384,6 @@ impl Target { i686_unknown_freebsd, x86_64_unknown_freebsd, - i686_unknown_dragonfly, x86_64_unknown_dragonfly, x86_64_unknown_bitrig, From 89e9234181172523107b062a6988df3e40bd7872 Mon Sep 17 00:00:00 2001 From: Michael Neumann Date: Thu, 3 Sep 2015 22:44:57 +0200 Subject: [PATCH 2/2] DragonFly: Remove target options which are not required Our options now matches those of freebsd_base.rs. --- src/librustc_back/target/dragonfly_base.rs | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/librustc_back/target/dragonfly_base.rs b/src/librustc_back/target/dragonfly_base.rs index 716d61c295813..a5807d2787fdd 100644 --- a/src/librustc_back/target/dragonfly_base.rs +++ b/src/librustc_back/target/dragonfly_base.rs @@ -16,20 +16,10 @@ pub fn opts() -> TargetOptions { linker: "cc".to_string(), dynamic_linking: true, executables: true, - linker_is_gnu: true, has_rpath: true, - pre_link_args: vec!( - "-L/usr/local/lib".to_string(), - "-L/usr/lib/gcc47".to_string(), - // GNU-style linkers will use this to omit linking to libraries - // which don't actually fulfill any relocations, but only for - // libraries which follow this flag. Thus, use it before - // specifying libraries to link to. - "-Wl,--as-needed".to_string(), - ), - position_independent_executables: true, archive_format: "gnu".to_string(), exe_allocation_crate: super::best_allocator(), + .. Default::default() } }