[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: Revert "debian/sysdeps/mips{n32, }{r6, }{el, }.mk: build with --param ggc-min-expand=10 to avoid virtual memory exhaustion when compiling test-tgmath3.o."



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.27
in repository glibc.

commit a7b899c1ee8f1e0d309d81c94c9176772f7a6e66
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Tue Jan 30 06:36:29 2018 +0100

    Revert "debian/sysdeps/mips{n32,}{r6,}{el,}.mk: build with --param ggc-min-expand=10 to avoid virtual memory exhaustion when compiling test-tgmath3.o."
    
    This reverts commit 60f9422a38f3c8f3e53bb2a0aa30978be4e6848e. That was a
    previous try, which does not the right thing when cross-compiling.
---
 debian/changelog              | 3 ---
 debian/sysdeps/mips.mk        | 2 +-
 debian/sysdeps/mipsel.mk      | 2 +-
 debian/sysdeps/mipsn32.mk     | 6 +++---
 debian/sysdeps/mipsn32el.mk   | 2 +-
 debian/sysdeps/mipsn32r6.mk   | 6 +++---
 debian/sysdeps/mipsn32r6el.mk | 2 +-
 debian/sysdeps/mipsr6.mk      | 2 +-
 debian/sysdeps/mipsr6el.mk    | 2 +-
 9 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b3e49c..8996b2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,9 +19,6 @@ glibc (2.26.9000+20180127.7e23a7dd-0experimental1) UNRELEASED; urgency=medium
   * debian/testsuite-xfail-debian.mk: Remove ABI list blacklist.
 
   [ Aurelien Jarno ]
-  * debian/sysdeps/mips{n32,}{r6,}{el,}.mk: build with --param
-    ggc-min-expand=10 to avoid virtual memory exhaustion when compiling
-    test-tgmath3.o.
   * debian/rules: tweak GCC garbage collector on 32-bit MIPS builders.
 
  -- Samuel Thibault <sthibault@debian.org>  Sun, 28 Jan 2018 10:53:21 +0100
diff --git a/debian/sysdeps/mips.mk b/debian/sysdeps/mips.mk
index 3d9db12..28ac1fd 100644
--- a/debian/sysdeps/mips.mk
+++ b/debian/sysdeps/mips.mk
@@ -1,5 +1,5 @@
 # configuration options for all flavours
-extra_cflags = -mno-plt --param ggc-min-expand=10
+extra_cflags = -mno-plt
 
 # multilib flavours
 ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
diff --git a/debian/sysdeps/mipsel.mk b/debian/sysdeps/mipsel.mk
index 7d08f7e..ec21e47 100644
--- a/debian/sysdeps/mipsel.mk
+++ b/debian/sysdeps/mipsel.mk
@@ -1,5 +1,5 @@
 # configuration options for all flavours
-extra_cflags = -mno-plt --param ggc-min-expand=10
+extra_cflags = -mno-plt
 
 # multilib flavours
 ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
diff --git a/debian/sysdeps/mipsn32.mk b/debian/sysdeps/mipsn32.mk
index da76cb7..50bce13 100644
--- a/debian/sysdeps/mipsn32.mk
+++ b/debian/sysdeps/mipsn32.mk
@@ -1,5 +1,5 @@
 # configuration options for all flavours
-extra_cflags = -mno-plt --param ggc-min-expand=10
+extra_cflags = -mno-plt
 
 # main library
 libc_rtlddir = /lib32
@@ -12,7 +12,7 @@ GLIBC_PASSES += mips64
 DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
 libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
 mips64_configure_target = mips64-linux-gnuabi64
-mips64_extra_cflags = -mno-plt --param ggc-min-expand=10
+mips64_extra_cflags = -mno-plt
 mips64_CC = $(CC) -mabi=64
 mips64_CXX = $(CXX) -mabi=64
 mips64_rtlddir = /lib64
@@ -24,7 +24,7 @@ GLIBC_PASSES += mips32
 DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
 libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
 mips32_configure_target = mips-linux-gnu
-mips32_extra_cflags = -mno-plt --param ggc-min-expand=10
+mips32_extra_cflags = -mno-plt
 mips32_CC = $(CC) -mabi=32
 mips32_CXX = $(CXX) -mabi=32
 mips32_rtlddir = /lib
diff --git a/debian/sysdeps/mipsn32el.mk b/debian/sysdeps/mipsn32el.mk
index efd0d74..79585e7 100644
--- a/debian/sysdeps/mipsn32el.mk
+++ b/debian/sysdeps/mipsn32el.mk
@@ -1,5 +1,5 @@
 # configuration options for all flavours
-extra_cflags = -mno-plt --param ggc-min-expand=10
+extra_cflags = -mno-plt
 
 # main library
 libc_rtlddir = /lib32
diff --git a/debian/sysdeps/mipsn32r6.mk b/debian/sysdeps/mipsn32r6.mk
index 7d79775..7967578 100644
--- a/debian/sysdeps/mipsn32r6.mk
+++ b/debian/sysdeps/mipsn32r6.mk
@@ -1,5 +1,5 @@
 # configuration options for all flavours
-extra_cflags = -mno-plt --param ggc-min-expand=10
+extra_cflags = -mno-plt
 
 # main library
 libc_rtlddir = /lib32
@@ -12,7 +12,7 @@ GLIBC_PASSES += mips64
 DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
 libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
 mips64_configure_target = mipsisa64r6-linux-gnuabi64
-mips64_extra_cflags = -mno-plt --param ggc-min-expand=10
+mips64_extra_cflags = -mno-plt
 mips64_CC = $(CC) -mabi=64
 mips64_CXX = $(CXX) -mabi=64
 mips64_rtlddir = /lib64
@@ -24,7 +24,7 @@ GLIBC_PASSES += mips32
 DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
 libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
 mips32_configure_target = mipsisa32r6-linux-gnu
-mips32_extra_cflags = -mno-plt --param ggc-min-expand=10
+mips32_extra_cflags = -mno-plt
 mips32_CC = $(CC) -mabi=32
 mips32_CXX = $(CXX) -mabi=32
 mips32_rtlddir = /lib
diff --git a/debian/sysdeps/mipsn32r6el.mk b/debian/sysdeps/mipsn32r6el.mk
index e5006fe..9c345cd 100644
--- a/debian/sysdeps/mipsn32r6el.mk
+++ b/debian/sysdeps/mipsn32r6el.mk
@@ -1,5 +1,5 @@
 # configuration options for all flavours
-extra_cflags = -mno-plt --param ggc-min-expand=10
+extra_cflags = -mno-plt
 
 # main library
 libc_rtlddir = /lib32
diff --git a/debian/sysdeps/mipsr6.mk b/debian/sysdeps/mipsr6.mk
index 0b6e4b6..6e71b82 100644
--- a/debian/sysdeps/mipsr6.mk
+++ b/debian/sysdeps/mipsr6.mk
@@ -1,5 +1,5 @@
 # configuration options for all flavours
-extra_cflags = -mno-plt --param ggc-min-expand=10
+extra_cflags = -mno-plt
 
 # multilib flavours
 ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
diff --git a/debian/sysdeps/mipsr6el.mk b/debian/sysdeps/mipsr6el.mk
index 80f93a6..d7c6af8 100644
--- a/debian/sysdeps/mipsr6el.mk
+++ b/debian/sysdeps/mipsr6el.mk
@@ -1,5 +1,5 @@
 # configuration options for all flavours
-extra_cflags = -mno-plt --param ggc-min-expand=10
+extra_cflags = -mno-plt
 
 # multilib flavours
 ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: