X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fm32r%2Fcpuall.h;h=0c3b70c39199294c79c643155ef1d459c2f1dd54;hb=1e92785005ce880a5fac9d022f05cdcff91c3091;hp=36e128beb7a61782bb78f432ad7e0da35941d581;hpb=e9c60591766341af909787c6274576425a73d798;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/m32r/cpuall.h b/sim/m32r/cpuall.h
index 36e128beb7..0c3b70c391 100644
--- a/sim/m32r/cpuall.h
+++ b/sim/m32r/cpuall.h
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2009 Free Software Foundation, Inc.
+Copyright 1996-2020 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -17,8 +17,7 @@ This file is part of the GNU simulators.
    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.,
-   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+   with this program; if not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -29,28 +28,25 @@ This file is part of the GNU simulators.
 
 #ifdef WANT_CPU_M32RBF
 #include "eng.h"
-#include "cgen-engine.h"
 #include "cpu.h"
 #include "decode.h"
 #endif
 
 #ifdef WANT_CPU_M32RXF
 #include "engx.h"
-#include "cgen-engine.h"
 #include "cpux.h"
 #include "decodex.h"
 #endif
 
 #ifdef WANT_CPU_M32R2F
 #include "eng2.h"
-#include "cgen-engine.h"
 #include "cpu2.h"
 #include "decode2.h"
 #endif
 
-extern const MACH m32r_mach;
-extern const MACH m32rx_mach;
-extern const MACH m32r2_mach;
+extern const SIM_MACH m32r_mach;
+extern const SIM_MACH m32rx_mach;
+extern const SIM_MACH m32r2_mach;
 
 #ifndef WANT_CPU
 /* The ARGBUF struct.  */