Skip to contentSkip to conversation

binutils: rename config option

PATCH New Gustavo Zacarias 2 participants 3 messages Jul 28, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 binutils: rename config option

Rename the binutils configuration option to match that one used by gcc where the patchlevel is explicitly left out.

---
 Config.in.legacy                | 27 +++++++++++++++++++++++++++
 package/binutils/Config.in.host | 14 +++++++-------
 package/gcc/Config.in.host      |  2 +-
 3 files changed, 35 insertions(+), 8 deletions(-)
Config.in.legacy +27 -0
index 4afeb83..08caa8b 100644
@@ -107,6 +107,33 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2015.08"
 
+config BR2_BINUTILS_VERSION_2_23_2
+	bool "binutils 2.23 option renamed"
+	select BR2_LEGACY
+	select BR2_BINUTILS_VERSION_2_23_X
+	help
+	  The binutils version option has been renamed to match the
+	  same patchlevel logic used by gcc. The new option is now
+	  BR2_BINUTILS_VERSION_2_23_X.
+
+config BR2_BINUTILS_VERSION_2_24
+	bool "binutils 2.24 option renamed"
+	select BR2_LEGACY
+	select BR2_BINUTILS_VERSION_2_24_X
+	help
+	  The binutils version option has been renamed to match the
+	  same patchlevel logic used by gcc. The new option is now
+	  BR2_BINUTILS_VERSION_2_24_X.
+
+config BR2_BINUTILS_VERSION_2_25
+	bool "binutils 2.25 option renamed"
+	select BR2_LEGACY
+	select BR2_BINUTILS_VERSION_2_25_X
+	help
+	  The binutils version option has been renamed to match the
+	  same patchlevel logic used by gcc. The new option is now
+	  BR2_BINUTILS_VERSION_2_25_X.
+
 config BR2_PACKAGE_PERF
 	bool "perf option has been renamed"
 	select BR2_LEGACY
package/binutils/Config.in.host +7 -7
index 70253cc..6e7acab 100644
@@ -3,21 +3,21 @@ comment "Binutils Options"
 choice
 	prompt "Binutils Version"
 	depends on !BR2_arc
-	default BR2_BINUTILS_VERSION_2_24
+	default BR2_BINUTILS_VERSION_2_24_X
 	help
 	  Select the version of binutils you wish to use.
 
-	config BR2_BINUTILS_VERSION_2_23_2
+	config BR2_BINUTILS_VERSION_2_23_X
 		depends on !BR2_aarch64 && !BR2_microblaze && \
 			   !BR2_powerpc64le && !BR2_nios2
 		bool "binutils 2.23.2"
 
-	config BR2_BINUTILS_VERSION_2_24
+	config BR2_BINUTILS_VERSION_2_24_X
 		# supported, but broken on Nios-II and powerpc64le
 		depends on !BR2_nios2 && !BR2_powerpc64le
 		bool "binutils 2.24"
 
-	config BR2_BINUTILS_VERSION_2_25
+	config BR2_BINUTILS_VERSION_2_25_X
 		bool "binutils 2.25"
 
 endchoice
@@ -25,9 +25,9 @@ endchoice
 config BR2_BINUTILS_VERSION
 	string
 	default "arc-2015.06"	if BR2_arc
-	default "2.23.2"	if BR2_BINUTILS_VERSION_2_23_2
-	default "2.24"		if BR2_BINUTILS_VERSION_2_24
-	default "2.25"		if BR2_BINUTILS_VERSION_2_25
+	default "2.23.2"	if BR2_BINUTILS_VERSION_2_23_X
+	default "2.24"		if BR2_BINUTILS_VERSION_2_24_X
+	default "2.25"		if BR2_BINUTILS_VERSION_2_25_X
 
 config BR2_BINUTILS_ENABLE_LTO
 	bool
