Drop some obsolete stuff

diff --git a/debian/changelog b/debian/changelog
index 848afc46838ee94e2676c07da7cb9b8c76baa88a..bd47728ac01ca61a34f572a4956f9c22ddec3e54 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rustc (1.42.0+dfsg1-2) UNRELEASED; urgency=medium
+
+  * Drop sparc64 workaround. (Closes: #956413)
+  * Drop stack-gap workaround for old kernels and rust versions.
+
+ -- Ximin Luo <infinity0@debian.org>  Sat, 11 Apr 2020 20:36:26 +0100
+
 rustc (1.42.0+dfsg1-1) unstable; urgency=medium
 
   * Upload to unstable.

diff --git a/debian/rules b/debian/rules
index b72983aa2dde6d9d29e3b0e2c675e456892703e4..caab721b1636e17093e26ef9d674bdb2a359d40e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,9 +19,6 @@ RUSTFLAGS = $(addprefix -C link-args=,$(LDFLAGS))
 RUSTFLAGS += --cap-lints warn --remap-path-prefix=$(CURDIR)=/usr/src/rustc-$(RUST_LONG_VERSION)
 export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS RUSTFLAGS
 export CARGO_HOME = $(CURDIR)/debian/cargo
-ifneq (,$(filter $(DEB_BUILD_ARCH), sparc64))
-export CARGO_INCREMENTAL = 0
-endif
 
 # Defines DEB_*_RUST_TYPE triples
 include debian/architecture.mk
@@ -126,10 +123,6 @@ endif
 SRC_CLEAN = src/bootstrap/bootstrap.pyc \
        src/etc/__pycache__/
 
-# Workaround for linux #865549
-ifeq (0,$(shell test $$(uname -s) = "Linux" -a $$(getconf PAGESIZE) -gt 4096; echo $$?))
-  SYSTEM_WORKAROUNDS += ulimit -s $$(expr $$(getconf PAGESIZE) / 1024 '*' 256 + 8192);
-endif
 # Try to work around #933045
 ifneq (,$(filter $(DEB_BUILD_ARCH), mips mipsel))
   SYSTEM_WORKAROUNDS += export MALLOC_ARENA_MAX=1;