sim: sim-close: use XCONCAT2 helper

No point in open coding this logic when we've got nifty helpers to do it.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index bdb657ff59b42fc14e1842b49eff40aba0c29635..7c0ef379931a908b00b8e50d5561c8d8487f3197 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-16  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-close.c (__cgen_cpu_close, _cgen_cpu_close): Delete.
+       (cgen_cpu_close): Change to XCONCAT2.
+
 2015-11-15  Mike Frysinger  <vapier@gentoo.org>
 
        * Make-common.in (SIM_NEW_COMMON_OBJS): Add sim-reason.o, sim-reg.o,

diff --git a/sim/common/sim-close.c b/sim/common/sim-close.c
index a1458d443e0211903f68422eb534c28828542bd0..b7b74298f75e5e1847334a70754ff17c68b0e415 100644 (file)
--- a/sim/common/sim-close.c
+++ b/sim/common/sim-close.c
@@ -36,9 +36,7 @@ sim_close (SIM_DESC sd, int quitting)
 
   /* If cgen is active, close it down.  */
 #ifdef CGEN_ARCH
-# define __cgen_cpu_close(arch) arch##_cgen_cpu_close
-# define _cgen_cpu_close(arch) __cgen_cpu_close (arch)
-# define cgen_cpu_close _cgen_cpu_close (CGEN_ARCH)
+# define cgen_cpu_close XCONCAT2 (CGEN_ARCH,_cgen_cpu_close)
   cgen_cpu_close (CPU_CPU_DESC (STATE_CPU (sd, 0)));
 #endif