diff --git a/include/bx/macros.h b/include/bx/macros.h
index 7a9b6433..15099250 100644
--- a/include/bx/macros.h
+++ b/include/bx/macros.h
@@ -115,7 +115,7 @@
 
 /// The return value of the function is solely a function of the arguments.
 ///
-#if BX_COMPILER_MSVC && (BX_COMPILER_MSVC <= 1900)
+#if (BX_COMPILER_MSVC && (BX_COMPILER_MSVC <= 1900)) || (BX_COMPILER_GCC && (__cplusplus < 201402L))
 #	define BX_CONSTEXPR_FUNC BX_CONST_FUNC
 #else
 #	define BX_CONSTEXPR_FUNC constexpr BX_CONST_FUNC
diff --git a/tools/bin/darwin/bin2c b/tools/bin/darwin/bin2c
index cb1acca8..7aa45d00 100755
Binary files a/tools/bin/darwin/bin2c and b/tools/bin/darwin/bin2c differ
diff --git a/tools/bin/darwin/lemon b/tools/bin/darwin/lemon
index f8cfcebb..c00a276b 100755
Binary files a/tools/bin/darwin/lemon and b/tools/bin/darwin/lemon differ
diff --git a/tools/bin/windows/bin2c.exe b/tools/bin/windows/bin2c.exe
index 2c01cdd8..d93eff18 100755
Binary files a/tools/bin/windows/bin2c.exe and b/tools/bin/windows/bin2c.exe differ
diff --git a/tools/bin/windows/lemon.exe b/tools/bin/windows/lemon.exe
index 5de0c8d6..ea46fecf 100644
Binary files a/tools/bin/windows/lemon.exe and b/tools/bin/windows/lemon.exe differ