gcc: coexist upstream with vendor git releases for mb and arc

PATCH Superseded Spenser Gilliland 6 participants 27 messages Jan 27, 2014 – Jul 18, 2014

lore

Share & tools

lore

Spenser Gilliland

author

2014-01-27 21:51 UTC #0 lore raw

PATCH v2 1/1 gcc: coexist upstream with vendor git releases for mb and arc

This patch makes it easier to have both upstream gcc and vendor patch series for microblaze and arc.

Signed-off-by Spenser Gilliland <[email protected]>

---
 package/gcc/Config.in.host | 4 ++--
 package/gcc/gcc.mk         | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

package/gcc/Config.in.host +2 -2

index 186ba80..044cd0f 100644
@@ -96,8 +96,8 @@ config BR2_GCC_VERSION
 	default "4.6.4"     if BR2_GCC_VERSION_4_6_X
 	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
 	default "4.8.2"     if BR2_GCC_VERSION_4_8_X
-	default "7466697995233cc3aab5b9427bf843e3c7fabd80" if BR2_GCC_VERSION_4_8_ARC
-	default "b93bb009e021aba64dd4b8cdb0bbc5a176c55543" if BR2_GCC_VERSION_4_9_MICROBLAZE
+	default "arc-git"   if BR2_GCC_VERSION_4_8_ARC
+	default "mb-git"   if BR2_GCC_VERSION_4_9_MICROBLAZE
 	default BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS

package/gcc/gcc.mk +4 -2

index 236297d..dd99604 100644
@@ -19,10 +19,12 @@ ifneq ($(GCC_SNAP_DATE),)
 GCC_SITE = ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
 else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
 GCC_SITE = ftp://www.at91.com/pub/buildroot/
-else ifeq ($(BR2_arc),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_arc),gity)
+GCC_VERSION = 7466697995233cc3aab5b9427bf843e3c7fabd80
 GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION))
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
-else ifeq ($(BR2_microblaze),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_microblaze),gity)
+GCC_VERSION = b93bb009e021aba64dd4b8cdb0bbc5a176c55543
 GCC_SITE = $(call github,Xilinx,gcc,$(GCC_VERSION))
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
 else

Signature · 1 line

1.8.3.2

Spenser Gilliland

author

2014-01-27 21:51 UTC #1 lore raw

PATCH v2 1/1 gdb: use git version for cross-gdb

Use version from git for cross-gdb and introduce changes neccessary to define this only once.

Signed-off-by Spenser Gilliland <[email protected]>

---
 package/gdb/Config.in.host | 24 ++++++++++++++++++++----
 package/gdb/gdb.mk         | 14 +++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

package/gdb/Config.in.host +20 -4

index de0e0be..d4a7e1a 100644
@@ -15,8 +15,8 @@ if BR2_PACKAGE_HOST_GDB
 
 choice
 	prompt "GDB debugger Version"
-	depends on !BR2_arc
-	depends on !BR2_microblaze
+	default BR2_GDB_VERSION_ARC_GIT if BR2_arc
+	default BR2_GDB_VERSION_MB_GIT if BR2_microblaze
 	default BR2_GDB_VERSION_6_6 if BR2_bfin
 	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
 	default BR2_GDB_VERSION_7_5

@@ -31,23 +31,39 @@ choice
 		depends on BR2_avr32
 		bool "gdb 6.7.1-avr32-2.1.5"
 
+	config BR2_GDB_VERSION_ARC_GIT
+		depends on BR2_arc
+		bool "gdb git-snapshot"
+
+	config BR2_GDB_VERSION_MB_GIT
+		depends on BR2_microblaze
+		bool "gdb git-snapshot"
+
 	config BR2_GDB_VERSION_7_2
 		bool "gdb 7.2.x"
 		depends on !BR2_bfin
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 		depends on BR2_DEPRECATED
 
 	config BR2_GDB_VERSION_7_3
 		bool "gdb 7.3.x"
 		depends on !BR2_bfin
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 		depends on BR2_DEPRECATED
 
 	config BR2_GDB_VERSION_7_4
 		bool "gdb 7.4.x"
 		depends on !BR2_bfin
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 
 	config BR2_GDB_VERSION_7_5
 		bool "gdb 7.5.x"
 		depends on !BR2_bfin
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 
 endchoice

@@ -55,11 +71,11 @@ config BR2_GDB_VERSION
 	string
 	default "6.6a"     if BR2_GDB_VERSION_6_6
 	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
+	default "mb-git"   if BR2_GDB_VERSION_MB_GIT
+	default "arc-git"  if BR2_GDB_VERSION_ARC_GIT
 	default "7.2a"     if BR2_GDB_VERSION_7_2
 	default "7.3.1"    if BR2_GDB_VERSION_7_3
 	default "7.4.1"    if BR2_GDB_VERSION_7_4
 	default "7.5.1"    if BR2_GDB_VERSION_7_5
-	default "f25a1952afd054205f9471e449c1f7ca5b271b7c" if BR2_arc
-	default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
 
 endif

package/gdb/gdb.mk +9 -5

index d06b61b..2b2eb7a 100644
@@ -9,28 +9,32 @@ GDB_SITE    = $(BR2_GNU_MIRROR)/gdb
 
 # When no version is defined, it means that cross-gdb for the host has
 # not been enabled, and we will only build gdbserver or gdb for the
-# target. In this case, use the latest available version
+# target. In this case, use the latest working version for the architecture
 # automatically.
 ifeq ($(GDB_VERSION),)
 ifeq ($(BR2_bfin),y)
 GDB_VERSION = 6.6a
 else ifeq ($(BR2_avr32),y)
 GDB_VERSION = 6.7.1-avr32-2.1.5
+else ifeq ($(BR2_microblaze),y)
+GDB_VERSION = mb-git
+else ifeq ($(BR2_arc),y)
+GDB_VERSION = arc-git
 else
 GDB_VERSION = 7.5.1
 endif
 endif
 
-ifeq ($(BR2_arc),y)
+ifeq ($(findstring git,$(GDB_VERSION))$(BR2_arc),gity)
 GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gdb,$(GDB_VERSION))
 GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
-GDB_FROM_GIT = y
+GDB_VERSION = f25a1952afd054205f9471e449c1f7ca5b271b7c
 endif
 
-ifeq ($(BR2_microblaze),y)
+ifeq ($(findstring git,$(GDB_VERSION))$(BR2_microblaze),gity)
 GDB_SITE = $(call github,Xilinx,gdb,$(GDB_VERSION))
 GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
-GDB_FROM_GIT = y
+GDB_VERSION = 6be65fb56ea6694a9260733a536a023a1e2d4d57
 endif
 
 ifeq ($(GDB_VERSION),6.7.1-avr32-2.1.5)

Signature · 1 line

1.8.3.2

Arnout Vandecappelle

2014-01-29 21:39 UTC #2 lore raw

PATCH v2 1/1 gdb: use git version for cross-gdb

Quoted 14 lines · Spenser Gilliland

Use version from git for cross-gdb and introduce changes neccessary to define this only once.
Signed-off-by Spenser Gilliland <[email protected]>
---
  package/gdb/Config.in.host | 24 ++++++++++++++++++++----
  package/gdb/gdb.mk         | 14 +++++++++-----
  2 files changed, 29 insertions(+), 9 deletions(-)
package/gdb/Config.in.host +0 -0
index de0e0be..d4a7e1a 100644

package/gdb/Config.in.host if BR2_PACKAGE_HOST_GDB · line 19

