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

[glibc] 02/02: debian/rules: tweak GCC garbage collector on 32-bit MIPS builders.



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 2a4735929c6cc7ac0a5d532df624c46d7d2be3e1
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Mon Jan 29 23:09:10 2018 +0100

    debian/rules: tweak GCC garbage collector on 32-bit MIPS builders.
---
 debian/changelog | 1 +
 debian/rules     | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 837058d..5b3e49c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ glibc (2.26.9000+20180127.7e23a7dd-0experimental1) UNRELEASED; urgency=medium
   * 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/rules b/debian/rules
index 44f0d25..0fa160a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ DEB_HOST_ARCH_OS      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_GNU_TYPE     ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_MULTIARCH    ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_ARCH        ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_BITS   ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
 DEB_BUILD_GNU_TYPE    ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
@@ -110,6 +111,12 @@ BUILD_CXX = $(DEB_BUILD_GNU_TYPE)-$(BASE_CXX)
 BUILD_CFLAGS = -O2 -g
 HOST_CFLAGS = -pipe -O2 -g $(call xx,extra_cflags)
 
+# 32-bit MIPS builders have a 2GB memory space. This is not enough to
+# build test-tgmath3.o with GCC, unless tweaking the garbage collector.
+ifeq ($(findstring mips,$(DEB_BUILD_ARCH))-$(DEB_BUILD_ARCH_BITS), mips-32)
+  CC += --param ggc-min-expand=10
+endif
+
 configure_target := $(DEB_HOST_GNU_TYPE)
 
 # Normally we'll just use this for --build.  If the architecture requires

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


Reply to: