sim: ppc: replace filter_filename with lbasename

The lbasename function from libiberty provides the same API as this
custom function.  The common/ code already made the switch, so make
the same change to the ppc code to avoid target duplication.

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index f7c37cc68f79e52468a7bccbcf17369a2c7d2c80..b8e7fbfd45f10c3ed7e8fd230b57f19d32e6a95f 100644 (file)
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -198,8 +198,7 @@ CPU_H = \
        cpu.c
 
 DEBUG_H = \
-       debug.h \
-       $(FILTER_FILENAME_H)
+       debug.h
 
 DEVICE_H = \
        device.h
@@ -240,9 +239,6 @@ EMUL_UNIX_H = \
 EVENTS_H = \
        events.h
 
-FILTER_FILENAME_H = \
-       filter_filename.h
-
 FILTER_H = \
        filter.h
 
@@ -304,8 +300,7 @@ LF_H = \
 
 MISC_H = \
        misc.h \
-       $(CONFIG_H) \
-       $(FILTER_FILENAME_H)
+       $(CONFIG_H)
 
 MON_H = \
        mon.h \
@@ -466,7 +461,6 @@ COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/%)
 #       first
 LIB_OBJ = \
        debug.o \
-       filter_filename.o \
        bits.o \
        sim-endian.o \
        os_emul.o \
@@ -519,7 +513,6 @@ psim.o: psim.c $(CPU_H) $(IDECODE_H) $(OPTIONS_H) $(TREE_H) $(BFD_H)
 bits.o: bits.c $(BASICS_H)
 
 debug.o: debug.c $(CONFIG_H) $(BASICS_H)
-filter_filename.o: filter_filename.c $(CONFIG_H) $(FILTER_FILENAME_H)
 
 sim-endian.o: sim-endian.c $(CONFIG_H) $(BASICS_H) $(SIM_ENDIAN_N_H)
 

diff --git a/sim/ppc/debug.h b/sim/ppc/debug.h
index 28e42c7bb753d274a56576b05e65ba2e969a3db2..e221ce553d36c72923bb2eba48c758837a52fb9f 100644 (file)
--- a/sim/ppc/debug.h
+++ b/sim/ppc/debug.h
@@ -21,7 +21,7 @@
 #ifndef _DEBUG_H_
 #define _DEBUG_H_
 
-#include "filter_filename.h"
+#include "libiberty.h"
 
 typedef enum {
   trace_invalid,
@@ -87,7 +87,7 @@ extern int ppc_trace[nr_trace_options];
 do { \
   if (WITH_TRACE) { \
     if (ppc_trace[OBJECT]) { \
-      sim_io_printf_filtered("%s:%d: ", filter_filename(__FILE__), __LINE__); \
+      sim_io_printf_filtered("%s:%d: ", lbasename(__FILE__), __LINE__); \
       sim_io_printf_filtered ARGS; \
     } \
   } \
@@ -113,7 +113,7 @@ do { \
        || ppc_trace[trace_##OBJECT##_device] \
        || trace_device) { \
       sim_io_printf_filtered("%s:%d:%s:%s%s ",                                 \
-                            filter_filename(__FILE__), __LINE__, #OBJECT, \
+                            lbasename(__FILE__), __LINE__, #OBJECT, \
                             trace_device ? device_path(me) : "",       \
                             trace_device ? ":" : "");                  \
       sim_io_printf_filtered ARGS; \
@@ -131,7 +131,7 @@ do { \
        || ppc_trace[trace_##OBJECT##_device] \
        || trace_device) { \
       sim_io_printf_filtered("%s:%d:%s:%s%s ", \
-                            filter_filename(__FILE__), __LINE__, #OBJECT, \
+                            lbasename(__FILE__), __LINE__, #OBJECT, \
                             trace_device ? device_path(_me) : "",      \
                             trace_device ? ":" : "");                  \
       sim_io_printf_filtered ARGS; \
@@ -144,7 +144,7 @@ do { \
 do { \
   if (WITH_TRACE) { \
     if (ppc_trace[trace_##OBJECT##_package]) { \
-      sim_io_printf_filtered("%s:%d:%s: ", filter_filename(__FILE__), __LINE__, #OBJECT); \
+      sim_io_printf_filtered("%s:%d:%s: ", lbasename(__FILE__), __LINE__, #OBJECT); \
       sim_io_printf_filtered ARGS; \
     } \
   } \
@@ -156,7 +156,7 @@ do { \
   if (WITH_ASSERT) { \
     if (!(EXPRESSION)) { \
       error("%s:%d: assertion failed - %s\n", \
-           filter_filename(__FILE__), __LINE__, #EXPRESSION); \
+           lbasename(__FILE__), __LINE__, #EXPRESSION); \
     } \
   } \
 } while (0)