NUMBERS_WITH_SUFFIX *doesn't* want to handle 'x', since that is valid

[deliverable/binutils-gdb.git] / sim / common / sim-assert.h

diff --git a/sim/common/sim-assert.h b/sim/common/sim-assert.h
index 40d0883a169fa797fb4e991d082445716d11ac03..0274084c0082a0147fe4ade56735dffd6c49efc7 100644 (file)
--- a/sim/common/sim-assert.h
+++ b/sim/common/sim-assert.h
@@ -31,7 +31,7 @@ do \
     while (*p != '\0' && *p != ':') \
       { \
         if (*p == '/') \
-          (FILE) = p; \
+          (FILE) = p + 1; \
         p++; \
       } \
   } \
@@ -41,6 +41,7 @@ while (0)
    SIM_ASSERT passes `sd' to sim_io_error for the SIM_DESC,
    ASSERT passes NULL.  */
 
+#if !defined (SIM_ASSERT)
 #if defined (WITH_ASSERT)
 #define SIM_ASSERT(EXPRESSION) \
 do \
@@ -61,7 +62,9 @@ while (0)
 #else
 #define SIM_ASSERT(EXPRESSION) do { /*nothing*/; } while (0)
 #endif
+#endif
 
+#if !defined (ASSERT)
 #if defined (WITH_ASSERT)
 #define ASSERT(EXPRESSION) \
 do \
@@ -82,5 +85,6 @@ while (0)
 #else
 #define ASSERT(EXPRESSION) do { /*nothing*/; } while (0)
 #endif
+#endif
 
 #endif