From: Willy Tarreau <w@1wt.eu>
Date: Sun, 8 Oct 2017 20:26:03 +0000 (+0200)
Subject: MINOR: compiler: restore the likely() wrapper for gcc 5.x
X-Git-Tag: v1.8-dev3~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c939835f77f9785e96380949c13b290abac7e4c2;p=thirdparty%2Fhaproxy.git

MINOR: compiler: restore the likely() wrapper for gcc 5.x

After some tests, gcc 5.x produces better code with likely()
than without, contrary to gcc 4.x where it was better to disable
it. Let's re-enable it for 5 and above.
---

diff --git a/include/common/compiler.h b/include/common/compiler.h
index 001b89301d..ee7744c9fd 100644
--- a/include/common/compiler.h
+++ b/include/common/compiler.h
@@ -89,8 +89,8 @@
 #define __builtin_expect(x,y) (x)
 #define likely(x) (x)
 #define unlikely(x) (x)
-#elif __GNUC__ < 4
-/* gcc 3.x does the best job at this */
+#elif __GNUC__ < 4 || __GNUC__ >= 5
+/* gcc 3.x and 5.x do the best job at this */
 #define likely(x) (__builtin_expect((x) != 0, 1))
 #define unlikely(x) (__builtin_expect((x) != 0, 0))
 #else