[Buildroot] [PATCH/next 1/2] package/gcc: renumber patch

[Buildroot] [PATCH/next 1/2] package/gcc: renumber patch

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...R-target-65416.patch => 0003-xtensa-fix-PR-target-65416.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/gcc/7.3.0/{0002-xtensa-fix-PR-target-65416.patch => 0003-xtensa-fix-PR-target-65416.patch} (100%)

diff --git a/package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch b/package/gcc/7.3.0/0003-xtensa-fix-PR-target-65416.patch
similarity index 100%
rename from package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch
rename to package/gcc/7.3.0/0003-xtensa-fix-PR-target-65416.patch
-- 
2.18.0

[Buildroot] [PATCH/next 2/2] package/gcc: fix build of gcc-7.3.0 with glibc-2.28

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...4-libsanitizer-Use-pre-computed-size.patch | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch

diff --git a/package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch b/package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch
new file mode 100644
index 0000000000..6e73331eae
--- /dev/null
+++ b/package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch
@@ -0,0 +1,72 @@
+From 61f38c64c01a15560026115a157b7021ec67bd3b Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 24 May 2018 20:21:54 +0000
+Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux
+
+Cherry-pick compiler-rt revision 333213:
+
+<sys/ustat.h> has been removed from glibc 2.28 by:
+
+commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date:   Sun Mar 18 11:28:59 2018 +0800
+
+    Deprecate ustat syscall interface
+
+This patch uses pre-computed size of struct ustat for Linux.
+
+	PR sanitizer/85835
+	* sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
+	include <sys/ustat.h> for Linux.
+	(SIZEOF_STRUCT_USTAT): New.
+	(struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
+
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch at 260688 138bc75d-0d04-0410-961f-82ee72b054a4
+
+Downloaded from upstream commit
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=61f38c64c01a15560026115a157b7021ec67bd3b
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libsanitizer/ChangeLog                                    |  8 ++++++++
+ .../sanitizer_common/sanitizer_platform_limits_posix.cc   | 15 +++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 31a5e69..8017afd 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -247,7 +246,19 @@ namespace __sanitizer {
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+-  unsigned struct_ustat_sz = sizeof(struct ustat);
++  // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++  // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++  || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++  || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+-- 
+2.9.3
+
-- 
2.18.0

[Buildroot] [PATCH/next 2/2] package/gcc: fix build of gcc-7.3.0 with glibc-2.28

[Thomas Petazzoni]

Hello Bernd,

On Sun, 12 Aug 2018 19:29:09 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  ...4-libsanitizer-Use-pre-computed-size.patch | 72 +++++++++++++++++++
>  1 file changed, 72 insertions(+)
>  create mode 100644 package/gcc/7.3.0/0004-libsanitizer-Use-pre-computed-size.patch

What about the older gcc versions we support ?

4.9.4
5.5.0
6.4.0
or1k-musl-5.4.0-20170218

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH/next 2/2] package/gcc: fix build of gcc-7.3.0 with glibc-2.28

[Bernd Kuhls]

Hi Thomas,

Am Sun, 12 Aug 2018 19:48:51 +0200 schrieb Thomas Petazzoni:

> What about the older gcc versions we support ?

upstream has no patches for these versions:

> 4.9.4

https://gcc.gnu.org/git/?p=gcc.git;a=history;f=libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc;h=196eb3b3c6458b30c2b1a47e0d5ef514b3063044;hb=refs/heads/gcc-4_9-branch

> 5.5.0

https://gcc.gnu.org/git/?p=gcc.git;a=history;f=libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc;h=0d5b11f6e15f55a3193ced0f329461c9b9633185;hb=refs/heads/gcc-5-branch

> 6.4.0

https://gcc.gnu.org/git/?p=gcc.git;a=history;f=libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc;h=6992f2cd8ac56bcd5102f7440d71137b4458871d;hb=refs/heads/gcc-6-branch

> or1k-musl-5.4.0-20170218

Could not find an upstream branch at gcc.gnu.org.

Regards, Bernd

[Buildroot] [PATCH/next 2/2] package/gcc: fix build of gcc-7.3.0 with

[Thomas Petazzoni]

Hello,

On Sun, 12 Aug 2018 20:10:43 +0200, Bernd Kuhls wrote:

> > What about the older gcc versions we support ?  
> 
> upstream has no patches for these versions:

Does this mean the problem doesn't exist, or just that the gcc
developers didn't backport the patch ?

Could you do a test build of gcc 6.x and glibc 2.28 ? Or perhaps verify
in the source code that the problem didn't exist back then ?

> > or1k-musl-5.4.0-20170218  
> 
> Could not find an upstream branch at gcc.gnu.org.

This is not an official upstream branch, but if the upstream 5.4.0 is
affected by the issue, the patch should apply just as well to this
branch.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH/next 2/2] package/gcc: fix build of gcc-7.3.0 with

[Bernd Kuhls]

Hi Thomas,

Am Sun, 12 Aug 2018 21:04:19 +0200 schrieb Thomas Petazzoni:

>> upstream has no patches for these versions:
> 
> Does this mean the problem doesn't exist, or just that the gcc
> developers didn't backport the patch ?

the latter.

> Could you do a test build of gcc 6.x and glibc 2.28 ? Or perhaps verify
> in the source code that the problem didn't exist back then ?

done, all older gcc versions are affected as well, sent patches:

http://patchwork.ozlabs.org/project/buildroot/list/?series=60590

>> > or1k-musl-5.4.0-20170218
>> 
>> Could not find an upstream branch at gcc.gnu.org.
> 
> This is not an official upstream branch, but if the upstream 5.4.0 is
> affected by the issue, the patch should apply just as well to this
> branch.

In buildroot or1k has no support for glibc, only for uclibc and musl.
Therefore I did not patch this gcc version.

Regards, Bernd