---

jseyfried · jseyfried · commit bb2ee237e4db · 2016-01-31T02:21:54.000Z
yaml --- r: 274421 b: refs/heads/stable c: 7a69ee0 h: refs/heads/master i: 274419: 7db348b
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 094c5b0d61a0fb19a1cb94dddd6f59a975089b4b
+refs/heads/stable: 7a69ee0c4806d30bbda5cc0277f3d0f38c3266c8
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e
diff --git a/branches/stable/configure b/branches/stable/configure
@@ -1164,7 +1164,7 @@ do
             ;;
 
 
-        x86_64-*-musl)
+        *-musl)
             if [ ! -f $CFG_MUSL_ROOT/lib/libc.a ]
             then
                 err "musl libc $CFG_MUSL_ROOT/lib/libc.a not found"
diff --git a/branches/stable/mk/cfg/armv7-unknown-linux-gnueabihf.mk b/branches/stable/mk/cfg/armv7-unknown-linux-gnueabihf.mk
@@ -8,8 +8,8 @@ CFG_LIB_NAME_armv7-unknown-linux-gnueabihf=lib$(1).so
 CFG_STATIC_LIB_NAME_armv7-unknown-linux-gnueabihf=lib$(1).a
 CFG_LIB_GLOB_armv7-unknown-linux-gnueabihf=lib$(1)-*.so
 CFG_LIB_DSYM_GLOB_armv7-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
-CFG_JEMALLOC_CFLAGS_armv7-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -march=armv7-a
-CFG_GCCISH_CFLAGS_armv7-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) -march=armv7-a
+CFG_JEMALLOC_CFLAGS_armv7-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -march=armv7
+CFG_GCCISH_CFLAGS_armv7-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) -march=armv7
 CFG_GCCISH_CXXFLAGS_armv7-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS)
 CFG_GCCISH_LINK_FLAGS_armv7-unknown-linux-gnueabihf := -shared -fPIC -g
 CFG_GCCISH_DEF_FLAG_armv7-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynamic-list=
diff --git a/branches/stable/mk/cfg/mips-unknown-linux-musl.mk b/branches/stable/mk/cfg/mips-unknown-linux-musl.mk
diff --git a/branches/stable/mk/cfg/mipsel-unknown-linux-musl.mk b/branches/stable/mk/cfg/mipsel-unknown-linux-musl.mk
diff --git a/branches/stable/src/liblibc b/branches/stable/src/liblibc
@@ -1 +1 @@
-Subproject commit 30f70baa6cc1ba3ddebb55b988fafbad0c0cc810
+Subproject commit 91ff43c736de664f8d3cd351e148c09cdea6731e
diff --git a/branches/stable/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs b/branches/stable/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs
@@ -23,7 +23,7 @@ pub fn target() -> Target {
 
         options: TargetOptions {
             features: "+v7,+vfp2,+neon".to_string(),
-            cpu: "cortex-a8".to_string(),
+            cpu: "cortex-a7".to_string(),
             .. base
         }
     }
diff --git a/branches/stable/src/librustc_back/target/mips_unknown_linux_musl.rs b/branches/stable/src/librustc_back/target/mips_unknown_linux_musl.rs
diff --git a/branches/stable/src/librustc_back/target/mipsel_unknown_linux_musl.rs b/branches/stable/src/librustc_back/target/mipsel_unknown_linux_musl.rs
diff --git a/branches/stable/src/librustc_back/target/mod.rs b/branches/stable/src/librustc_back/target/mod.rs
@@ -420,8 +420,6 @@ impl Target {
             armv7_unknown_linux_gnueabihf,
             aarch64_unknown_linux_gnu,
             x86_64_unknown_linux_musl,
-            mips_unknown_linux_musl,
-            mipsel_unknown_linux_musl,
 
             i686_linux_android,
             arm_linux_androideabi,
diff --git a/branches/stable/src/librustc_resolve/resolve_imports.rs b/branches/stable/src/librustc_resolve/resolve_imports.rs
@@ -798,9 +798,6 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
                 dest_import_resolution.is_public = is_public;
                 self.add_export(module_, name, &dest_import_resolution);
             }
-        } else {
-            // FIXME #30159: This is required for backwards compatability.
-            dest_import_resolution.is_public |= is_public;
         }
 
         self.check_for_conflicts_between_imports_and_items(module_,
diff --git a/branches/stable/src/libstd/os/linux/raw.rs b/branches/stable/src/libstd/os/linux/raw.rs
@@ -93,20 +93,11 @@ mod arch {
     use os::raw::{c_long, c_ulong};
     use os::unix::raw::{gid_t, uid_t};
 
-    #[cfg(target_env = "musl")]
-    #[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = i64;
-    #[cfg(not(target_env = "musl"))]
     #[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = i32;
     #[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = i32;
-    #[cfg(target_env = "musl")]
-    #[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = u64;
-    #[cfg(not(target_env = "musl"))]
     #[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = u32;
     #[stable(feature = "raw_ext", since = "1.1.0")] pub type nlink_t = u32;
-    #[cfg(target_env = "musl")]
     #[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = i32;
-    #[cfg(not(target_env = "musl"))]
-    #[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = i64;
     #[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i32;
 
     #[repr(C)]
diff --git a/branches/stable/src/libstd/sys/common/libunwind.rs b/branches/stable/src/libstd/sys/common/libunwind.rs
@@ -101,10 +101,9 @@ pub type _Unwind_Exception_Cleanup_Fn =
                       exception: *mut _Unwind_Exception);
 
 #[cfg_attr(any(all(target_os = "linux", not(target_env = "musl")),
-               target_os = "freebsd",
-               all(target_os = "linux", target_env = "musl", not(target_arch = "x86_64"))),
+               target_os = "freebsd"),
            link(name = "gcc_s"))]
-#[cfg_attr(all(target_os = "linux", target_env = "musl", target_arch = "x86_64", not(test)),
+#[cfg_attr(all(target_os = "linux", target_env = "musl", not(test)),
            link(name = "unwind", kind = "static"))]
 #[cfg_attr(any(target_os = "android", target_os = "openbsd"),
            link(name = "gcc"))]
diff --git a/branches/stable/src/test/compile-fail/shadowed-use-visibility.rs b/branches/stable/src/test/compile-fail/shadowed-use-visibility.rs
@@ -17,6 +17,10 @@ mod foo {
 
 mod bar {
     use foo::bar::f as g; //~ ERROR unresolved import
+
+    use foo as f;
+    pub use foo::*;
 }
 
+use bar::f::f; //~ ERROR unresolved import
 fn main() {}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit 30f70baa6cc1ba3ddebb55b988fafbad0c0cc810`
	`1`	`+Subproject commit 91ff43c736de664f8d3cd351e148c09cdea6731e`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ pub fn target() -> Target {`
`23`	`23`
`24`	`24`	`options: TargetOptions {`
`25`	`25`	`features: "+v7,+vfp2,+neon".to_string(),`
`26`		`- cpu: "cortex-a8".to_string(),`
	`26`	`+ cpu: "cortex-a7".to_string(),`
`27`	`27`	`.. base`
`28`	`28`	`}`
`29`	`29`	`}`