diff options
| author | Marius Bakke <[email protected]> | 2018-07-28 18:34:59 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2018-07-28 18:34:59 +0200 |
| commit | 1af575f04df6cfb6e5e3f3273271383b6ee355a8 (patch) | |
| tree | 0f1dfaed352dcdb9c827ed32db267bc7ed3d8203 /gnu/packages/patches/mariadb-gcc-ice.patch | |
| parent | 3b6f8a45d725dd7592634a34e8ffbc14a3bd31cc (diff) | |
| parent | 48d7ac175f69fea587eaa0358eddb5c76205e8ad (diff) | |
Merge branch 'master' into staging
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); + |