Quoted 7 lines

package/gdb/Config.in.host +2 -2

@@ -15,8 +15,8 @@ if BR2_PACKAGE_HOST_GDB
 
  choice
  	prompt "GDB debugger Version"
-	depends on !BR2_arc
-	depends on !BR2_microblaze
+	default BR2_GDB_VERSION_ARC_GIT if BR2_arc
+	default BR2_GDB_VERSION_MB_GIT if BR2_microblaze

The depends on is there to avoid having a user-visible choice with only
one option, so it should stay there until there are two gdb versions for these architectures.

Quoted 67 lines

package/gdb/Config.in.host +18 -2

  	default BR2_GDB_VERSION_6_6 if BR2_bfin
  	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
  	default BR2_GDB_VERSION_7_5

@@ -31,23 +31,39 @@ choice
  		depends on BR2_avr32
  		bool "gdb 6.7.1-avr32-2.1.5"
 
+	config BR2_GDB_VERSION_ARC_GIT
+		depends on BR2_arc
+		bool "gdb git-snapshot"
+
+	config BR2_GDB_VERSION_MB_GIT
+		depends on BR2_microblaze
+		bool "gdb git-snapshot"
+
  	config BR2_GDB_VERSION_7_2
  		bool "gdb 7.2.x"
  		depends on !BR2_bfin
+		depends on !BR2_arc
+		depends on !BR2_microblaze
  		depends on BR2_DEPRECATED
 
  	config BR2_GDB_VERSION_7_3
  		bool "gdb 7.3.x"
  		depends on !BR2_bfin
+		depends on !BR2_arc
+		depends on !BR2_microblaze
  		depends on BR2_DEPRECATED
 
  	config BR2_GDB_VERSION_7_4
  		bool "gdb 7.4.x"
  		depends on !BR2_bfin
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 
  	config BR2_GDB_VERSION_7_5
  		bool "gdb 7.5.x"
  		depends on !BR2_bfin
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 
  endchoice

@@ -55,11 +71,11 @@ config BR2_GDB_VERSION
  	string
  	default "6.6a"     if BR2_GDB_VERSION_6_6
  	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
+	default "mb-git"   if BR2_GDB_VERSION_MB_GIT
+	default "arc-git"  if BR2_GDB_VERSION_ARC_GIT
  	default "7.2a"     if BR2_GDB_VERSION_7_2
  	default "7.3.1"    if BR2_GDB_VERSION_7_3
  	default "7.4.1"    if BR2_GDB_VERSION_7_4
  	default "7.5.1"    if BR2_GDB_VERSION_7_5
-	default "f25a1952afd054205f9471e449c1f7ca5b271b7c" if BR2_arc
-	default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
 
  endif

package/gdb/gdb.mk +1 -1

index d06b61b..2b2eb7a 100644
@@ -9,28 +9,32 @@ GDB_SITE    = $(BR2_GNU_MIRROR)/gdb
 
  # When no version is defined, it means that cross-gdb for the host has
  # not been enabled, and we will only build gdbserver or gdb for the
-# target. In this case, use the latest available version
+# target. In this case, use the latest working version for the architecture

package/gdb/gdb.mk GDB_SITE = $(BR2_GNU_MIRROR)/gdb · line 22

Quoted 10 lines

package/gdb/gdb.mk +4 -0

  # automatically.
  ifeq ($(GDB_VERSION),)
  ifeq ($(BR2_bfin),y)
  GDB_VERSION = 6.6a
  else ifeq ($(BR2_avr32),y)
  GDB_VERSION = 6.7.1-avr32-2.1.5
+else ifeq ($(BR2_microblaze),y)
+GDB_VERSION = mb-git
+else ifeq ($(BR2_arc),y)
+GDB_VERSION = arc-git

I guess here the idea is to be able to build gdb(server) on the target
when the host-gdb is not built. However, I think it would be a lot better to keep the intelligence in the Config.in, and instead move the BR2_GDB_VERSION symbol to an
if BR2_PACKAGE_HOST_GDB || BR2_PACKAGE_GDB
condition, and move the conditions from the .mk file to the if statements in the Config.in.

Hm, it's easier to just send a patch than to explain it :-) Coming up!

package/gdb/gdb.mk GDB_SITE = $(BR2_GNU_MIRROR)/gdb · line 27

Quoted 10 lines

package/gdb/gdb.mk +1 -2

  else
  GDB_VERSION = 7.5.1
  endif
  endif
 
-ifeq ($(BR2_arc),y)
+ifeq ($(findstring git,$(GDB_VERSION))$(BR2_arc),gity)
  GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gdb,$(GDB_VERSION))
  GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
-GDB_FROM_GIT = y

Why can the GDB_FROM_GIT suddenly be removed? Is texinfo no longer
needed for some reason?

Regards,
Arnout

Quoted 13 lines

package/gdb/gdb.mk +3 -2

+GDB_VERSION = f25a1952afd054205f9471e449c1f7ca5b271b7c
  endif
 
-ifeq ($(BR2_microblaze),y)
+ifeq ($(findstring git,$(GDB_VERSION))$(BR2_microblaze),gity)
  GDB_SITE = $(call github,Xilinx,gdb,$(GDB_VERSION))
  GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
-GDB_FROM_GIT = y
+GDB_VERSION = 6be65fb56ea6694a9260733a536a023a1e2d4d57
  endif
 
  ifeq ($(GDB_VERSION),6.7.1-avr32-2.1.5)

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Arnout Vandecappelle (Essensium/Mind)

2014-01-29 21:44 UTC #3 lore raw

PATCH 1/1 gdb: move version selection from gdb.mk to Config.in.host

This avoids duplication of the version selection between these two files.

Cc Spenser Gilliland <[email protected]>

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
Warning: I have not really tested this!

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 package/gdb/Config.in.host | 14 +++++++++-----
 package/gdb/gdb.mk         | 14 --------------
 2 files changed, 9 insertions(+), 19 deletions(-)

package/gdb/Config.in.host +9 -5

index d5e7814..9c0c78c 100644
@@ -51,15 +51,19 @@ choice
 
 endchoice
 
+endif
+
+# If cross-gdb is not enabled, the latest working version is chosen.
 config BR2_GDB_VERSION
 	string
-	default "6.6a"     if BR2_GDB_VERSION_6_6
-	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
+	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
+	default "6.6a"     if BR2_GDB_VERSION_6_6 || \
+	                      (!BR2_PACKAGE_HOST_GDB && BR2_bfin)
+	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 || \
+                                   (!BR2_PACKAGE_HOST_GDB && BR2_avr32)
 	default "7.2a"     if BR2_GDB_VERSION_7_2
 	default "7.3.1"    if BR2_GDB_VERSION_7_3
 	default "7.4.1"    if BR2_GDB_VERSION_7_4
-	default "7.5.1"    if BR2_GDB_VERSION_7_5
+	default "7.5.1"    if BR2_GDB_VERSION_7_5 || !BR2_PACKAGE_HOST_GDB
 	default "f25a1952afd054205f9471e449c1f7ca5b271b7c" if BR2_arc
 	default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
-
-endif

package/gdb/gdb.mk +0 ~~-14~~

index d06b61b..69fb3ba 100644
@@ -7,20 +7,6 @@
 GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION))
 GDB_SITE    = $(BR2_GNU_MIRROR)/gdb
 
