diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-01 15:53:17 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-01 15:53:17 +0200 |
| commit | 4214066d45ec7030405577f225a9db0be04da1fd (patch) | |
| tree | 2a0d3b6fd454b04721775a2d6846138658cc61ab /gnu/packages/patches/mariadb-gcc-ice.patch | |
| parent | 07ca7165f90079948e7174468b47ecc7cd38531d (diff) | |
| parent | ae66fdaf9f7971c0a1b33d0c20844e903ccd909c (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/mariadb-gcc-ice.patch')
| -rw-r--r-- | gnu/packages/patches/mariadb-gcc-ice.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/mariadb-gcc-ice.patch b/gnu/packages/patches/mariadb-gcc-ice.patch new file mode 100644 index 0000000000..59b188f45a --- /dev/null +++ b/gnu/packages/patches/mariadb-gcc-ice.patch @@ -0,0 +1,24 @@ +Work around this GCC ICE: <https://bugs.gnu.org/31708>. It shows up +only when doing native compiles on armhf-linux. + +--- mariadb-10.1.33/plugin/semisync/semisync_master.cc 2018-07-28 02:13:12.604020250 +0200 ++++ mariadb-10.1.33/plugin/semisync/semisync_master.cc 2018-07-28 02:14:11.907753417 +0200 +@@ -847,6 +847,8 @@ + return function_exit(kWho, 0); + } + ++volatile const void *kSyncHeaderPtr = &ReplSemiSyncMaster::kSyncHeader; ++ + int ReplSemiSyncMaster::reserveSyncHeader(unsigned char *header, + unsigned long size) + { +@@ -873,7 +875,7 @@ + /* Set the magic number and the sync status. By default, no sync + * is required. + */ +- memcpy(header, kSyncHeader, sizeof(kSyncHeader)); ++ memcpy(header, (void *)kSyncHeaderPtr, sizeof(kSyncHeader)); + hlen= sizeof(kSyncHeader); + } + return function_exit(kWho, hlen); + |