[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. dc7883935dc270697a232e28834aac98cb89d95b

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3341 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  dc7883935dc270697a232e28834aac98cb89d95b (commit)
       via  cdec721af0ee37f2f538b6e52f89a1b83fb55bd0 (commit)
       via  5d5a7f29fe9a8390d70f5ddeb45fdc8b8f19d84d (commit)
       via  7bc68234a214ff458fe32f321407e939f8b57fff (commit)
      from  a24c4d29aee03f85ca55569e01d8da161d02e2a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc7883935dc270697a232e28834aac98cb89d95b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jan 30 01:01:38 2012 +0100

    gcc: Do no profiled bootstrap on armv7hl either.

commit cdec721af0ee37f2f538b6e52f89a1b83fb55bd0
Merge: 5d5a7f2 a24c4d2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jan 30 00:57:59 2012 +0100

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 5d5a7f29fe9a8390d70f5ddeb45fdc8b8f19d84d
Merge: 7bc6823 10165db
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jan 8 16:38:51 2012 +0100

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 7bc68234a214ff458fe32f321407e939f8b57fff
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jan 8 12:51:17 2012 +0100

    gcc: Do bootstrap instead of profiledbootstrap on ARM.
    
    The profiled bootstrap consumed too much memory >4GB
    which is not available on ARM.

-----------------------------------------------------------------------

Summary of changes:
 gcc/gcc.nm |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index cd6b1c3..d84cdeb 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 # Configure build to compile with cloog and ppl.
-build_cloog_ppl = 0
+build_cloog_ppl = 1
 
 name       = gcc
 version    = 4.6.2
-release    = 8
+release    = 10
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = Development/Compilers
@@ -71,6 +71,8 @@ build
 	# configuration.
 	configure_options =
 
+	make_bootstrap = profiledbootstrap
+
 	if "%{DISTRO_ARCH}" == "x86_64"
 		configure_options = --disable-multilib
 
@@ -84,12 +86,15 @@ build
 	end
 
 	if "%{DISTRO_ARCH}" == "armv5tel"
-		configure_options += --disable-sjlj-exceptions
+		make_bootstrap = bootstrap
 
+		configure_options += --disable-sjlj-exceptions
 		configure_options += --with-float=soft
 	end
 
 	if "${DISTRO_ARCH}" == "armv7hl"
+		make_bootstrap = bootstrap
+
 		configure_options += --disable-sjlj-exceptions
 
 		configure_options += \
@@ -200,7 +205,7 @@ build
 			%{configure_options}
 
 		# GCC does not support a parallel build.
-		make profiledbootstrap BOOT_CFLAGS="${CFLAGS}"
+		make %{make_bootstrap} BOOT_CFLAGS="${CFLAGS}"
 	end
 
 	#test


hooks/post-receive
--
IPFire 3.x development tree