target-*: Clean up cpu.h header guards

Most of them use guard symbols like CPU_$target_H, but we also have
__MIPS_CPU_H__ and __TRICORE_CPU_H__. They all upset
scripts/clean-header-guards.pl.

The script dislikes CPU_$target_H because they don't match their file
name (they should, to make guard collisions less likely). The others
are reserved identifiers.

Clean them all up: use guard symbol $target_CPU_H for
target-$target/cpu.h.

Backports commit 07f5a258750b3b9a6e10fd5ec3e29c9a943b650e from qemu
This commit is contained in:
Markus Armbruster 2018-02-25 04:12:44 -05:00 committed by Lioncash
parent 60e8836b74
commit 2b65f98538
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
5 changed files with 14 additions and 11 deletions

View file

@ -16,8 +16,9 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CPU_ARM_H
#define CPU_ARM_H
#ifndef ARM_CPU_H
#define ARM_CPU_H
#include "config.h"

View file

@ -16,8 +16,9 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CPU_I386_H
#define CPU_I386_H
#ifndef I386_CPU_H
#define I386_CPU_H
#include "config.h"
#include "qemu-common.h"

View file

@ -17,8 +17,9 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CPU_M68K_H
#define CPU_M68K_H
#ifndef M68K_CPU_H
#define M68K_CPU_H
#define TARGET_LONG_BITS 32

View file

@ -1,5 +1,5 @@
#if !defined (__MIPS_CPU_H__)
#define __MIPS_CPU_H__
#ifndef MIPS_CPU_H
#define MIPS_CPU_H
//#define DEBUG_OP
@ -1064,4 +1064,4 @@ static inline void QEMU_NORETURN do_raise_exception(CPUMIPSState *env,
do_raise_exception_err(env, exception, 0, pc);
}
#endif /* !defined (__MIPS_CPU_H__) */
#endif /* MIPS_CPU_H */

View file

@ -1,5 +1,5 @@
#ifndef CPU_SPARC_H
#define CPU_SPARC_H
#ifndef SPARC_CPU_H
#define SPARC_CPU_H
#include "config.h"
#include "qemu-common.h"