Commit 672dbf97 authored by Mark Brown's avatar Mark Brown Committed by Will Deacon
Browse files

kselftest/arm64: Use the tools/include compiler.h rather than our own 



The BTI test program started life as standalone programs outside the
kselftest suite so provided it's own compiler.h. Now that we have updated
the tools/include compiler.h to have all the definitions that we are using
and the arm64 selftsets pull in tools/includes let's drop our custom
version.

__unreachable() is named unreachable() there requiring an update in the
code.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230728-arm64-signal-memcpy-fix-v4-6-0c1290db5d46@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent db7a89f7

tools/testing/selftests/arm64/bti/compiler.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2019  Arm Limited

 * Original author: Dave Martin <Dave.Martin@arm.com>

 */



#ifndef COMPILER_H

#define COMPILER_H



#define __always_unused __attribute__((__unused__))

#define __noreturn __attribute__((__noreturn__))

#define __unreachable() __builtin_unreachable()



/* curse(e) has value e, but the compiler cannot assume so */

#define curse(e) ({				\

	__typeof__(e) __curse_e = (e);		\

	asm ("" : "+r" (__curse_e));		\

	__curse_e;				\

})



#endif /* ! COMPILER_H */

tools/testing/selftests/arm64/bti/system.c

+1 −3
Original line number Diff line number Diff line
@@ -8,12 +8,10 @@ 


#include <asm/unistd.h>



#include "compiler.h"



void __noreturn exit(int n)

{

	syscall(__NR_exit, n);

	__unreachable();

	unreachable();

}



ssize_t write(int fd, const void *buf, size_t size)

tools/testing/selftests/arm64/bti/system.h

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ typedef __kernel_size_t size_t; 
typedef __kernel_ssize_t ssize_t;



#include <linux/errno.h>

#include <linux/compiler.h>



#include <asm/hwcap.h>

#include <asm/ptrace.h>

#include <asm/unistd.h>



#include "compiler.h"



long syscall(int nr, ...);



void __noreturn exit(int n);

tools/testing/selftests/arm64/bti/test.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
typedef struct ucontext ucontext_t;



#include "btitest.h"

#include "compiler.h"

#include "signal.h"



#define EXPECTED_TESTS 18