From d133519ed43dc262a656eaed1ce39a4cc6760503 Mon Sep 17 00:00:00 2001 From: Kenneth Adam Miller Date: Wed, 3 Aug 2016 11:29:51 -0400 Subject: [PATCH 1/5] Add tested uclibc target --- mk/cfg/x86_64-unknown-linux-uclibc.mk | 29 +++++++++++++++++++ src/librustc_back/target/mod.rs | 1 + .../target/x86_64_unknown_linux_uclibc.rs | 19 ++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 mk/cfg/x86_64-unknown-linux-uclibc.mk create mode 100644 src/librustc_back/target/x86_64_unknown_linux_uclibc.rs diff --git a/mk/cfg/x86_64-unknown-linux-uclibc.mk b/mk/cfg/x86_64-unknown-linux-uclibc.mk new file mode 100644 index 0000000000000..36aaedae7c5ce --- /dev/null +++ b/mk/cfg/x86_64-unknown-linux-uclibc.mk @@ -0,0 +1,29 @@ +# x86_64-unknown-linux-uclibc configuration +CC_x86_64-unknown-linux-uclibc=$(CFG_UCLIBC_ROOT)/bin/uclibc-gcc +CXX_x86_64-unknown-linux-uclibc=notaprogram +CPP_x86_64-unknown-linux-uclibc=$(CFG_UCLIBC_ROOT)/bin/uclibc-gcc -E +AR_x86_64-unknown-linux-uclibc=$(AR) +CFG_INSTALL_ONLY_RLIB_x86_64-unknown-linux-uclibc = 1 +CFG_LIB_NAME_x86_64-unknown-linux-uclibc=lib$(1).so +CFG_STATIC_LIB_NAME_x86_64-unknown-linux-uclibc=lib$(1).a +CFG_LIB_GLOB_x86_64-unknown-linux-uclibc=lib$(1)-*.so +CFG_JEMALLOC_CFLAGS_x86_64-unknown-linux-uclibc := -m64 +CFG_GCCISH_CFLAGS_x86_64-unknown-linux-uclibc := -Wall -Werror -g -fPIC -m64 +CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-uclibc := +CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-uclibc := +CFG_GCCISH_DEF_FLAG_x86_64-unknown-linux-uclibc := +CFG_LLC_FLAGS_x86_64-unknown-linux-uclibc := +CFG_INSTALL_NAME_x86_64-unknown-linux-uclibc = +CFG_EXE_SUFFIX_x86_64-unknown-linux-uclibc = +CFG_WINDOWSY_x86_64-unknown-linux-uclibc := +CFG_UNIXY_x86_64-unknown-linux-uclibc := 1 +CFG_LDPATH_x86_64-unknown-linux-uclibc := +CFG_RUN_x86_64-unknown-linux-uclibc=$(2) +CFG_RUN_TARG_x86_64-unknown-linux-uclibc=$(call CFG_RUN_x86_64-unknown-linux-uclibc,,$(2)) +CFG_GNU_TRIPLE_x86_64-unknown-linux-uclibc := x86_64-unknown-linux-uclibc +CFG_THIRD_PARTY_OBJECTS_x86_64-unknown-linux-uclibc := crt1.o crti.o crtn.o +CFG_INSTALLED_OBJECTS_x86_64-unknown-linux-uclibc := crt1.o crti.o crtn.o + +NATIVE_DEPS_libc_T_x86_64-unknown-linux-uclibc += libc.a +NATIVE_DEPS_std_T_x86_64-unknown-linux-uclibc += crt1.o crti.o crtn.o +NATIVE_DEPS_unwind_T_x86_64-unknown-linux-uclibc += libunwind.a diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index 3d24fd8ab67e4..da92b0a07daeb 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -143,6 +143,7 @@ supported_targets! { ("i686-unknown-linux-musl", i686_unknown_linux_musl), ("mips-unknown-linux-musl", mips_unknown_linux_musl), ("mipsel-unknown-linux-musl", mipsel_unknown_linux_musl), + ("x86_64-unknown-linux-uclibc", x86_64_unknown_linux_uclibc), ("i686-linux-android", i686_linux_android), ("arm-linux-androideabi", arm_linux_androideabi), diff --git a/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs new file mode 100644 index 0000000000000..d52b15a96962a --- /dev/null +++ b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs @@ -0,0 +1,19 @@ +use target::Target; + +pub fn target() -> Target { + let mut base = super::linux_base::opts(); + base.cpu = "x86-64".to_string(); + base.max_atomic_width = 64; + base.pre_link_args.push("-m64".to_string()); + Target { + llvm_target: "x86_64-unknown-linux-uclibc".to_string(), + data_layout: "e-m:e-i64:64-f80:128-n8:16:32:64-S128".to_string(), + target_endian: "little".to_string(), + target_pointer_width: "64".to_string(), + arch: "x86_64".to_string(), + target_os: "linux".to_string(), + target_env: "uclibc".to_string(), + target_vendor: "unknown".to_string(), + options: base, + } +} From 64a1a13405b41722033f3dee0554e6148c7450c5 Mon Sep 17 00:00:00 2001 From: Kenneth Adam Miller Date: Wed, 3 Aug 2016 12:26:25 -0400 Subject: [PATCH 2/5] correct license for travis build --- .../target/x86_64_unknown_linux_uclibc.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs index d52b15a96962a..1285a8fea8110 100644 --- a/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs +++ b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs @@ -1,3 +1,13 @@ +// 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 { From 3b001eeb3537742e12e0aeae774e7edf9f62a7be Mon Sep 17 00:00:00 2001 From: Kenneth Adam Miller Date: Wed, 3 Aug 2016 12:37:18 -0400 Subject: [PATCH 3/5] Add requested changes, will test in new docker instance --- mk/cfg/x86_64-unknown-linux-uclibc.mk | 6 +++--- src/librustc_back/target/x86_64_unknown_linux_uclibc.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/cfg/x86_64-unknown-linux-uclibc.mk b/mk/cfg/x86_64-unknown-linux-uclibc.mk index 36aaedae7c5ce..ec1fcbad85003 100644 --- a/mk/cfg/x86_64-unknown-linux-uclibc.mk +++ b/mk/cfg/x86_64-unknown-linux-uclibc.mk @@ -21,9 +21,9 @@ CFG_LDPATH_x86_64-unknown-linux-uclibc := CFG_RUN_x86_64-unknown-linux-uclibc=$(2) CFG_RUN_TARG_x86_64-unknown-linux-uclibc=$(call CFG_RUN_x86_64-unknown-linux-uclibc,,$(2)) CFG_GNU_TRIPLE_x86_64-unknown-linux-uclibc := x86_64-unknown-linux-uclibc -CFG_THIRD_PARTY_OBJECTS_x86_64-unknown-linux-uclibc := crt1.o crti.o crtn.o +#CFG_THIRD_PARTY_OBJECTS_x86_64-unknown-linux-uclibc := crt1.o crti.o crtn.o CFG_INSTALLED_OBJECTS_x86_64-unknown-linux-uclibc := crt1.o crti.o crtn.o -NATIVE_DEPS_libc_T_x86_64-unknown-linux-uclibc += libc.a +#NATIVE_DEPS_libc_T_x86_64-unknown-linux-uclibc += libc.a NATIVE_DEPS_std_T_x86_64-unknown-linux-uclibc += crt1.o crti.o crtn.o -NATIVE_DEPS_unwind_T_x86_64-unknown-linux-uclibc += libunwind.a +#NATIVE_DEPS_unwind_T_x86_64-unknown-linux-uclibc += libunwind.a diff --git a/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs index 1285a8fea8110..bf1b67cb0485a 100644 --- a/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs +++ b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs @@ -22,7 +22,7 @@ pub fn target() -> Target { target_pointer_width: "64".to_string(), arch: "x86_64".to_string(), target_os: "linux".to_string(), - target_env: "uclibc".to_string(), + //target_env: "uclibc".to_string(), target_vendor: "unknown".to_string(), options: base, } From 577a30b19dc16c710a30bd3b000006a05b2dd7ca Mon Sep 17 00:00:00 2001 From: Kenneth Adam Miller Date: Wed, 3 Aug 2016 13:30:26 -0400 Subject: [PATCH 4/5] Revert uclibc target env, need to add to libc --- src/librustc_back/target/x86_64_unknown_linux_uclibc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs index bf1b67cb0485a..1285a8fea8110 100644 --- a/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs +++ b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs @@ -22,7 +22,7 @@ pub fn target() -> Target { target_pointer_width: "64".to_string(), arch: "x86_64".to_string(), target_os: "linux".to_string(), - //target_env: "uclibc".to_string(), + target_env: "uclibc".to_string(), target_vendor: "unknown".to_string(), options: base, } From 67e7e44d4e408e55952f754d1fa8b2cbc5e0fc5f Mon Sep 17 00:00:00 2001 From: Kenneth Adam Miller Date: Wed, 3 Aug 2016 14:23:24 -0400 Subject: [PATCH 5/5] Rebasing changes onto upstream rust/master failed. The new type expected from each target is now TargetResult, which I didn't expect to change. This fixes the compile error. --- src/librustc_back/target/x86_64_unknown_linux_uclibc.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs index 1285a8fea8110..51bb86ec5ee02 100644 --- a/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs +++ b/src/librustc_back/target/x86_64_unknown_linux_uclibc.rs @@ -8,14 +8,14 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use target::Target; +use target::{Target, TargetResult}; -pub fn target() -> Target { +pub fn target() -> TargetResult { let mut base = super::linux_base::opts(); base.cpu = "x86-64".to_string(); base.max_atomic_width = 64; base.pre_link_args.push("-m64".to_string()); - Target { + Ok(Target { llvm_target: "x86_64-unknown-linux-uclibc".to_string(), data_layout: "e-m:e-i64:64-f80:128-n8:16:32:64-S128".to_string(), target_endian: "little".to_string(), @@ -25,5 +25,5 @@ pub fn target() -> Target { target_env: "uclibc".to_string(), target_vendor: "unknown".to_string(), options: base, - } + }) }