Auto merge of #43634 - dhduvall:solaris-test-fixes, r=sanxiyn

Fix a number of failing tests on Solaris and SPARC

Author: bors

src/libstd/sys/unix/fs.rs

@@ -284,12 +284,7 @@ impl DirEntry {
         lstat(&self.path())
     }
 
-    #[cfg(target_os = "solaris")]
-    pub fn file_type(&self) -> io::Result<FileType> {
-        stat(&self.path()).map(|m| m.file_type())
-    }
-
-    #[cfg(target_os = "haiku")]
+    #[cfg(any(target_os = "solaris", target_os = "haiku"))]
     pub fn file_type(&self) -> io::Result<FileType> {
         lstat(&self.path()).map(|m| m.file_type())
     }

src/test/compile-fail/asm-bad-clobber.rs

@@ -14,6 +14,7 @@
 // ignore-s390x
 // ignore-emscripten
 // ignore-powerpc
+// ignore-sparc
 
 #![feature(asm, rustc_attrs)]
 

src/test/compile-fail/asm-in-bad-modifier.rs

@@ -11,6 +11,7 @@
 // ignore-s390x
 // ignore-emscripten
 // ignore-powerpc
+// ignore-sparc
 
 #![feature(asm)]
 

src/test/compile-fail/asm-misplaced-option.rs

@@ -14,6 +14,7 @@
 // ignore-s390x
 // ignore-emscripten
 // ignore-powerpc
+// ignore-sparc
 
 #![feature(asm, rustc_attrs)]
 

src/test/compile-fail/asm-out-assign-imm.rs

@@ -11,6 +11,7 @@
 // ignore-s390x
 // ignore-emscripten
 // ignore-powerpc
+// ignore-sparc
 
 #![feature(asm)]
 

src/test/compile-fail/asm-out-no-modifier.rs

@@ -11,6 +11,7 @@
 // ignore-s390x
 // ignore-emscripten
 // ignore-powerpc
+// ignore-sparc
 
 #![feature(asm)]
 

src/test/compile-fail/asm-out-read-uninit.rs

@@ -11,6 +11,7 @@
 // ignore-s390x
 // ignore-emscripten
 // ignore-powerpc
+// ignore-sparc
 
 #![feature(asm)]
 

src/test/run-make/codegen-options-parsing/Makefile

@@ -25,7 +25,7 @@ all:
 
 	# Should not link dead code...
 	$(RUSTC) -Z print-link-args dummy.rs 2>&1 | \
-		grep -e '--gc-sections' -e '-dead_strip' -e '/OPT:REF'
+		grep -e '--gc-sections' -e '-z[^ ]* [^ ]*\<ignore\>' -e '-dead_strip' -e '/OPT:REF'
 	# ... unless you specifically ask to keep it
 	$(RUSTC) -Z print-link-args -C link-dead-code dummy.rs 2>&1 | \
-		(! grep -e '--gc-sections' -e '-dead_strip' -e '/OPT:REF')
+		(! grep -e '--gc-sections' -e '-z[^ ]* [^ ]*\<ignore\>' -e '-dead_strip' -e '/OPT:REF')

src/test/run-make/tools.mk

@@ -82,7 +82,7 @@ ifeq ($(UNAME),Bitrig)
 	EXTRACXXFLAGS := -lc++ -lc++abi
 else
 ifeq ($(UNAME),SunOS)
-	EXTRACFLAGS := -lm -lpthread -lposix4 -lsocket
+	EXTRACFLAGS := -lm -lpthread -lposix4 -lsocket -lresolv
 else
 ifeq ($(UNAME),OpenBSD)
 	EXTRACFLAGS := -lm -lpthread

src/test/run-pass/conditional-compile-arch.rs

@@ -39,3 +39,6 @@ pub fn main() { }
 
 #[cfg(target_arch = "wasm32")]
 pub fn main() { }
+
+#[cfg(target_arch = "sparc64")]
+pub fn main() { }