david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-user/nios2 linux-user/riscv: Clean up header guards

Browse Source 
Reuse of the same guard symbol in multiple headers is okay as long as
they cannot be included together.  scripts/clean-header-guards.pl
can't tell, so it warns.

Since we can avoid guard symbol reuse easily, do so: use guard symbol
${target^^}_${fname^^} for linux-user/$target/$fname, just like we did
in commit a9c94277f0..3500385697.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190315145123.28030-4-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Markus Armbruster 2019-03-15 15:51:18 +01:00
parent 45b1f68ca5
commit 43e0c3515d
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-user/nios2/target_cpu.h
View File

@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TARGET_CPU_H #ifndef NIOS2_TARGET_CPU_H
#define TARGET_CPU_H #define NIOS2_TARGET_CPU_H
static inline void cpu_clone_regs(CPUNios2State *env, target_ulong newsp) static inline void cpu_clone_regs(CPUNios2State *env, target_ulong newsp)
{ {

6
linux-user/nios2/target_signal.h
View File

@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H #ifndef NIOS2_TARGET_SIGNAL_H
#define TARGET_SIGNAL_H #define NIOS2_TARGET_SIGNAL_H
/* this struct defines a stack used during syscall handling */ /* this struct defines a stack used during syscall handling */
@ -18,4 +18,4 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h" #include "../generic/signal.h"
#endif /* TARGET_SIGNAL_H */ #endif /* NIOS2_TARGET_SIGNAL_H */

4
linux-user/nios2/target_structs.h
View File

@ -16,8 +16,8 @@
* You should have received a copy of the GNU Lesser General Public * 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/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TARGET_STRUCTS_H #ifndef NIOS2_TARGET_STRUCTS_H
#define TARGET_STRUCTS_H #define NIOS2_TARGET_STRUCTS_H
struct target_ipc_perm { struct target_ipc_perm {
abi_int __key; /* Key. */ abi_int __key; /* Key. */

6
linux-user/nios2/target_syscall.h
View File

@ -1,5 +1,5 @@
#ifndef TARGET_SYSCALL_H #ifndef NIOS2_TARGET_SYSCALL_H
#define TARGET_SYSCALL_H #define NIOS2_TARGET_SYSCALL_H
#define UNAME_MACHINE "nios2" #define UNAME_MACHINE "nios2"
#define UNAME_MINIMUM_RELEASE "3.19.0" #define UNAME_MINIMUM_RELEASE "3.19.0"
@ -34,4 +34,4 @@ struct target_pt_regs {
#define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2 #define TARGET_MLOCKALL_MCL_FUTURE 2
#endif /* TARGET_SYSCALL_H */ #endif /* NIOS2_TARGET_SYSCALL_H */

4
linux-user/riscv/target_cpu.h
View File

@ -1,5 +1,5 @@
#ifndef TARGET_CPU_H #ifndef RISCV_TARGET_CPU_H
#define TARGET_CPU_H #define RISCV_TARGET_CPU_H
static inline void cpu_clone_regs(CPURISCVState *env, target_ulong newsp) static inline void cpu_clone_regs(CPURISCVState *env, target_ulong newsp)
{ {

6
linux-user/riscv/target_signal.h
View File

@ -1,5 +1,5 @@
#ifndef TARGET_SIGNAL_H #ifndef RISCV_TARGET_SIGNAL_H
#define TARGET_SIGNAL_H #define RISCV_TARGET_SIGNAL_H
typedef struct target_sigaltstack { typedef struct target_sigaltstack {
abi_ulong ss_sp; abi_ulong ss_sp;
@ -15,4 +15,4 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h" #include "../generic/signal.h"
#endif /* TARGET_SIGNAL_H */ #endif /* RISCV_TARGET_SIGNAL_H */

4
linux-user/riscv/target_structs.h
View File

@ -4,8 +4,8 @@
* This is a copy of ../aarch64/target_structs.h atm. * This is a copy of ../aarch64/target_structs.h atm.
* *
*/ */
#ifndef TARGET_STRUCTS_H #ifndef RISCV_TARGET_STRUCTS_H
#define TARGET_STRUCTS_H #define RISCV_TARGET_STRUCTS_H
struct target_ipc_perm { struct target_ipc_perm {
abi_int __key; /* Key. */ abi_int __key; /* Key. */