diff options
author | Chris Metcalf <cmetcalf@mellanox.com> | 2017-03-23 11:31:19 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@mellanox.com> | 2017-03-27 13:56:09 -0400 |
commit | 34649f72b628c7c4966c167b8208f2595ca51251 (patch) | |
tree | 5f64fe185bc5b77bf079f74aecbbe5823592909f /arch/tile/include/uapi/arch/abi.h | |
parent | Linux 4.11-rc4 (diff) | |
download | linux-dev-34649f72b628c7c4966c167b8208f2595ca51251.tar.xz linux-dev-34649f72b628c7c4966c167b8208f2595ca51251.zip |
tile: prefer <arch/intreg.h> to __need_int_reg_t
As part of some work in glibc to move away from the "__need" prefix,
this commit breaks away the definitions of __int_reg_t, __uint_reg_t,
__INT_REG_BITS, and __INT_REG_FMT to a separate <arch/intreg.h>
"microheader". It is then included from <arch/abi.h> to preserve
the semantics of the previous header.
For now, we continue to preserve the __need_int_reg_t semantics
in <arch/abi.h> as well, but anticipate that after a few years
we can obsolete it.
Diffstat (limited to 'arch/tile/include/uapi/arch/abi.h')
-rw-r--r-- | arch/tile/include/uapi/arch/abi.h | 49 |
1 files changed, 4 insertions, 45 deletions
diff --git a/arch/tile/include/uapi/arch/abi.h b/arch/tile/include/uapi/arch/abi.h index c55a3d432644..328e62260272 100644 --- a/arch/tile/include/uapi/arch/abi.h +++ b/arch/tile/include/uapi/arch/abi.h @@ -20,58 +20,17 @@ #ifndef __ARCH_ABI_H__ -#if !defined __need_int_reg_t && !defined __DOXYGEN__ -# define __ARCH_ABI_H__ -# include <arch/chip.h> -#endif - -/* Provide the basic machine types. */ -#ifndef __INT_REG_BITS - -/** Number of bits in a register. */ -#if defined __tilegx__ -# define __INT_REG_BITS 64 -#elif defined __tilepro__ -# define __INT_REG_BITS 32 -#elif !defined __need_int_reg_t +#ifndef __tile__ /* support uncommon use of arch headers in non-tile builds */ # include <arch/chip.h> # define __INT_REG_BITS CHIP_WORD_SIZE() -#else -# error Unrecognized architecture with __need_int_reg_t -#endif - -#if __INT_REG_BITS == 64 - -#ifndef __ASSEMBLER__ -/** Unsigned type that can hold a register. */ -typedef unsigned long long __uint_reg_t; - -/** Signed type that can hold a register. */ -typedef long long __int_reg_t; -#endif - -/** String prefix to use for printf(). */ -#define __INT_REG_FMT "ll" - -#else - -#ifndef __ASSEMBLER__ -/** Unsigned type that can hold a register. */ -typedef unsigned long __uint_reg_t; - -/** Signed type that can hold a register. */ -typedef long __int_reg_t; -#endif - -/** String prefix to use for printf(). */ -#define __INT_REG_FMT "l" - #endif -#endif /* __INT_REG_BITS */ +#include <arch/intreg.h> +/* __need_int_reg_t is deprecated: just include <arch/intreg.h> */ #ifndef __need_int_reg_t +#define __ARCH_ABI_H__ #ifndef __ASSEMBLER__ /** Unsigned type that can hold a register. */ |