package/gcc/Config.in.host +1 -1
index 3d64b6f..93c9032 100644
@@ -61,7 +61,7 @@ choice
 		# Broken or unsupported PPC cores
 		depends on !BR2_powerpc_power8
 		# gcc-4.8.x + binutils-2.25 is broken for MIPS
-		depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25)
+		depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X)
 		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_SUPPORTS_GRAPHITE
 
Signature · 1 line
2.3.6
#1 lore raw

PATCH 2/2 binutils: bump 2.25.x series to 2.25.1

---
 package/binutils/{2.25 => 2.25.1}/120-sh-conf.patch                   | 0
 package/binutils/{2.25 => 2.25.1}/300-001_ld_makefile_patch.patch     | 0
 .../binutils/{2.25 => 2.25.1}/300-012_check_ldrunpath_length.patch    | 0
 package/binutils/{2.25 => 2.25.1}/500-sysroot.patch                   | 0
 package/binutils/{2.25 => 2.25.1}/600-poison-system-directories.patch | 0
 .../905-Fix-trampolines-search-code-for-conditional-branches.patch    | 0
 .../906-xtensa-optimize-check_section_ebb_pcrels_fit.patch            | 0
 .../{2.25 => 2.25.1}/907-xtensa-optimize-removed_by_actions.patch     | 0
 .../{2.25 => 2.25.1}/908-xtensa-optimize-find_removed_literal.patch   | 0
 .../909-xtensa-replace-action-list-with-splay-tree.patch              | 0
 .../{2.25 => 2.25.1}/910-xtensa-optimize-trampolines-relaxation.patch | 0
 .../911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch    | 0
 .../912-xtensa-fix-gas-segfault-with-text-section-literals.patch      | 0
 package/binutils/Config.in.host                                       | 4 ++--
 package/binutils/binutils.hash                                        | 2 +-
 15 files changed, 3 insertions(+), 3 deletions(-)
 rename package/binutils/{2.25 => 2.25.1}/120-sh-conf.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/300-001_ld_makefile_patch.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/300-012_check_ldrunpath_length.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/500-sysroot.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/600-poison-system-directories.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/905-Fix-trampolines-search-code-for-conditional-branches.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/907-xtensa-optimize-removed_by_actions.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/908-xtensa-optimize-find_removed_literal.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/909-xtensa-replace-action-list-with-splay-tree.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/910-xtensa-optimize-trampolines-relaxation.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch (100%)
 rename package/binutils/{2.25 => 2.25.1}/912-xtensa-fix-gas-segfault-with-text-section-literals.patch (100%)
package/binutils/2.25.1/120-sh-conf.patch renamed from package/binutils/2.25/120-sh-conf.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/120-sh-conf.patch
rename to package/binutils/2.25.1/120-sh-conf.patch
package/binutils/2.25.1/300-001_ld_makefile_patch.patch renamed from package/binutils/2.25/300-001_ld_makefile_patch.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/300-001_ld_makefile_patch.patch
rename to package/binutils/2.25.1/300-001_ld_makefile_patch.patch
package/binutils/2.25.1/300-012_check_ldrunpath_length.patch renamed from package/binutils/2.25/300-012_check_ldrunpath_length.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/300-012_check_ldrunpath_length.patch
rename to package/binutils/2.25.1/300-012_check_ldrunpath_length.patch
package/binutils/2.25.1/500-sysroot.patch renamed from package/binutils/2.25/500-sysroot.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/500-sysroot.patch
rename to package/binutils/2.25.1/500-sysroot.patch
package/binutils/2.25.1/600-poison-system-directories.patch renamed from package/binutils/2.25/600-poison-system-directories.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/600-poison-system-directories.patch
rename to package/binutils/2.25.1/600-poison-system-directories.patch
package/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch renamed from package/binutils/2.25/905-Fix-trampolines-search-code-for-conditional-branches.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/905-Fix-trampolines-search-code-for-conditional-branches.patch
rename to package/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch
package/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch renamed from package/binutils/2.25/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
rename to package/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
package/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch renamed from package/binutils/2.25/907-xtensa-optimize-removed_by_actions.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/907-xtensa-optimize-removed_by_actions.patch
rename to package/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch
package/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch renamed from package/binutils/2.25/908-xtensa-optimize-find_removed_literal.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/908-xtensa-optimize-find_removed_literal.patch
rename to package/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch
package/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch renamed from package/binutils/2.25/909-xtensa-replace-action-list-with-splay-tree.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/909-xtensa-replace-action-list-with-splay-tree.patch
rename to package/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch
package/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch renamed from package/binutils/2.25/910-xtensa-optimize-trampolines-relaxation.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/910-xtensa-optimize-trampolines-relaxation.patch
rename to package/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch
package/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch renamed from package/binutils/2.25/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
rename to package/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
package/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch renamed from package/binutils/2.25/912-xtensa-fix-gas-segfault-with-text-section-literals.patch +0 -0
similarity index 100%
rename from package/binutils/2.25/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
rename to package/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
package/binutils/Config.in.host +2 -2
index 6e7acab..40619ab 100644
@@ -18,7 +18,7 @@ choice
 		bool "binutils 2.24"
 
 	config BR2_BINUTILS_VERSION_2_25_X
