diff -Nru memkind-1.10.0/debian/changelog memkind-1.10.0/debian/changelog
--- memkind-1.10.0/debian/changelog	2019-12-23 12:33:54.000000000 +0000
+++ memkind-1.10.0/debian/changelog	2020-04-19 07:43:25.000000000 +0000
@@ -1,3 +1,10 @@
+memkind (1.10.0-4) unstable; urgency=medium
+
+  * Chery-pick fixes for gcc-10.  Closes: #957528.
+  * dh 12.
+
+ -- Adam Borowski <kilobyte@angband.pl>  Sun, 19 Apr 2020 09:43:25 +0200
+
 memkind (1.10.0-3) unstable; urgency=medium
 
   * Skip tests if no NUMA -- some s390x and mips64el official kernels are
diff -Nru memkind-1.10.0/debian/compat memkind-1.10.0/debian/compat
--- memkind-1.10.0/debian/compat	2019-12-19 14:41:50.000000000 +0000
+++ memkind-1.10.0/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru memkind-1.10.0/debian/control memkind-1.10.0/debian/control
--- memkind-1.10.0/debian/control	2019-12-23 12:33:45.000000000 +0000
+++ memkind-1.10.0/debian/control	2020-04-19 07:40:34.000000000 +0000
@@ -2,8 +2,8 @@
 Section: utils
 Priority: optional
 Maintainer: Adam Borowski <kilobyte@angband.pl>
-Build-Depends: debhelper (>= 11~), libnuma-dev, libdaxctl-dev, numactl
-Standards-Version: 4.4.1
+Build-Depends: debhelper-compat (= 12), libnuma-dev, libdaxctl-dev, numactl
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://github.com/memkind/memkind
 Vcs-Git: https://github.com/kilobyte/memkind.git -b debian
diff -Nru memkind-1.10.0/debian/patches/gcc10 memkind-1.10.0/debian/patches/gcc10
--- memkind-1.10.0/debian/patches/gcc10	1970-01-01 00:00:00.000000000 +0000
+++ memkind-1.10.0/debian/patches/gcc10	2020-04-19 07:42:45.000000000 +0000
@@ -0,0 +1,77 @@
+--- memkind-1.10.0.orig/include/memkind_allocator.h
++++ memkind-1.10.0/include/memkind_allocator.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2019 Intel Corporation.
++ * Copyright (C) 2019 - 2020 Intel Corporation.
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -31,6 +31,7 @@
+ #include <exception>
+ #include <type_traits>
+ #include <cstddef>
++#include <stdexcept>
+ 
+ #include "memkind.h"
+ 
+--- memkind-1.10.0.orig/include/pmem_allocator.h
++++ memkind-1.10.0/include/pmem_allocator.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2018 - 2019 Intel Corporation.
++ * Copyright (C) 2018 - 2020 Intel Corporation.
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -30,6 +30,7 @@
+ #include <type_traits>
+ #include <atomic>
+ #include <cstddef>
++#include <stdexcept>
+ 
+ #include "memkind.h"
+ 
+--- memkind-1.10.0.orig/test/alloc_benchmark.c
++++ memkind-1.10.0/test/alloc_benchmark.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2016 - 2018 Intel Corporation.
++ * Copyright (C) 2016 - 2020 Intel Corporation.
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -38,6 +38,10 @@
+ #define FREE_FN hbw_free
+ #elif defined (TBBMALLOC)
+ #include "tbbmalloc.h"
++void *(*scalable_malloc)(size_t);
++void *(*scalable_realloc)(void *, size_t);
++void *(*scalable_calloc)(size_t, size_t);
++void  (*scalable_free)(void *);
+ #define MALLOC_FN scalable_malloc
+ #define FREE_FN scalable_free
+ #elif defined (PMEMMALLOC)
+--- memkind-1.10.0.orig/test/tbbmalloc.h
++++ memkind-1.10.0/test/tbbmalloc.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2016 - 2018 Intel Corporation.
++ * Copyright (C) 2016 - 2020 Intel Corporation.
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -25,9 +25,9 @@
+ #include <stdio.h>
+ #include <dlfcn.h>
+ 
+-void *(*scalable_malloc)(size_t);
+-void *(*scalable_realloc)(void *, size_t);
+-void *(*scalable_calloc)(size_t, size_t);
+-void  (*scalable_free)(void *);
++extern void *(*scalable_malloc)(size_t);
++extern void *(*scalable_realloc)(void *, size_t);
++extern void *(*scalable_calloc)(size_t, size_t);
++extern void  (*scalable_free)(void *);
+ 
+ int load_tbbmalloc_symbols();
diff -Nru memkind-1.10.0/debian/patches/series memkind-1.10.0/debian/patches/series
--- memkind-1.10.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ memkind-1.10.0/debian/patches/series	2020-04-19 07:42:33.000000000 +0000
@@ -0,0 +1 @@
+gcc10