]> git.lizzy.rs Git - rust.git/commitdiff
tests: Remove unnecessary `-C relocation-model=dynamic-no-pic`s
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>
Thu, 23 Apr 2020 21:56:19 +0000 (00:56 +0300)
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>
Sun, 26 Apr 2020 08:37:16 +0000 (11:37 +0300)
The referenced `sanitizer-address/Makefile` no longer exists, so perhaps these options are no longer necessary as well.
Even if they are still necessary, they should use `-C relocation-model=static` instead.

src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile
src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile

index 35317dca1e824b5a3b8cf3575991d0618d6cea78..5d46be87eac6b2e3da1763e98461a606610ab412 100644 (file)
@@ -11,10 +11,7 @@ LOG := $(TMPDIR)/log.txt
 # are compiled with address sanitizer, and we assert that a fault in the cdylib
 # is correctly detected.
 
-# See comment in sanitizer-address/Makefile for why this is here
-EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic
-
 all:
-       $(RUSTC) -g -Z sanitizer=address --crate-type cdylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs
-       $(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) $(EXTRA_RUSTFLAG) -llibrary program.rs
+       $(RUSTC) -g -Z sanitizer=address --crate-type cdylib --target $(TARGET) library.rs
+       $(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) -llibrary program.rs
        LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | $(CGREP) stack-buffer-overflow
index 24d2ebd8f48aa00dbe89de9109909822620f04db..f62c3a6654ed414d36b74a7128b03555e0bca91a 100644 (file)
@@ -11,10 +11,7 @@ LOG := $(TMPDIR)/log.txt
 # are compiled with address sanitizer, and we assert that a fault in the dylib
 # is correctly detected.
 
-# See comment in sanitizer-address/Makefile for why this is here
-EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic
-
 all:
-       $(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs
-       $(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) $(EXTRA_RUSTFLAG) -llibrary program.rs
+       $(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) library.rs
+       $(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) -llibrary program.rs
        LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | $(CGREP) stack-buffer-overflow