-# When no version is defined, it means that cross-gdb for the host has
-# not been enabled, and we will only build gdbserver or gdb for the
-# target. In this case, use the latest available version
-# automatically.
-ifeq ($(GDB_VERSION),)
-ifeq ($(BR2_bfin),y)
-GDB_VERSION = 6.6a
-else ifeq ($(BR2_avr32),y)
-GDB_VERSION = 6.7.1-avr32-2.1.5
-else
-GDB_VERSION = 7.5.1
-endif
-endif
-
 ifeq ($(BR2_arc),y)
 GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gdb,$(GDB_VERSION))
 GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz

Signature · 1 line

1.8.5.3

Spenser Gilliland

author

2014-01-30 01:29 UTC #4 lore raw

PATCH 1/1 gdb: move version selection from gdb.mk to Config.in.host

Arnout,

Quoted 68 lines

This avoids duplication of the version selection between these two files.

Cc Spenser Gilliland <[email protected]>

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
Warning: I have not really tested this!

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 package/gdb/Config.in.host | 14 +++++++++-----
 package/gdb/gdb.mk         | 14 --------------
 2 files changed, 9 insertions(+), 19 deletions(-)

package/gdb/Config.in.host +9 -5

index d5e7814..9c0c78c 100644
@@ -51,15 +51,19 @@ choice
 
 endchoice
 
+endif
+
+# If cross-gdb is not enabled, the latest working version is chosen.
 config BR2_GDB_VERSION
        string
-       default "6.6a"     if BR2_GDB_VERSION_6_6
-       default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
+       depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
+       default "6.6a"     if BR2_GDB_VERSION_6_6 || \
+                             (!BR2_PACKAGE_HOST_GDB && BR2_bfin)
+       default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 || \
+                                   (!BR2_PACKAGE_HOST_GDB && BR2_avr32)
        default "7.2a"     if BR2_GDB_VERSION_7_2
        default "7.3.1"    if BR2_GDB_VERSION_7_3
        default "7.4.1"    if BR2_GDB_VERSION_7_4
-       default "7.5.1"    if BR2_GDB_VERSION_7_5
+       default "7.5.1"    if BR2_GDB_VERSION_7_5 || !BR2_PACKAGE_HOST_GDB
        default "f25a1952afd054205f9471e449c1f7ca5b271b7c" if BR2_arc
        default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
-
-endif

package/gdb/gdb.mk +0 ~~-15~~

index d06b61b..69fb3ba 100644
@@ -7,20 +7,6 @@
 GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION))
 GDB_SITE    = $(BR2_GNU_MIRROR)/gdb
 
-# When no version is defined, it means that cross-gdb for the host has
-# not been enabled, and we will only build gdbserver or gdb for the
-# target. In this case, use the latest available version
-# automatically.
-ifeq ($(GDB_VERSION),)
-ifeq ($(BR2_bfin),y)
-GDB_VERSION = 6.6a
-else ifeq ($(BR2_avr32),y)
-GDB_VERSION = 6.7.1-avr32-2.1.5
-else
-GDB_VERSION = 7.5.1
-endif
-endif
-
 ifeq ($(BR2_arc),y)
 GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gdb,$(GDB_VERSION))
 GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
--

Quoted 2 lines

1.8.5.3

This seems like a much better approach. I'll run it through some tests and get back to you.

Spenser

Signature · 3 lines

Spenser Gilliland
Computer Engineer
Doctoral Candidate

Arnout Vandecappelle

2014-01-30 07:57 UTC #5 lore raw

PATCH 1/1 gdb: move version selection from gdb.mk to Config.in.host

Quoted 8 lines · Spenser Gilliland

Arnout,
Quoted 6 lines
This avoids duplication of the version selection between these two files.
Cc Spenser Gilliland <[email protected]>
Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
---
Warning: I have not really tested this!

[snip]

Quoted 5 lines

This seems like a much better approach. I'll run it through some tests and get back to you.
Spenser

Can you take it over and include it in your series? And test it, of
course :-)

Regards,
Arnout

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Thomas Petazzoni

2014-02-03 21:32 UTC #6 lore raw

PATCH 1/1 gdb: move version selection from gdb.mk to Config.in.host

In reply to Arnout Vandecappelle (Essensium/Mind)

Dear Arnout Vandecappelle (Essensium/Mind),

Quoted 4 lines · Arnout Vandecappelle (Essensium/Mind)

This avoids duplication of the version selection between these two files.
Cc Spenser Gilliland <[email protected]>
Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Quoted 8 lines

---
Warning: I have not really tested this!
Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
---
 package/gdb/Config.in.host | 14 +++++++++-----
 package/gdb/gdb.mk         | 14 --------------
 2 files changed, 9 insertions(+), 19 deletions(-)

Acked-by Thomas Petazzoni <[email protected]>

I haven't actually built this, but I've done some testing by looking at the .config file, and it indeed contains a proper BR2_GDB_VERSION value even when a cross-gdb is not being built. Therefore, I'm fairly confident that this patch is OK to be applied.

Thomas

Signature · 3 lines

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

Peter Korsgaard

2014-02-08 22:11 UTC #7 lore raw

PATCH 1/1 gdb: move version selection from gdb.mk to Config.in.host

In reply to Arnout Vandecappelle (Essensium/Mind)

Quoted 8 lines · Arnout Vandecappelle (Essensium/Mind)

This avoids duplication of the version selection between these two files.
Cc Spenser Gilliland <[email protected]>
Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
---
Warning: I have not really tested this!
Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Committed, thanks.

--
Bye, Peter Korsgaard

Spenser Gilliland

author

2014-01-27 21:51 UTC #8 lore raw

PATCH v2 1/1 binutils: whitespace cleanup

In reply to Spenser Gilliland

Signed-off-by Spenser Gilliland <[email protected]>

---
 package/binutils/Config.in.host | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/binutils/Config.in.host +2 -2

index a8e1e45..49b857e 100644
@@ -10,8 +10,8 @@ choice
 	  Select the version of binutils you wish to use.
 
 	config BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
-	       depends on BR2_avr32
-	       bool "binutils 2.18-avr32-1.0.1"
+		depends on BR2_avr32
+		bool "binutils 2.18-avr32-1.0.1"
 
 	config BR2_BINUTILS_VERSION_2_20_1
 		depends on !BR2_avr32

Signature · 1 line

1.8.3.2

Thomas Petazzoni

2014-02-03 21:33 UTC #9 lore raw

PATCH v2 1/1 binutils: whitespace cleanup

Dear Spenser Gilliland,

Quoted 4 lines · Spenser Gilliland

Signed-off-by Spenser Gilliland <[email protected]>
---
 package/binutils/Config.in.host | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Acked-by Thomas Petazzoni <[email protected]>

Signature · 3 lines

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

Peter Korsgaard

2014-02-04 08:49 UTC #10 lore raw

PATCH v2 1/1 binutils: whitespace cleanup

Quoted 10 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Dear Spenser Gilliland,
Quoted 4 lines · Spenser Gilliland
Signed-off-by Spenser Gilliland <[email protected]>
---
package/binutils/Config.in.host | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Acked-by Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Spenser Gilliland

author

2014-01-27 21:51 UTC #11 lore raw

PATCH v2 1/1 binutils: coexist upstream and vendor binutils for arc and microblaze

In reply to Spenser Gilliland

Make if possible to select an upstream tarball in addition to the default git snapshot.

Signed-off-by Spenser Gilliland <[email protected]>

---
 package/binutils/Config.in.host | 30 ++++++++++++++++++++++++++----
 package/binutils/binutils.mk    |  7 +++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

package/binutils/Config.in.host +26 -4

