* cris/semcrisv32f-switch.c: Regenerate.

[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..937d13216b44d622a70d352f36097b4d3bb0a722 100644 (file)
--- a/sim/common/sim-assert.h
+++ b/sim/common/sim-assert.h
@@ -4,17 +4,16 @@
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
- 
+
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
     */
 
@@ -31,7 +30,7 @@ do \
     while (*p != '\0' && *p != ':') \
       { \
         if (*p == '/') \
-          (FILE) = p; \
+          (FILE) = p + 1; \
         p++; \
       } \
   } \
@@ -41,6 +40,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 +61,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 +84,6 @@ while (0)
 #else
 #define ASSERT(EXPRESSION) do { /*nothing*/; } while (0)
 #endif
+#endif
 
 #endif