Changeset 1971 in kBuild

Timestamp:

Oct 26, 2008 10:26:12 PM (16 years ago)

Author:

bird

Message:

Some CONFIG_WITH_ALLOC_CACHE build fixes.

Location:

trunk/src/kmk

Files:

• make.h (modified) (2 diffs)
• misc.c (modified) (1 diff)
• remake.c (modified) (1 diff)

trunk/src/kmk/make.h

@@ -146 +146 @@
 #endif
 
-#if defined(KMK) || defined(CONFIG_WITH_VALUE_LENGTH)
+#if defined (KMK) || defined (CONFIG_WITH_VALUE_LENGTH) \
+ || defined (CONFIG_WITH_ALLOC_CACHES)
 # ifdef _MSC_VER
 #  define MY_INLINE     _inline static
+# elif defined(__GNUC__)
+#  define MY_INLINE     static __inline__
+# else
+#  define MY_INLINE     static
+# endif
+
+# ifdef __GNUC__
+#  define MY_PREDICT_TRUE(expr)  __builtin_expect(!!(expr), 1)
+#  define MY_PREDICT_FALSE(expr) __builtin_expect(!!(expr), 0)
+# else
+#  define MY_PREDICT_TRUE(expr)  (expr)
+#  define MY_PREDICT_FALSE(expr) (expr)
+# endif
+#endif
+
+#if defined (KMK) || defined (CONFIG_WITH_VALUE_LENGTH)
+# ifdef _MSC_VER
 #  define MY_DBGBREAK   __debugbreak()
 # elif defined(__GNUC__)
-#  define MY_INLINE     static __inline__
 #  if defined(__i386__) || defined(__x86_64__)
 #   define MY_DBGBREAK  __asm__ __volatile__ ("int3")
-#else
+#  else
 #   define MY_DBGBREAK  assert(0)
 #  endif
 # else
-#  define MY_INLINE     static
-#  define MY_DBGBREAK  assert(0)
+#  define MY_DBGBREAK   assert(0)
 # endif
 # ifndef NDEBUG
@@ -166 +182 @@
 # else
 #  define MY_ASSERT_MSG(expr, printfargs)   do { } while (0)
-# endif
-
-# ifdef __GNUC__
-#  define MY_PREDICT_TRUE(expr)  __builtin_expect(!!(expr), 1)
-#  define MY_PREDICT_FALSE(expr) __builtin_expect(!!(expr), 0)
-# else
-#  define MY_PREDICT_TRUE(expr)  (expr)
-#  define MY_PREDICT_FALSE(expr) (expr)
 # endif
 #endif

trunk/src/kmk/misc.c

@@ -20 +20 @@
 #include "dep.h"
 #include "debug.h"
-#ifdef CONFIG_WITH_VALUE_LENGTH
+#if defined (CONFIG_WITH_VALUE_LENGTH) || defined (CONFIG_WITH_ALLOC_CACHES)
 # include <assert.h>
 #endif

trunk/src/kmk/remake.c

@@ -240 +240 @@
 
               /* Free the storage.  */
-#ifndef KMK
+#ifndef CONFIG_WITH_ALLOC_CACHES
               free (g);
 #else