index 49b857e..35a2407 100644
@@ -2,8 +2,8 @@ comment "Binutils Options"
 
 choice
 	prompt "Binutils Version"
-	depends on !BR2_arc
-	depends on !BR2_microblaze
+	default BR2_BINUTILS_VERSION_ARC_GIT if BR2_arc
+	default BR2_BINUTILS_VERSION_MB_GIT if BR2_microblaze
 	default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh)
 	default BR2_BINUTILS_VERSION_2_22
 	help

@@ -13,35 +13,57 @@ choice
 		depends on BR2_avr32
 		bool "binutils 2.18-avr32-1.0.1"
 
+	config BR2_BINUTILS_VERSION_ARC_GIT
+		depends on BR2_arc
+		bool "binutils arc-git"
+
+	config BR2_BINUTILS_VERSION_MB_GIT
+		depends on BR2_microblaze
+		bool "binutils mb-git"
+
 	config BR2_BINUTILS_VERSION_2_20_1
 		depends on !BR2_avr32
 		depends on !BR2_ARM_EABIHF
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 		bool "binutils 2.20.1"
 
 	config BR2_BINUTILS_VERSION_2_21
 		depends on !BR2_avr32
 		depends on !BR2_ARM_EABIHF
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 		bool "binutils 2.21"
 
 	config BR2_BINUTILS_VERSION_2_21_1
 		depends on !BR2_avr32
 		depends on !BR2_ARM_EABIHF
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 		bool "binutils 2.21.1"
 
 	config BR2_BINUTILS_VERSION_2_22
 		depends on !BR2_avr32
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 		bool "binutils 2.22"
 
 	config BR2_BINUTILS_VERSION_2_23_1
 		depends on !BR2_avr32
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 		bool "binutils 2.23.1"
 
 	config BR2_BINUTILS_VERSION_2_23_2
 		depends on !BR2_avr32
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 		bool "binutils 2.23.2"
 
 	config BR2_BINUTILS_VERSION_2_24
 		depends on !BR2_avr32
+		depends on !BR2_arc
+		depends on !BR2_microblaze
 		bool "binutils 2.24"
 
 endchoice

@@ -49,8 +71,8 @@ endchoice
 config BR2_BINUTILS_VERSION
 	string
 	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
-	default "0c824ba511fa9b028220eb3c39b566af89ac9dda" if BR2_arc
-	default "8351467c933d277ebea0c8d99ad2b65b5f7b6bc2" if BR2_microblaze
+	default "arg-git" if BR2_BINUTILS_VERSION_ARC_GIT
+	default "mb-git"  if BR2_BINUTILS_VERSION_MB_GIT
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
 	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1

package/binutils/binutils.mk +5 -2

index d6828f5..fada72a 100644
@@ -23,16 +23,19 @@ endif
 ifeq ($(ARCH),avr32)
 BINUTILS_SITE = ftp://www.at91.com/pub/buildroot
 endif
-ifeq ($(BR2_arc),y)
+ifeq ($(findstring git,$(BINUTILS_VERSION))$(BR2_arc),gity)
+BINUTILS_VERSION = 0c824ba511fa9b028220eb3c39b566af89ac9dda
 BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils,$(BINUTILS_VERSION))
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
 BINUTILS_FROM_GIT = y
 endif
-ifeq ($(BR2_microblaze),y)
+ifeq ($(findstring git,$(BINUTILS_VERSION))$(BR2_microblaze),gity)
+BINUTILS_VERSION = 8351467c933d277ebea0c8d99ad2b65b5f7b6bc2
 BINUTILS_SITE = $(call github,Xilinx,binutils,$(BINUTILS_VERSION))
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
 BINUTILS_FROM_GIT = y
 endif
+
 BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils
 BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.bz2
 BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))

Signature · 1 line

1.8.3.2

Spenser Gilliland

author

2014-01-27 21:51 UTC #12 lore raw

PATCH v2 1/1 libnspr: add microblaze support

In reply to Spenser Gilliland

fixes autobuild failures

http://autobuild.buildroot.net/results/493/4932900522e87da84a47fbf2d796c2fbb3f7e741/build-end.log

Signed-off-by Spenser Gilliland <[email protected]>

---
 package/libnspr/libnspr-0001-nios2.patch      | 71 +++++++++++++++++++++++++
 package/libnspr/libnspr-0002-microblaze.patch | 76 +++++++++++++++++++++++++++
 package/libnspr/libnspr-nios2.patch           | 71 -------------------------
 3 files changed, 147 insertions(+), 71 deletions(-)
 create mode 100644 package/libnspr/libnspr-0001-nios2.patch
 create mode 100644 package/libnspr/libnspr-0002-microblaze.patch
 delete mode 100644 package/libnspr/libnspr-nios2.patch

package/libnspr/libnspr-0001-nios2.patch new file +71 -0

new file mode 100644
index 0000000..cffb2ef
@@ -0,0 +1,71 @@
+Add Nios-II support
+
+Signed-off-by: Ezequiel Garcia <[email protected]>
+
+diff -Naur libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.cfg libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.cfg
+--- libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.cfg	2013-11-10 21:15:04.556139100 -0300
++++ libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.cfg	2013-11-10 21:15:29.332138283 -0300
+@@ -914,6 +914,51 @@
+ #define PR_BYTES_PER_WORD_LOG2   2
+ #define PR_BYTES_PER_DWORD_LOG2  3
+ 
++#elif defined(nios2)
++
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    32
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   4
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
+ #else
+ 
+ #error "Unknown CPU architecture"
+diff -Naur libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.h libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.h
+--- libnspr-4.9.6-ori/mozilla/nsprpub/pr/include/md/_linux.h	2013-11-10 21:15:04.556139100 -0300
++++ libnspr-4.9.6/mozilla/nsprpub/pr/include/md/_linux.h	2013-11-10 21:15:33.245138154 -0300
+@@ -55,6 +55,8 @@
+ #define _PR_SI_ARCHITECTURE "avr32"
+ #elif defined(__m32r__)
+ #define _PR_SI_ARCHITECTURE "m32r"
++#elif defined(nios2)
++#define _PR_SI_ARCHITECTURE "nios2"
+ #else
+ #error "Unknown CPU architecture"
+ #endif

package/libnspr/libnspr-0002-microblaze.patch new file +76 -0

76 lines not on this page · raw message

package/libnspr/libnspr-nios2.patch deleted +0 ~~-71~~

71 lines not on this page · raw message

Signature · 1 line

1.8.3.2

Thomas Petazzoni

2014-02-03 21:33 UTC #13 lore raw

PATCH v2 1/1 libnspr: add microblaze support

Dear Spenser Gilliland,

Quoted 5 lines · Spenser Gilliland

fixes autobuild failures
http://autobuild.buildroot.net/results/493/4932900522e87da84a47fbf2d796c2fbb3f7e741/build-end.log
Signed-off-by Spenser Gilliland <[email protected]>

Quoted 8 lines

---
 package/libnspr/libnspr-0001-nios2.patch      | 71 +++++++++++++++++++++++++
 package/libnspr/libnspr-0002-microblaze.patch | 76 +++++++++++++++++++++++++++
 package/libnspr/libnspr-nios2.patch           | 71 -------------------------
 3 files changed, 147 insertions(+), 71 deletions(-)
 create mode 100644 package/libnspr/libnspr-0001-nios2.patch
 create mode 100644 package/libnspr/libnspr-0002-microblaze.patch
 delete mode 100644 package/libnspr/libnspr-nios2.patch

Reviewed-by Thomas Petazzoni <[email protected]>

Signature · 3 lines

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

Peter Korsgaard

2014-02-04 08:52 UTC #14 lore raw

PATCH v2 1/1 libnspr: add microblaze support

Quoted 18 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Dear Spenser Gilliland,
Quoted 5 lines · Spenser Gilliland
fixes autobuild failures
http://autobuild.buildroot.net/results/493/4932900522e87da84a47fbf2d796c2fbb3f7e741/build-end.log
Signed-off-by Spenser Gilliland <[email protected]>
Quoted 8 lines
---
package/libnspr/libnspr-0001-nios2.patch      | 71 +++++++++++++++++++++++++
package/libnspr/libnspr-0002-microblaze.patch | 76 +++++++++++++++++++++++++++
package/libnspr/libnspr-nios2.patch           | 71 -------------------------
3 files changed, 147 insertions(+), 71 deletions(-)
create mode 100644 package/libnspr/libnspr-0001-nios2.patch create mode 100644 package/libnspr/libnspr-0002-microblaze.patch delete mode 100644 package/libnspr/libnspr-nios2.patch

Quoted 1 line

Reviewed-by Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Spenser Gilliland

author

2014-01-27 21:51 UTC #15 lore raw

PATCH v2 1/1 libsigsegv: fix for microblaze

In reply to Spenser Gilliland

Fixes autobuild failure

http://autobuild.buildroot.net/results/799/799ac378713d82f9632a2aa925223e21157b1042/build-end.log
http://autobuild.buildroot.net/results/ae6/ae6a10ae7cd8f2d2f3891ea9c6e867695ca1acfe/build-end.log
http://autobuild.buildroot.net/results/db4/db48622f6c3a998ecec84ec51f21b4a031ab0fb5/build-end.log

Signed-off-by Spenser Gilliland <[email protected]>

---
 .../libsigsegv-0003-fix-microblaze-build.patch           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 package/libsigsegv/libsigsegv-0003-fix-microblaze-build.patch

package/libsigsegv/libsigsegv-0003-fix-microblaze-build.patch new file +16 -0

new file mode 100644
index 0000000..4d96a83
@@ -0,0 +1,16 @@
+Add microblaze support
+
+Signed-off-by: Spenser Gilliland <[email protected]>
+
+Index: libsigsegv-2.10/m4/stack-direction.m4
+===================================================================
+--- libsigsegv-2.10.orig/m4/stack-direction.m4	2014-01-08 10:15:43.149509801 -0600
++++ libsigsegv-2.10/m4/stack-direction.m4	2014-01-08 10:16:57.249511153 -0600
+@@ -32,6 +32,7 @@
+       m68* | \
+       m88k | \
+       mcore | \
++      microblaze | \
+       mips* | \
+       mmix | \
+       mn10200 | \

Signature · 1 line

1.8.3.2

Spenser Gilliland

author

2014-01-27 21:51 UTC #16 lore raw

PATCH v2 1/1 pixman: do not build demos or tests

In reply to Spenser Gilliland

Test code does not compile correctly on microblaze architecture. Disable both tests and demos from being built to reduce failures and decrease build time.

Fixes autobuild failures

Signed-off-by Spenser Gilliland <[email protected]>

---
 .../pixman-0001-disable-tests-and-demos.patch      | 54 ++++++++++++++++++++++
 package/pixman/pixman.mk                           |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 package/pixman/pixman-0001-disable-tests-and-demos.patch

package/pixman/pixman-0001-disable-tests-and-demos.patch new file +54 -0

new file mode 100644
index 0000000..44528ef
@@ -0,0 +1,54 @@
+Index: pixman-0.30.0/Makefile.am
+===================================================================
+--- pixman-0.30.0.orig/Makefile.am	2013-04-18 00:03:32.000000000 -0500
++++ pixman-0.30.0/Makefile.am	2014-01-10 16:54:05.146255371 -0600
+@@ -1,4 +1,12 @@
+-SUBDIRS = pixman demos test
++SUBDIRS = pixman
++
++if ENABLE_DEMOS
++SUBDIRS += demos
++endif
++
++if ENABLE_TESTS
++SUBDIRS += test
++endif
+ 
+ pkgconfigdir=$(libdir)/pkgconfig
+ pkgconfig_DATA=pixman-1.pc
+Index: pixman-0.30.0/configure.ac
+===================================================================
+--- pixman-0.30.0.orig/configure.ac	2014-01-10 16:51:50.482252913 -0600
++++ pixman-0.30.0/configure.ac	2014-01-10 16:52:32.178253674 -0600
+@@ -268,6 +268,31 @@
+ ])
+ 
+ dnl ===========================================================================
++dnl Enable tests/demos
++
++AC_ARG_ENABLE(tests,
++   [AC_HELP_STRING([--disable-tests],
++                   [disable building the test suite])],
++   [enable_tests=$enableval], [enable_tests=yes])
++
++if test $enable_tests = yes ; then
++   AC_DEFINE(ENABLE_TESTS, 1, "Enable building test suite")
++fi
++
++AM_CONDITIONAL(ENABLE_TESTS, test $enable_tests = yes)
++
++AC_ARG_ENABLE(demos,
++   [AC_HELP_STRING([--disable-demos],
++                   [disable building the demos])],
++   [enable_demos=$enableval], [enable_demos=yes])
++
++if test $enable_demos = yes ; then
++   AC_DEFINE(ENABLE_DEMOS, 1, "Enable building demos")
++fi
++
++AM_CONDITIONAL(ENABLE_DEMOS, test $enable_demos = yes)
++
++dnl ===========================================================================
+ dnl Check for Loongson Multimedia Instructions
+ 
+ if test "x$LS_CFLAGS" = "x" ; then

package/pixman/pixman.mk +1 -1

index 4f70ce5..7b3175f 100644
@@ -14,7 +14,7 @@ PIXMAN_DEPENDENCIES = host-pkgconf
 PIXMAN_AUTORECONF = YES
 
 # don't build gtk based demos
-PIXMAN_CONF_OPT = --disable-gtk
+PIXMAN_CONF_OPT = --disable-gtk --disable-tests --disable-demos
 
 # disable iwmmxt support for CPU's that don't have
 # this feature

Signature · 1 line

1.8.3.2

Peter Korsgaard

2014-01-29 08:30 UTC #17 lore raw

PATCH v2 1/1 pixman: do not build demos or tests

package/pixman/pixman-0001-disable-tests-and-demos.patch

Quoted 34 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Spenser" == Spenser Gilliland <[email protected]> writes:
Test code does not compile correctly on microblaze architecture. Disable both tests and demos from being built to reduce failures and decrease build time.
Fixes autobuild failures
http://autobuild.buildroot.net/results/a4b/a4b0ce0621701df55c146609388c3e529ea3411e/build-end.log
http://autobuild.buildroot.net/results/e2f/e2f6e4750d8b93320681abf09157917d131c8de0/build-end.log
http://autobuild.buildroot.net/results/878/878f0665c1b3e0c8895912c3a5a3078f937a9c75/build-end.log
http://autobuild.buildroot.net/results/018/01869b49eb1d305cec98d4d9ecf046427e88c2f3/build-end.log
http://autobuild.buildroot.net/results/0e8/0e8a2f5fc1425e153c112f87083e8a93f726e3df/build-end.log
http://autobuild.buildroot.net/results/980/980e03c5f8a7678f3343439dc37636855f637f9e/build-end.log
http://autobuild.buildroot.net/results/e1c/e1c86da68e012dfbff345436b0967d7774c9d9c5/build-end.log
http://autobuild.buildroot.net/results/63c/63c4cc230fb0c1b359f2ca15721e20deaa0eecc9/build-end.log
http://autobuild.buildroot.net/results/db7/db7785da51133d9874857731de6e7ff19e13527b/build-end.log
http://autobuild.buildroot.net/results/af6/af6a646e560b9a743d909966a1243b1ee8dcb15f/build-end.log
http://autobuild.buildroot.net/results/e36/e360e979fbafa5add49dba4ae3f6972220966e0d/build-end.log
http://autobuild.buildroot.net/results/79e/79e4e0c94b833c247457d4839a46ff92a524f0bb/build-end.log
http://autobuild.buildroot.net/results/b67/b671f57bbfe3609d59d30281c7ee931b5ebf3df1/build-end.log
Signed-off-by Spenser Gilliland <[email protected]>
---
 .../pixman-0001-disable-tests-and-demos.patch      | 54 ++++++++++++++++++++++
 package/pixman/pixman.mk                           |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 package/pixman/pixman-0001-disable-tests-and-demos.patch
package/pixman/pixman-0001-disable-tests-and-demos.patch new file +0 -0
new file mode 100644
index 0000000..44528ef
@@ -0,0 +1,54 @@

I know it is a quite trivial patch, but please provide a git-style header with your signed-off-by.

Have you sent it upstream? Has it been accepted?

Signature · 1 line

Bye, Peter Korsgaard

Thomas De Schampheleire

2014-07-18 20:21 UTC #18 lore raw

PATCH v2 1/1 pixman: do not build demos or tests

In reply to Spenser Gilliland

Hi Spenser,

Quoted 91 lines · Spenser Gilliland

Test code does not compile correctly on microblaze architecture. Disable both tests and demos from being built to reduce failures and decrease build time.
Fixes autobuild failures
http://autobuild.buildroot.net/results/a4b/a4b0ce0621701df55c146609388c3e529ea3411e/build-end.log
http://autobuild.buildroot.net/results/e2f/e2f6e4750d8b93320681abf09157917d131c8de0/build-end.log
http://autobuild.buildroot.net/results/878/878f0665c1b3e0c8895912c3a5a3078f937a9c75/build-end.log
http://autobuild.buildroot.net/results/018/01869b49eb1d305cec98d4d9ecf046427e88c2f3/build-end.log
http://autobuild.buildroot.net/results/0e8/0e8a2f5fc1425e153c112f87083e8a93f726e3df/build-end.log
http://autobuild.buildroot.net/results/980/980e03c5f8a7678f3343439dc37636855f637f9e/build-end.log
http://autobuild.buildroot.net/results/e1c/e1c86da68e012dfbff345436b0967d7774c9d9c5/build-end.log
http://autobuild.buildroot.net/results/63c/63c4cc230fb0c1b359f2ca15721e20deaa0eecc9/build-end.log
http://autobuild.buildroot.net/results/db7/db7785da51133d9874857731de6e7ff19e13527b/build-end.log
http://autobuild.buildroot.net/results/af6/af6a646e560b9a743d909966a1243b1ee8dcb15f/build-end.log
http://autobuild.buildroot.net/results/e36/e360e979fbafa5add49dba4ae3f6972220966e0d/build-end.log
http://autobuild.buildroot.net/results/79e/79e4e0c94b833c247457d4839a46ff92a524f0bb/build-end.log
http://autobuild.buildroot.net/results/b67/b671f57bbfe3609d59d30281c7ee931b5ebf3df1/build-end.log
Signed-off-by Spenser Gilliland <[email protected]>
---
 .../pixman-0001-disable-tests-and-demos.patch      | 54 ++++++++++++++++++++++
 package/pixman/pixman.mk                           |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 package/pixman/pixman-0001-disable-tests-and-demos.patch
package/pixman/pixman-0001-disable-tests-and-demos.patch new file +54 -0
new file mode 100644
index 0000000..44528ef
@@ -0,0 +1,54 @@
+Index: pixman-0.30.0/Makefile.am
+===================================================================
+--- pixman-0.30.0.orig/Makefile.am     2013-04-18 00:03:32.000000000 -0500
++++ pixman-0.30.0/Makefile.am  2014-01-10 16:54:05.146255371 -0600
+@@ -1,4 +1,12 @@
+-SUBDIRS = pixman demos test
++SUBDIRS = pixman
++
++if ENABLE_DEMOS
++SUBDIRS += demos
++endif
++
++if ENABLE_TESTS
++SUBDIRS += test
++endif
+
+ pkgconfigdir=$(libdir)/pkgconfig
+ pkgconfig_DATA=pixman-1.pc
+Index: pixman-0.30.0/configure.ac
+===================================================================
+--- pixman-0.30.0.orig/configure.ac    2014-01-10 16:51:50.482252913 -0600
++++ pixman-0.30.0/configure.ac 2014-01-10 16:52:32.178253674 -0600
+@@ -268,6 +268,31 @@
+ ])
+
+ dnl ===========================================================================
++dnl Enable tests/demos
++
++AC_ARG_ENABLE(tests,
++   [AC_HELP_STRING([--disable-tests],
++                   [disable building the test suite])],
++   [enable_tests=$enableval], [enable_tests=yes])
++
++if test $enable_tests = yes ; then
++   AC_DEFINE(ENABLE_TESTS, 1, "Enable building test suite")
++fi
++
++AM_CONDITIONAL(ENABLE_TESTS, test $enable_tests = yes)
++
++AC_ARG_ENABLE(demos,
++   [AC_HELP_STRING([--disable-demos],
++                   [disable building the demos])],
++   [enable_demos=$enableval], [enable_demos=yes])
++
++if test $enable_demos = yes ; then
++   AC_DEFINE(ENABLE_DEMOS, 1, "Enable building demos")
++fi
++
++AM_CONDITIONAL(ENABLE_DEMOS, test $enable_demos = yes)
++
++dnl ===========================================================================
+ dnl Check for Loongson Multimedia Instructions
+
+ if test "x$LS_CFLAGS" = "x" ; then
package/pixman/pixman.mk +0 -0
index 4f70ce5..7b3175f 100644

package/pixman/pixman.mk PIXMAN_DEPENDENCIES = host-pkgconf · line 20

Quoted 8 lines

package/pixman/pixman.mk +1 -1

@@ -14,7 +14,7 @@ PIXMAN_DEPENDENCIES = host-pkgconf
 PIXMAN_AUTORECONF = YES
 
 # don't build gtk based demos
-PIXMAN_CONF_OPT = --disable-gtk
+PIXMAN_CONF_OPT = --disable-gtk --disable-tests --disable-demos
 
 # disable iwmmxt support for CPU's that don't have
 # this feature

Another patch has been accepted to fix this type of autobuild failures:
http://git.buildroot.org/buildroot/commit/?id=cb7c12f58cb58b0ea14d2a49b009676ddefec98f

I will therefore mark this patch as Rejected in patchwork. Do not hesitate to respond if you think this is not correct.

Thanks,
Thomas

Spenser Gilliland

author

2014-01-27 21:51 UTC #19 lore raw

PATCH v2 1/1 glibc: change to tagged release

In reply to Spenser Gilliland

Signed-off-by Spenser Gilliland <[email protected]>

---
 package/glibc/glibc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/glibc/glibc.mk +2 -2

index 96de02a..6e0bd4d 100644
@@ -6,11 +6,11 @@
 
 ifeq ($(BR2_microblaze),y)
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y)
-GLIBC_VERSION = 7f0bcce417c47aefad06ddfec7cd4ced3a4e10ff
+GLIBC_VERSION = xsdk_14.6
 GLIBC_SITE = $(call github,Xilinx,eglibc,$(GLIBC_VERSION))
 GLIBC_SRC_SUBDIR = .
 else
-GLIBC_VERSION = b86835ca92a1942ed08d8b5ee47498e711feaddb
+GLIBC_VERSION = xsdk_2013.4
 GLIBC_SITE = $(call github,Xilinx,glibc,$(GLIBC_VERSION))
 GLIBC_SRC_SUBDIR = .
 endif

Signature · 1 line

1.8.3.2

Spenser Gilliland

author

2014-01-27 21:51 UTC #20 lore raw

PATCH v2 1/1 binutils: change to tagged release

In reply to Spenser Gilliland

Signed-off-by Spenser Gilliland <[email protected]>

---
 package/binutils/binutils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/binutils/binutils.mk +1 -1

index fada72a..19eddd2 100644
@@ -30,7 +30,7 @@ BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
 BINUTILS_FROM_GIT = y
 endif
 ifeq ($(findstring git,$(BINUTILS_VERSION))$(BR2_microblaze),gity)
-BINUTILS_VERSION = 8351467c933d277ebea0c8d99ad2b65b5f7b6bc2
+BINUTILS_VERSION = xsdk_2013.4
 BINUTILS_SITE = $(call github,Xilinx,binutils,$(BINUTILS_VERSION))
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
 BINUTILS_FROM_GIT = y

Signature · 1 line

1.8.3.2

Spenser Gilliland

author

2014-01-27 21:51 UTC #21 lore raw

PATCH v2 1/1 gcc: change to tagged release

In reply to Spenser Gilliland

Signed-off-by Spenser Gilliland <[email protected]>

---
 package/gcc/gcc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/gcc/gcc.mk +1 -1

index dd99604..427f9b3 100644
@@ -24,7 +24,7 @@ GCC_VERSION = 7466697995233cc3aab5b9427bf843e3c7fabd80
 GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION))
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
 else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_microblaze),gity)
-GCC_VERSION = b93bb009e021aba64dd4b8cdb0bbc5a176c55543
+GCC_VERSION = xsdk_2013.4
 GCC_SITE = $(call github,Xilinx,gcc,$(GCC_VERSION))
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
 else

Signature · 1 line

1.8.3.2

Spenser Gilliland

author

2014-01-27 21:51 UTC #22 lore raw

PATCH v2 1/1 gdb: change to tagged release

In reply to Spenser Gilliland

Signed-off-by Spenser Gilliland <[email protected]>

---
 package/gdb/gdb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/gdb/gdb.mk +1 -1

index 2b2eb7a..4ef4831 100644
@@ -34,7 +34,7 @@ endif
 ifeq ($(findstring git,$(GDB_VERSION))$(BR2_microblaze),gity)
 GDB_SITE = $(call github,Xilinx,gdb,$(GDB_VERSION))
 GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
-GDB_VERSION = 6be65fb56ea6694a9260733a536a023a1e2d4d57
+GDB_VERSION = xsdk_2013.4
 endif
 
 ifeq ($(GDB_VERSION),6.7.1-avr32-2.1.5)

Signature · 1 line

1.8.3.2

Arnout Vandecappelle

2014-01-28 17:36 UTC #23 lore raw

PATCH v2 1/1 gcc: coexist upstream with vendor git releases for mb and arc

In reply to Spenser Gilliland

Quoted 2 lines · Spenser Gilliland

This patch makes it easier to have both upstream gcc and vendor patch series for microblaze and arc.

Can you explain this is bit better? I don't see the advantage at the
moment...

After this patch, the version is sometimes set in Config.in.host and
sometimes in gcc.mk. I really don't like that...

Regards,
Arnout

Quoted 42 lines

Signed-off-by Spenser Gilliland <[email protected]>

---
  package/gcc/Config.in.host | 4 ++--
  package/gcc/gcc.mk         | 6 ++++--
  2 files changed, 6 insertions(+), 4 deletions(-)

package/gcc/Config.in.host +2 -2

index 186ba80..044cd0f 100644
@@ -96,8 +96,8 @@ config BR2_GCC_VERSION
  	default "4.6.4"     if BR2_GCC_VERSION_4_6_X
  	default "4.7.3"     if BR2_GCC_VERSION_4_7_X
  	default "4.8.2"     if BR2_GCC_VERSION_4_8_X
-	default "7466697995233cc3aab5b9427bf843e3c7fabd80" if BR2_GCC_VERSION_4_8_ARC
-	default "b93bb009e021aba64dd4b8cdb0bbc5a176c55543" if BR2_GCC_VERSION_4_9_MICROBLAZE
+	default "arc-git"   if BR2_GCC_VERSION_4_8_ARC
+	default "mb-git"   if BR2_GCC_VERSION_4_9_MICROBLAZE
  	default BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
  config BR2_EXTRA_GCC_CONFIG_OPTIONS

package/gcc/gcc.mk +4 -2

index 236297d..dd99604 100644
@@ -19,10 +19,12 @@ ifneq ($(GCC_SNAP_DATE),)
  GCC_SITE = ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
  else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
  GCC_SITE = ftp://www.at91.com/pub/buildroot/
-else ifeq ($(BR2_arc),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_arc),gity)
+GCC_VERSION = 7466697995233cc3aab5b9427bf843e3c7fabd80
  GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION))
  GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
-else ifeq ($(BR2_microblaze),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_microblaze),gity)
+GCC_VERSION = b93bb009e021aba64dd4b8cdb0bbc5a176c55543
  GCC_SITE = $(call github,Xilinx,gcc,$(GCC_VERSION))
  GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
  else

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Spenser Gilliland

author

2014-01-28 23:34 UTC #24 lore raw

PATCH v2 1/1 gcc: coexist upstream with vendor git releases for mb and arc

Quoted 2 lines

Can you explain this is bit better? I don't see the advantage at the
moment...

The advantage of this approach is that as soon as upstream gcc supports the microblaze or arc architecture, the only change required is to remove depends on !BR2_microblaze or !BR2_arc for that release.

Quoted 2 lines

After this patch, the version is sometimes set in Config.in.host and
sometimes in gcc.mk. I really don't like that...

I understand. See below for a possible fix. Let me know if you think this is better.

Quoted 5 lines

Quoted 5 lines
Signed-off-by Spenser Gilliland <[email protected]>
---
  package/gcc/gcc.mk         | 6 ++++--
  1 files changed, 2 insertions(+), 2 deletions(-)

Quoted 11 lines

package/gcc/gcc.mk ifneq ($(GCC_SNAP_DATE),) · line 22

Quoted 11 lines

config BR2_EXTRA_GCC_CONFIG_OPTIONS

package/gcc/gcc.mk +1 -1

index 236297d..dd99604 100644
@@ -19,10 +19,12 @@ ifneq ($(GCC_SNAP_DATE),)
  GCC_SITE = ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
  else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
  GCC_SITE = ftp://www.at91.com/pub/buildroot/
-else ifeq ($(BR2_arc),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_arc),gity)

instead of above do something like

-else ifeq ($(BR2_arc),y)
+else ifeq (BR2_GCC_VERSION_4_8_ARC,y)

Quoted 5 lines

package/gcc/gcc.mk ifneq ($(GCC_SNAP_DATE),) · line 26

Quoted 5 lines

