From 1fd45a13dee17701fc0aeaa847c1919d485d09fd Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 23 Aug 2018 11:03:22 -0700 Subject: Fix warnings about the `native` target-cpu This fixes a regression from #53031 where specifying `-C target-cpu=native` is printing a lot of warnings from LLVM about `native` being an unknown CPU. It turns out that `native` is indeed an unknown CPU and we have to perform a mapping to an actual CPU name, but this mapping is only performed in one location rather than all locations we inform LLVM about the target CPU. This commit centralizes the mapping of `native` to LLVM's value of the native CPU, ensuring that all locations we inform LLVM about the `target-cpu` it's never `native`. Closes #53322 --- src/test/run-make-fulldeps/target-cpu-native/Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'src/test') diff --git a/src/test/run-make-fulldeps/target-cpu-native/Makefile b/src/test/run-make-fulldeps/target-cpu-native/Makefile index 0c9d93ecb2a..fee41461612 100644 --- a/src/test/run-make-fulldeps/target-cpu-native/Makefile +++ b/src/test/run-make-fulldeps/target-cpu-native/Makefile @@ -1,5 +1,20 @@ -include ../tools.mk -all: - $(RUSTC) foo.rs -C target-cpu=native +# I *really* don't want to deal with a cross-platform way to compare file sizes, +# tests in `make` sort of are awful +ifeq ($(TARGET),x86_64-unknown-linux-gnu) +all: $(TMPDIR)/out.log + # Make sure no warnings about "unknown CPU `native`" were emitted + if [ "$$(wc -c $(TMPDIR)/out.log | cut -d' ' -f 1)" = "0" ]; then \ + echo no warnings generated; \ + else \ + exit 1; \ + fi +else +all: $(TMPDIR)/out.log +endif + + +$(TMPDIR)/out.log: + $(RUSTC) foo.rs -C target-cpu=native 2>&1 | tee $(TMPDIR)/out.log $(call RUN,foo) -- cgit 1.4.1-3-g733a5