Skip to contentSkip to conversation

gcc: or1k: use 20170218 tag instead of branch

PATCH New Peter Korsgaard 3 participants 6 messages Feb 3, 2018 – Feb 6, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gcc: or1k: use 20170218 tag instead of branch

As pointed out by Joel Stanley:
https://patchwork.ozlabs.org/patch/863011/

Github now longer provides the exact same tarball for the or1k musl-5.4.0 tarball, breaking the build. Even more, musl-5.4.0 is the name of a git branch, not a tag.

Fix both problems by changing to the or1k-musl-5.4.0-20170218 tag, which points to the exact same git commit.

---
 package/gcc/Config.in.host                                              | 2 +-
 package/gcc/gcc.hash                                                    | 2 +-
 .../gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/100-uclibc-conf.patch  | 0
 .../301-missing-execinfo_h.patch                                        | 0
 .../850-libstdcxx-uclibc-c99.patch                                      | 0
 .../gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/860-cilk-wchar.patch   | 0
 .../930-libgcc-disable-split-stack-nothreads.patch                      | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/100-uclibc-conf.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/301-missing-execinfo_h.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/850-libstdcxx-uclibc-c99.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/860-cilk-wchar.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/930-libgcc-disable-split-stack-nothreads.patch (100%)
package/gcc/Config.in.host +1 -1
index 8432515d73..309ddf572a 100644
@@ -81,7 +81,7 @@ config BR2_GCC_VERSION
 	default "6.4.0"     if BR2_GCC_VERSION_6_X
 	default "7.3.0"     if BR2_GCC_VERSION_7_X
 	default "arc-2017.09-release" if BR2_GCC_VERSION_ARC
-	default "musl-5.4.0" if BR2_GCC_VERSION_OR1K
+	default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	string "Additional gcc options"
package/gcc/gcc.hash +1 -1
index 4966b18f59..fd38cfaad1 100644
@@ -10,4 +10,4 @@ sha512  ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19
 # Locally calculated (fetched from Github)
 sha512  c30addd3c4dc66b90749a0f99b257c8a8e7966d27f286057b6b66f4a70ca22a1ee50d92882c4db13307d769a6fb28e1e2a2bab749a692cf3f89ef0c38f145efa  gcc-arc-2017.09-release.tar.gz
 # Locally calculated (fetched from Github)
-sha512  841101f7de45f327bf2e92f3efc73ca88a021e4b9b541458ce80a16e55882bd8606a8492d75c57c589ee2c10d42ae2865b67690155d7289a541df1d68096402f  gcc-musl-5.4.0.tar.gz
+sha512  2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1  gcc-or1k-musl-5.4.0-20170218.tar.gz
package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch renamed from package/gcc/musl-5.4.0/100-uclibc-conf.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/100-uclibc-conf.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch
package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch renamed from package/gcc/musl-5.4.0/301-missing-execinfo_h.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/301-missing-execinfo_h.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch
package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch renamed from package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch
package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch renamed from package/gcc/musl-5.4.0/860-cilk-wchar.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/860-cilk-wchar.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch
package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch renamed from package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 gcc: or1k: use 20170218 tag instead of branch

Quoted 11 lines · Peter Korsgaard

As pointed out by Joel Stanley:
https://patchwork.ozlabs.org/patch/863011/

Github now longer provides the exact same tarball for the or1k musl-5.4.0 tarball, breaking the build. Even more, musl-5.4.0 is the name of a git branch, not a tag.

Fix both problems by changing to the or1k-musl-5.4.0-20170218 tag, which points to the exact same git commit.

Thanks, that fixes the issue for me.

Cheers,

Joel

Quoted 61 lines
---
 package/gcc/Config.in.host                                              | 2 +-
 package/gcc/gcc.hash                                                    | 2 +-
 .../gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/100-uclibc-conf.patch  | 0
 .../301-missing-execinfo_h.patch                                        | 0
 .../850-libstdcxx-uclibc-c99.patch                                      | 0
 .../gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/860-cilk-wchar.patch   | 0
 .../930-libgcc-disable-split-stack-nothreads.patch                      | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/100-uclibc-conf.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/301-missing-execinfo_h.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/850-libstdcxx-uclibc-c99.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/860-cilk-wchar.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/930-libgcc-disable-split-stack-nothreads.patch (100%)
package/gcc/Config.in.host +1 -1
index 8432515d73..309ddf572a 100644
@@ -81,7 +81,7 @@ config BR2_GCC_VERSION
        default "6.4.0"     if BR2_GCC_VERSION_6_X
        default "7.3.0"     if BR2_GCC_VERSION_7_X
        default "arc-2017.09-release" if BR2_GCC_VERSION_ARC
-       default "musl-5.4.0" if BR2_GCC_VERSION_OR1K
+       default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
        string "Additional gcc options"
package/gcc/gcc.hash +1 -1
index 4966b18f59..fd38cfaad1 100644
@@ -10,4 +10,4 @@ sha512  ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19
 # Locally calculated (fetched from Github)
 sha512  c30addd3c4dc66b90749a0f99b257c8a8e7966d27f286057b6b66f4a70ca22a1ee50d92882c4db13307d769a6fb28e1e2a2bab749a692cf3f89ef0c38f145efa  gcc-arc-2017.09-release.tar.gz
 # Locally calculated (fetched from Github)
-sha512  841101f7de45f327bf2e92f3efc73ca88a021e4b9b541458ce80a16e55882bd8606a8492d75c57c589ee2c10d42ae2865b67690155d7289a541df1d68096402f  gcc-musl-5.4.0.tar.gz
+sha512  2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1  gcc-or1k-musl-5.4.0-20170218.tar.gz
package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch renamed from package/gcc/musl-5.4.0/100-uclibc-conf.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/100-uclibc-conf.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch
package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch renamed from package/gcc/musl-5.4.0/301-missing-execinfo_h.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/301-missing-execinfo_h.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch
package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch renamed from package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch
package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch renamed from package/gcc/musl-5.4.0/860-cilk-wchar.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/860-cilk-wchar.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch
package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch renamed from package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch +0 -1
similarity index 100%
rename from package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch
--

2.11.0

#2 lore raw

PATCH 1/1 gcc: or1k: use 20170218 tag instead of branch

Quoted 8 lines · Joel Stanley
Quoted 7 lines · Peter Korsgaard

As pointed out by Joel Stanley:
https://patchwork.ozlabs.org/patch/863011/

Github now longer provides the exact same tarball for the or1k musl-5.4.0 tarball, breaking the build. Even more, musl-5.4.0 is the name of a git branch, not a tag.

Quoted 6 lines
Quoted 4 lines

Fix both problems by changing to the or1k-musl-5.4.0-20170218 tag, which points to the exact same git commit.

Thanks, that fixes the issue for me.

Hello, it might have been me that broke this. (I posted new tags to github for openrisc)

I have been working on updating the GCC port to 7.2.0 with binutils 2.29, its in my forks right now:

https://github.com/stffrdhrn/binutils-gdb/tree/or1k-2.29
https://github.com/stffrdhrn/or1k-gcc/tree/or1k-7.2.0-20180112

With 7.x we no longer need a separate branch/tag for musl.

I dont know too much about the buildroot build, but let me know if you need me to do anything on the openrisc github repo to make it better.

-Stafford

Quoted 65 lines
Quoted 59 lines
---
 package/gcc/Config.in.host                                              | 2 +-
 package/gcc/gcc.hash                                                    | 2 +-
 .../gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/100-uclibc-conf.patch  | 0
 .../301-missing-execinfo_h.patch                                        | 0
 .../850-libstdcxx-uclibc-c99.patch                                      | 0
 .../gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/860-cilk-wchar.patch   | 0
 .../930-libgcc-disable-split-stack-nothreads.patch                      | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/100-uclibc-conf.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/301-missing-execinfo_h.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/850-libstdcxx-uclibc-c99.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/860-cilk-wchar.patch (100%)
 rename package/gcc/{musl-5.4.0 => or1k-musl-5.4.0-20170218}/930-libgcc-disable-split-stack-nothreads.patch (100%)
package/gcc/Config.in.host +1 -1
index 8432515d73..309ddf572a 100644
@@ -81,7 +81,7 @@ config BR2_GCC_VERSION
        default "6.4.0"     if BR2_GCC_VERSION_6_X
        default "7.3.0"     if BR2_GCC_VERSION_7_X
        default "arc-2017.09-release" if BR2_GCC_VERSION_ARC
