at 16.09-beta 28 lines 628 B view raw
1From: christos <christos> 2Date: Thu, 28 May 2015 11:47:03 +0000 3Subject: [PATCH] avoid gcc-5 optimization malloc + memset = calloc (Fridolin 4Pokorny) 5 6--- 7tc.alloc.c | 5 ++++- 81 file changed, 4 insertions(+), 1 deletion(-) 9 10diff --git a/tc.alloc.c b/tc.alloc.c 11index b9aec63..c1cb330 100644 12--- a/tc.alloc.c 13+++ b/tc.alloc.c 14@@ -348,10 +348,13 @@ calloc(size_t i, size_t j) 15 { 16 #ifndef lint 17 char *cp; 18+ volatile size_t k; 19 20 i *= j; 21 cp = xmalloc(i); 22- memset(cp, 0, i); 23+ /* Stop gcc 5.x from optimizing malloc+memset = calloc */ 24+ k = i; 25+ memset(cp, 0, k); 26 27 return ((memalign_t) cp); 28 #else