From 19e1ff660db8a6653d67884d10bc830babc1560d Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Sun, 13 Oct 2019 17:16:35 +0200 Subject: improve patch handling in allocator.py * patches are only applied if they aren't applied already * patch no uses -p0 so git diff patches must be adjusted --- src/allocators/glibc/glibc_2.29_no_passive_falsesharing.patch | 6 +++--- src/allocators/glibc/glibc_2.29_no_passive_falsesharing_fancy.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/allocators/glibc') diff --git a/src/allocators/glibc/glibc_2.29_no_passive_falsesharing.patch b/src/allocators/glibc/glibc_2.29_no_passive_falsesharing.patch index 7d0f23f..becbfda 100644 --- a/src/allocators/glibc/glibc_2.29_no_passive_falsesharing.patch +++ b/src/allocators/glibc/glibc_2.29_no_passive_falsesharing.patch @@ -1,7 +1,7 @@ -diff --git a/malloc/malloc.c b/malloc/malloc.c +diff --git malloc/malloc.c malloc/malloc.c index 0abd653be2..eaefd3bd7c 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c +--- malloc/malloc.c ++++ malloc/malloc.c @@ -4194,6 +4194,9 @@ _int_free (mstate av, mchunkptr p, int have_lock) #if USE_TCACHE diff --git a/src/allocators/glibc/glibc_2.29_no_passive_falsesharing_fancy.patch b/src/allocators/glibc/glibc_2.29_no_passive_falsesharing_fancy.patch index 24fbe7a..480d072 100644 --- a/src/allocators/glibc/glibc_2.29_no_passive_falsesharing_fancy.patch +++ b/src/allocators/glibc/glibc_2.29_no_passive_falsesharing_fancy.patch @@ -1,7 +1,7 @@ -diff --git a/malloc/malloc.c b/malloc/malloc.c +diff --git malloc/malloc.c malloc/malloc.c index 0abd653be2..71b2d433ba 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c +--- malloc/malloc.c ++++ malloc/malloc.c @@ -4194,6 +4194,12 @@ _int_free (mstate av, mchunkptr p, int have_lock) #if USE_TCACHE -- cgit v1.2.3