package/gcc/gcc.mk +1 -1

  GCC_SITE = $(call
 github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION))
  GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
-else ifeq ($(BR2_microblaze),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_microblaze),gity)

and instead of the above possibly

-else ifeq ($(BR2_arc),y)
+else ifeq (BR2_GCC_VERSION_4_9_MICROBLAZE,y)

Quoted 3 lines

package/gcc/gcc.mk ifneq ($(GCC_SNAP_DATE),) · line 30
Quoted 3 lines
package/gcc/gcc.mk +0 -0
  GCC_SITE = $(call github,Xilinx,gcc,$(GCC_VERSION))
  GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
  else

Also, updating the AVR32 code to work in the same manner would probably be best.

Thanks,
Spenser

Signature · 3 lines

Spenser Gilliland
Computer Engineer
Doctoral Candidate

Arnout Vandecappelle

2014-01-29 20:58 UTC #25 lore raw

PATCH v2 1/1 gcc: coexist upstream with vendor git releases for mb and arc

Quoted 6 lines · Spenser Gilliland

Quoted 2 lines
Can you explain this is bit better? I don't see the advantage at the
moment...
The advantage of this approach is that as soon as upstream gcc supports the microblaze or arc architecture, the only change required is to remove depends on !BR2_microblaze or !BR2_arc for that release.

OK, but then there is no need to do this before upstream gcc does
support it, right?

Quoted 26 lines

Quoted 3 lines
After this patch, the version is sometimes set in Config.in.host and
sometimes in gcc.mk. I really don't like that...
I understand. See below for a possible fix. Let me know if you think this is better.
Quoted 5 lines
Quoted 5 lines
Signed-off-by Spenser Gilliland <[email protected]>
---
   package/gcc/gcc.mk         | 6 ++++--
   1 files changed, 2 insertions(+), 2 deletions(-)
Quoted 11 lines
package/gcc/gcc.mk ifneq ($(GCC_SNAP_DATE),) · line 22
Quoted 11 lines
config BR2_EXTRA_GCC_CONFIG_OPTIONS
package/gcc/gcc.mk +1 -1
index 236297d..dd99604 100644
@@ -19,10 +19,12 @@ ifneq ($(GCC_SNAP_DATE),)
   GCC_SITE = ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
   else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
   GCC_SITE = ftp://www.at91.com/pub/buildroot/
-else ifeq ($(BR2_arc),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_arc),gity)
instead of above do something like

Review

Quoted 2 lines

(quoted diff) +1 -1

-else ifeq ($(BR2_arc),y)
+else ifeq (BR2_GCC_VERSION_4_8_ARC,y)

That would be better, yes. Although, now it becomes very obvious that
the symbol name is wrong, because it's not actually version 4.8...

Quoted 12 lines

Quoted 6 lines
package/gcc/gcc.mk ifneq ($(GCC_SNAP_DATE),) · line 26
Quoted 6 lines
package/gcc/gcc.mk +1 -1
   GCC_SITE = $(call
 github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION))
   GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
-else ifeq ($(BR2_microblaze),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_microblaze),gity)
and instead of the above possibly
(quoted diff) +1 -1
-else ifeq ($(BR2_arc),y)
+else ifeq (BR2_GCC_VERSION_4_9_MICROBLAZE,y)

Quoted 5 lines

Quoted 3 lines
package/gcc/gcc.mk ifneq ($(GCC_SNAP_DATE),) · line 30
Quoted 3 lines
package/gcc/gcc.mk +0 -0
   GCC_SITE = $(call github,Xilinx,gcc,$(GCC_VERSION))
   GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
   else
Also, updating the AVR32 code to work in the same manner would probably be best.

But there will never be an upstream avr32...

Regards,
Arnout

Quoted 4 lines

Thanks,
Spenser

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Spenser Gilliland

author

2014-01-30 01:25 UTC #26 lore raw

PATCH v2 1/1 gcc: coexist upstream with vendor git releases for mb and arc

Arnout,

Quoted 6 lines · Arnout Vandecappelle

Quoted 5 lines · Spenser Gilliland
Quoted 3 lines
Can you explain this is bit better? I don't see the advantage at the
moment...

Quoted 7 lines

Quoted 3 lines
The advantage of this approach is that as soon as upstream gcc supports the microblaze or arc architecture, the only change required is to remove depends on !BR2_microblaze or !BR2_arc for that release.
OK, but then there is no need to do this before upstream gcc does support
it, right?

Your right.

Quoted 29 lines

Quoted 29 lines
Quoted 4 lines
After this patch, the version is sometimes set in Config.in.host and
sometimes in gcc.mk. I really don't like that...
I understand. See below for a possible fix. Let me know if you think this is better.
Quoted 5 lines
Quoted 5 lines
Signed-off-by Spenser Gilliland <[email protected]>
---
   package/gcc/gcc.mk         | 6 ++++--
   1 files changed, 2 insertions(+), 2 deletions(-)
Quoted 11 lines
package/gcc/gcc.mk ifneq ($(GCC_SNAP_DATE),) · line 22
Quoted 11 lines
config BR2_EXTRA_GCC_CONFIG_OPTIONS
package/gcc/gcc.mk +1 -1
index 236297d..dd99604 100644
@@ -19,10 +19,12 @@ ifneq ($(GCC_SNAP_DATE),)
   GCC_SITE = ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
   else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
   GCC_SITE = ftp://www.at91.com/pub/buildroot/
-else ifeq ($(BR2_arc),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_arc),gity)
instead of above do something like

Quoted 6 lines

Review
Quoted 2 lines
(quoted diff) +1 -1
-else ifeq ($(BR2_arc),y)
+else ifeq (BR2_GCC_VERSION_4_8_ARC,y)
That would be better, yes. Although, now it becomes very obvious that the
symbol name is wrong, because it's not actually version 4.8...

I'll update the symbol name to better reflect the purpose.

Quoted 19 lines

Quoted 19 lines
Quoted 7 lines
package/gcc/gcc.mk ifneq ($(GCC_SNAP_DATE),) · line 26
Quoted 7 lines
package/gcc/gcc.mk +1 -1
   GCC_SITE = $(call
 github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION))
   GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
-else ifeq ($(BR2_microblaze),y)
+else ifeq ($(findstring git,$(GCC_VERSION))$(BR2_microblaze),gity)
and instead of the above possibly
(quoted diff) +1 -1
-else ifeq ($(BR2_arc),y)
+else ifeq (BR2_GCC_VERSION_4_9_MICROBLAZE,y)
Quoted 4 lines
Quoted 4 lines
package/gcc/gcc.mk +0 -0
   GCC_SITE = $(call github,Xilinx,gcc,$(GCC_VERSION))
   GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
   else

Quoted 5 lines

Quoted 2 lines
Also, updating the AVR32 code to work in the same manner would probably be best.
But there will never be an upstream avr32...

Yes, but it would make the rules in the file more consistant. The following is what I am suggesting.

ifneq ($(GCC_SNAP_DATE),)
GCC_SITE = ftp://gcc.gnu.org/pub/gcc/snapshots/$(GCC_SNAP_DATE)/
- else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
+ else ifeq ($(BR2_GCC_VERSION_4_2_2_AVR32_2_1_5),y) GCC_SITE = ftp://www.at91.com/pub/buildroot/

Quoted 17 lines

Regards,
Arnout

Quoted 4 lines

Thanks,
Spenser

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Signature · 3 lines

Spenser Gilliland
Computer Engineer
Doctoral Candidate