-		bool "binutils 2.25"
+		bool "binutils 2.25.1"
 
 endchoice
 
@@ -27,7 +27,7 @@ config BR2_BINUTILS_VERSION
 	default "arc-2015.06"	if BR2_arc
 	default "2.23.2"	if BR2_BINUTILS_VERSION_2_23_X
 	default "2.24"		if BR2_BINUTILS_VERSION_2_24_X
-	default "2.25"		if BR2_BINUTILS_VERSION_2_25_X
+	default "2.25.1"	if BR2_BINUTILS_VERSION_2_25_X
 
 config BR2_BINUTILS_ENABLE_LTO
 	bool
package/binutils/binutils.hash +1 -1
index 6f45a9c..51499f0 100644
@@ -2,6 +2,6 @@
 sha512  ffe8ef263ef99183e8cc823fe8487ff7d0f7bf9a8efd2853b5f4636aca0023850d13de4eac7d77a5f69413d8a50e6f95bb14569be53df86c0bce38034525ab74  binutils-2.22.tar.bz2
 sha512  dec753bbba008f1526b89cf1bd85feba78f362f5333ffdf93953fd131eb755976dec82a0a4ba38c43d2434da007137780cfe674de5414be5cf7ce7fbc6af6d16  binutils-2.23.2.tar.bz2
 sha512  5ec95ad47d49b12c4558a8db0ca2109d3ee1955e3776057f3330c4506f8f4d1cf5e505fbf8a16b98403a0fcdeaaf986fe0a22be6456247dbdace63ce1f776b12  binutils-2.24.tar.bz2
-sha512  49438970642f379978aba988e3d2e7b63dab6fd0b46d91f4100f083e87a84d242089daca58572245fe620457a77bbbe2d78588ff3fb79314e500d1a39bf96f30  binutils-2.25.tar.bz2
+sha512  0b36dda0e6d32cd25613c0e64b56b28312515c54d6a159efd3db9a86717f114ab0a0a1f69d08975084d55713ebaeab64e4085c9b3d1c3fa86712869f80eb954d  binutils-2.25.1.tar.bz2
 # No hash for the ARC variant, comes from the github-helper:
 none   xxx  binutils-arc-2015.06.tar.gz
Signature · 1 line
2.3.6
#2 lore raw

PATCH 1/2 binutils: rename config option

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 9 lines · Gustavo Zacarias

Rename the binutils configuration option to match that one used by gcc where the patchlevel is explicitly left out.

---
 Config.in.legacy                | 27 +++++++++++++++++++++++++++
 package/binutils/Config.in.host | 14 +++++++-------
 package/gcc/Config.in.host      |  2 +-
 3 files changed, 35 insertions(+), 8 deletions(-)

Both applied, thanks.

Thomas

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