diff options
| author | Florian Franzmann | 2020-02-07 08:03:02 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2020-02-07 23:06:34 +0100 |
| commit | 9caee638e52bbd1145ec217975676df6876f80ab (patch) | |
| tree | 8c8bad5cf5cd5a1cba0d3c36325413268bbcaa04 /gnu | |
| parent | d8364f0b982cfcdba4e0e2ed239ff9b2c9f93ed2 (diff) | |
gnu/gcc: fix build with glibc 2.31
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/gcc/0001-Fix-build-with-glibc-2.31.patch | 25 | ||||
| -rw-r--r-- | gnu/gcc/HISTORY | 3 | ||||
| -rwxr-xr-x | gnu/gcc/PRE_BUILD | 3 |
3 files changed, 31 insertions, 0 deletions
diff --git a/gnu/gcc/0001-Fix-build-with-glibc-2.31.patch b/gnu/gcc/0001-Fix-build-with-glibc-2.31.patch new file mode 100644 index 0000000000..d026baaa21 --- /dev/null +++ b/gnu/gcc/0001-Fix-build-with-glibc-2.31.patch @@ -0,0 +1,25 @@ +From f6182c49d010ccc024cf5ba39236776559905703 Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <bwlf@bandrate.org> +Date: Fri, 7 Feb 2020 08:01:28 +0100 +Subject: [PATCH] Fix build with glibc 2.31 + +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 6cd4a5bac..88629fc4a 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1158,7 +1158,7 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); + #if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) + /* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ +-CHECK_SIZE_AND_OFFSET(ipc_perm, mode); ++//CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + + CHECK_TYPE_SIZE(shmid_ds); +-- +2.25.0 + diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY index f4793589e8..9d94af9b3e 100644 --- a/gnu/gcc/HISTORY +++ b/gnu/gcc/HISTORY @@ -1,3 +1,6 @@ +2020-02-07 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, 0001-Fix-build-with-glibc-2.31.patch: fix build with glibc 2.31 + 2020-01-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * INSTALL: remove unnecessary disable fortify source * BUILD: disable control-flow protection diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD index 959dbeec18..90dd3df316 100755 --- a/gnu/gcc/PRE_BUILD +++ b/gnu/gcc/PRE_BUILD @@ -35,6 +35,9 @@ cd ${SOURCE_DIRECTORY} && mk_source_dir $SOURCE_DIRECTORY.bld && cd $SOURCE_DIRECTORY && +# fix a problem introduced in glibc-2.31 +patch -p1 < "$SPELL_DIRECTORY/0001-Fix-build-with-glibc-2.31.patch" && + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in && |