Commit 43e0c351 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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



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 a9c94277..35003856.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190315145123.28030-4-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 45b1f68c

linux-user/nios2/target_cpu.h

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef TARGET_CPU_H

#define TARGET_CPU_H

#ifndef NIOS2_TARGET_CPU_H

#define NIOS2_TARGET_CPU_H



static inline void cpu_clone_regs(CPUNios2State *env, target_ulong newsp)

{

linux-user/nios2/target_signal.h

+3 −3
Original line number Diff line number Diff line 
#ifndef TARGET_SIGNAL_H

#define TARGET_SIGNAL_H

#ifndef NIOS2_TARGET_SIGNAL_H

#define NIOS2_TARGET_SIGNAL_H



/* this struct defines a stack used during syscall handling */
@@ -18,4 +18,4 @@ typedef struct target_sigaltstack { 


#include "../generic/signal.h"



#endif /* TARGET_SIGNAL_H */
 
#endif /* NIOS2_TARGET_SIGNAL_H */

linux-user/nios2/target_structs.h

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
 * 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 TARGET_STRUCTS_H

#define TARGET_STRUCTS_H

#ifndef NIOS2_TARGET_STRUCTS_H

#define NIOS2_TARGET_STRUCTS_H



struct target_ipc_perm {

    abi_int __key;                      /* Key.  */

linux-user/nios2/target_syscall.h

+3 −3
Original line number Diff line number Diff line 
#ifndef TARGET_SYSCALL_H

#define TARGET_SYSCALL_H

#ifndef NIOS2_TARGET_SYSCALL_H

#define NIOS2_TARGET_SYSCALL_H



#define UNAME_MACHINE "nios2"

#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_FUTURE  2



#endif  /* TARGET_SYSCALL_H */
 
#endif /* NIOS2_TARGET_SYSCALL_H */

linux-user/riscv/target_cpu.h

+2 −2
Original line number Diff line number Diff line 
#ifndef TARGET_CPU_H

#define TARGET_CPU_H

#ifndef RISCV_TARGET_CPU_H

#define RISCV_TARGET_CPU_H



static inline void cpu_clone_regs(CPURISCVState *env, target_ulong newsp)

{