-       default "musl-5.4.0" if BR2_GCC_VERSION_OR1K
+       default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
        string "Additional gcc options"
package/gcc/gcc.hash +1 -1
index 4966b18f59..fd38cfaad1 100644
@@ -10,4 +10,4 @@ sha512  ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19
 # Locally calculated (fetched from Github)
 sha512  c30addd3c4dc66b90749a0f99b257c8a8e7966d27f286057b6b66f4a70ca22a1ee50d92882c4db13307d769a6fb28e1e2a2bab749a692cf3f89ef0c38f145efa  gcc-arc-2017.09-release.tar.gz
 # Locally calculated (fetched from Github)
-sha512  841101f7de45f327bf2e92f3efc73ca88a021e4b9b541458ce80a16e55882bd8606a8492d75c57c589ee2c10d42ae2865b67690155d7289a541df1d68096402f  gcc-musl-5.4.0.tar.gz
+sha512  2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1  gcc-or1k-musl-5.4.0-20170218.tar.gz
package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch renamed from package/gcc/musl-5.4.0/100-uclibc-conf.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/100-uclibc-conf.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch
package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch renamed from package/gcc/musl-5.4.0/301-missing-execinfo_h.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/301-missing-execinfo_h.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch
package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch renamed from package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch
package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch renamed from package/gcc/musl-5.4.0/860-cilk-wchar.patch +0 -0
similarity index 100%
rename from package/gcc/musl-5.4.0/860-cilk-wchar.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch
package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch renamed from package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch +0 -1
similarity index 100%
rename from package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch
rename to package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch
--
Quoted 2 lines

2.11.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#3 lore raw

PATCH 1/1 gcc: or1k: use 20170218 tag instead of branch

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stafford" == Stafford Horne <[email protected]> writes:

Hi,

Quoted 5 lines
Quoted 1 line

Thanks, that fixes the issue for me.

Hello, it might have been me that broke this. (I posted new tags to github for openrisc)

Quoted 7 lines

I have been working on updating the GCC port to 7.2.0 with binutils 2.29, its in my forks right now:

https://github.com/stffrdhrn/binutils-gdb/tree/or1k-2.29
https://github.com/stffrdhrn/or1k-gcc/tree/or1k-7.2.0-20180112

With 7.x we no longer need a separate branch/tag for musl.

Ok, that's nice!

Quoted 2 lines

I dont know too much about the buildroot build, but let me know if you need me to do anything on the openrisc github repo to make it better.

I think everything is fine now, it was really a mistake from our side / github changing their automatic archiving logic.

Thanks for the heads up!

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/1 gcc: or1k: use 20170218 tag instead of branch

Quoted 6 lines · Peter Korsgaard
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stafford" == Stafford Horne <[email protected]> writes:

I have been working on updating the GCC port to 7.2.0 with binutils 2.29, its in my forks right now:

Quoted 9 lines
Quoted 4 lines

https://github.com/stffrdhrn/binutils-gdb/tree/or1k-2.29
https://github.com/stffrdhrn/or1k-gcc/tree/or1k-7.2.0-20180112

With 7.x we no longer need a separate branch/tag for musl.

Ok, that's nice!

Quoted 2 lines

I dont know too much about the buildroot build, but let me know if you need me to do anything on the openrisc github repo to make it better.

Good to know the toolchains are moving forward. I assume you have a plan to formally release the newer versions at some point?

Let us know when you do, and I will be happy to help integrate them in to Buildroot.

Cheers,

Joel

#5 lore raw

PATCH 1/1 gcc: or1k: use 20170218 tag instead of branch

In reply to Peter Korsgaard
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

As pointed out by Joel Stanley:
https://patchwork.ozlabs.org/patch/863011/

Quoted 8 lines

Github now longer provides the exact same tarball for the or1k musl-5.4.0 tarball, breaking the build. Even more, musl-5.4.0 is the name of a git branch, not a tag.

Fix both problems by changing to the or1k-musl-5.4.0-20170218 tag, which points to the exact same git commit.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard