[Buildroot] [PATCH 1/3] gcc: remove BR2_GCC_NEEDS_MPC

[Buildroot] [PATCH 1/3] gcc: remove BR2_GCC_NEEDS_MPC

[Arnout Vandecappelle]

The blind option BR2_GCC_NEEDS_MPC was used to distinguish gcc versions
that rely on the mpc library and the ones that don't. But since a while
already, all the versions we support do need the mpc library. So this
symbol isn't needed anymore.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/gcc/Config.in.host | 8 --------
 package/gcc/gcc.mk         | 7 ++-----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index efe6028..22d221c 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -1,8 +1,5 @@
 comment "GCC Options"
 
-config BR2_GCC_NEEDS_MPC
-	bool
-
 config BR2_GCC_SUPPORTS_GRAPHITE
 	bool
 
@@ -34,7 +31,6 @@ choice
 		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el))
 		# musl mips64 unsupported
 		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 
@@ -42,7 +38,6 @@ choice
 		bool "gcc arc (6.x)"
 		# Only supported architecture
 		depends on BR2_arc
-		select BR2_GCC_NEEDS_MPC
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
 
@@ -63,7 +58,6 @@ choice
 		# musl mips64 unsupported
 		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
 		# PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102
-		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 
@@ -78,7 +72,6 @@ choice
 			!BR2_mips_m5101 && !BR2_mips_i6400 && !BR2_mips_p6600
 		# musl mips64 unsupported
 		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_5
 
@@ -88,7 +81,6 @@ choice
 		depends on !BR2_arc
 		# Unsupported MIPS cores
 		depends on !BR2_mips_p6600
-		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 82050b4..c971151 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -82,6 +82,7 @@ endef
 HOST_GCC_COMMON_DEPENDENCIES = \
 	host-binutils \
 	host-gmp \
+	host-mpc \
 	host-mpfr \
 	$(if $(BR2_BINFMT_FLAT),host-elf2flt)
 
@@ -93,6 +94,7 @@ HOST_GCC_COMMON_CONF_OPTS = \
 	--disable-libssp \
 	--disable-multilib \
 	--with-gmp=$(HOST_DIR)/usr \
+	--with-mpc=$(HOST_DIR)/usr \
 	--with-mpfr=$(HOST_DIR)/usr \
 	--with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \
 	--with-bugurl="http://bugs.buildroot.net/"
@@ -161,11 +163,6 @@ else
 HOST_GCC_COMMON_CONF_OPTS += --enable-threads
 endif
 
-ifeq ($(BR2_GCC_NEEDS_MPC),y)
-HOST_GCC_COMMON_DEPENDENCIES += host-mpc
-HOST_GCC_COMMON_CONF_OPTS += --with-mpc=$(HOST_DIR)/usr
-endif
-
 ifeq ($(BR2_GCC_ENABLE_GRAPHITE),y)
 HOST_GCC_COMMON_DEPENDENCIES += host-isl
 HOST_GCC_COMMON_CONF_OPTS += --with-isl=$(HOST_DIR)/usr
-- 
2.9.3

[Buildroot] [PATCH 2/3] gcc: gcc arc supports graphite

[Arnout Vandecappelle]

The ARC version of gcc does support graphite. It was probably just
forgotten when the BR2_GCC_VERSION_ARC symbol was introduced.

While we're at it, also remove a redundant newline.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: ARC Maintainers <arc-buildroot@synopsys.com>
---
Please await confirmation from the ARC Maintainers before committing.
---
 package/gcc/Config.in.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 22d221c..514c21b 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -38,9 +38,9 @@ choice
 		bool "gcc arc (6.x)"
 		# Only supported architecture
 		depends on BR2_arc
+		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
-
 	config BR2_GCC_VERSION_4_9_X
 		bool "gcc 4.9.x"
 		# Broken or unsupported architectures
-- 
2.9.3

[Buildroot] [PATCH 3/3] gcc: remove BR2_GCC_SUPPORTS_GRAPHITE

[Arnout Vandecappelle]

The blind option BR2_GCC_SUPPORTS_GRAPHITE was used to distinguish gcc
versions that support the graphite loop optimizer. But since a while
already, all the versions we support do support graphite. So this symbol
isn't needed anymore.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/gcc/Config.in.host | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 514c21b..df60c65 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -1,8 +1,5 @@
 comment "GCC Options"
 
-config BR2_GCC_SUPPORTS_GRAPHITE
-	bool
-
 choice
 	prompt "GCC compiler Version"
 	default BR2_GCC_VERSION_ARC if BR2_arc
@@ -31,14 +28,12 @@ choice
 		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el))
 		# musl mips64 unsupported
 		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 
 	config BR2_GCC_VERSION_ARC
 		bool "gcc arc (6.x)"
 		# Only supported architecture
 		depends on BR2_arc
-		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
 	config BR2_GCC_VERSION_4_9_X
@@ -58,7 +53,6 @@ choice
 		# musl mips64 unsupported
 		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
 		# PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102
-		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 
 	config BR2_GCC_VERSION_5_X
@@ -72,7 +66,6 @@ choice
 			!BR2_mips_m5101 && !BR2_mips_i6400 && !BR2_mips_p6600
 		# musl mips64 unsupported
 		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_5
 
 	config BR2_GCC_VERSION_6_X
@@ -81,7 +74,6 @@ choice
 		depends on !BR2_arc
 		# Unsupported MIPS cores
 		depends on !BR2_mips_p6600
-		select BR2_GCC_SUPPORTS_GRAPHITE
 		select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
 endchoice
@@ -167,7 +159,6 @@ config BR2_GCC_ENABLE_LIBMUDFLAP
 
 config BR2_GCC_ENABLE_GRAPHITE
 	bool "Enable graphite support"
-	depends on BR2_GCC_SUPPORTS_GRAPHITE
 	help
 	  This option enables the graphite optimizations in the
 	  compiler.
-- 
2.9.3

[Buildroot] [PATCH 1/3] gcc: remove BR2_GCC_NEEDS_MPC

[Thomas Petazzoni]

Hello,

On Sun, 16 Oct 2016 09:11:31 +0200, Arnout Vandecappelle
(Essensium/Mind) wrote:
> The blind option BR2_GCC_NEEDS_MPC was used to distinguish gcc versions
> that rely on the mpc library and the ones that don't. But since a while
> already, all the versions we support do need the mpc library. So this
> symbol isn't needed anymore.
> 
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
>  package/gcc/Config.in.host | 8 --------
>  package/gcc/gcc.mk         | 7 ++-----
>  2 files changed, 2 insertions(+), 13 deletions(-)

All applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com