X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Ffrv%2Fcpuall.h;h=8ff34f680c94b47d5946cdbe68a05b34313b1a21;hb=af0b2a3e85df9f49a3528e5b7578fcf9412f1acc;hp=7923b4a2e05fd16fd50e1c799750355cbe8650dc;hpb=45aa12b4ca686068ef07694b2d4176217bdfd648;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/frv/cpuall.h b/sim/frv/cpuall.h
index 7923b4a2e0..8ff34f680c 100644
--- a/sim/frv/cpuall.h
+++ b/sim/frv/cpuall.h
@@ -2,23 +2,22 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2004 Free Software Foundation, Inc.
+Copyright 1996-2020 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
-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, or (at your option)
-any later version.
+   This file 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 3, 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.
+   It 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.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -29,18 +28,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #ifdef WANT_CPU_FRVBF
 #include "eng.h"
-#include "cgen-engine.h"
 #include "cpu.h"
 #include "decode.h"
 #endif
 
-extern const MACH frv_mach;
-extern const MACH fr550_mach;
-extern const MACH fr500_mach;
-extern const MACH tomcat_mach;
-extern const MACH fr400_mach;
-extern const MACH fr450_mach;
-extern const MACH simple_mach;
+extern const SIM_MACH frv_mach;
+extern const SIM_MACH fr550_mach;
+extern const SIM_MACH fr500_mach;
+extern const SIM_MACH tomcat_mach;
+extern const SIM_MACH fr400_mach;
+extern const SIM_MACH fr450_mach;
+extern const SIM_MACH simple_mach;
 
 #ifndef WANT_CPU
 /* The ARGBUF struct.  */