3 files changed, 26 insertions, 26 deletions
diff --git a/tests/t0024-abi-predefined.sh b/tests/t0024-abi-predefined.sh
index 9afee99..ba1f01e 100755
--- a/tests/t0024-abi-predefined.sh
+++ b/tests/t0024-abi-predefined.sh
@@ -11,21 +11,21 @@ old_version = __VERSION__;
 byte_order = __BYTE_ORDER__;
 mcpu_byte_order = __MCPU_BYTE_ORDER__;
 word_order = __MCPU_WORD_ORDER__;
-register_width = __MCPU_MACHINE_REGISTER_WIDTH__;
+register_width = __MCPU_HOST_MACHINE_REGISTER_WIDTH__;
 real_io_limit = __MCPU_REAL_IO_LIMIT__;
 math_fn_limit = __MCPU_MATH_FN_LIMIT__;
 pointer_width = __MCPU_POINTER_WIDTH__;
 int_max_width = __MCPU_INT_MAX_WIDTH__;
 real_max_width = __MCPU_REAL_MAX_WIDTH__;
 complex_max_width = __MCPU_COMPLEX_MAX_WIDTH__;
-size_type = __MCPU_SIZE_TYPE__;
-size_width = __MCPU_SIZE_WIDTH__;
-size_sizeof = __MCPU_SIZEOF_SIZE__;
-size_max = __MCPU_SIZE_MAX__;
-ssize_type = __MCPU_SSIZE_TYPE__;
-ssize_width = __MCPU_SSIZE_WIDTH__;
-ssize_sizeof = __MCPU_SIZEOF_SSIZE__;
-ssize_max = __MCPU_SSIZE_MAX__;
+size_type = __MCPU_HOST_MACHINE_SIZE_TYPE__;
+size_width = __MCPU_HOST_MACHINE_SIZE_WIDTH__;
+size_sizeof = __MCPU_HOST_MACHINE_SIZEOF_SIZE__;
+size_max = __MCPU_HOST_MACHINE_SIZE_MAX__;
+ssize_type = __MCPU_HOST_MACHINE_SSIZE_TYPE__;
+ssize_width = __MCPU_HOST_MACHINE_SSIZE_WIDTH__;
+ssize_sizeof = __MCPU_HOST_MACHINE_SIZEOF_SSIZE__;
+ssize_max = __MCPU_HOST_MACHINE_SSIZE_MAX__;
 ptrdiff_type = __PTRDIFF_TYPE__;
 ptrdiff_width = __PTRDIFF_WIDTH__;
 ptrdiff_max = __PTRDIFF_MAX__;
diff --git a/tests/t0025-dump-macros.sh b/tests/t0025-dump-macros.sh
index 3213f7b..5d514e7 100755
--- a/tests/t0025-dump-macros.sh
+++ b/tests/t0025-dump-macros.sh
@@ -10,7 +10,7 @@ test -s "$base/macros"
 LC_ALL=C sort -c "$base/macros"
 grep '^#define _ARCH_MCPU 1$' "$base/macros" >/dev/null
 grep '^#define __MCPU_CPP_VERSION__ "1\.0\.5"$' "$base/macros" >/dev/null
-grep '^#define __MCPU_MACHINE_REGISTER_WIDTH__ \(64\|32\)$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_REGISTER_WIDTH__ \(64\|32\)$' "$base/macros" >/dev/null
 grep '^#define __MCPU_REAL_IO_LIMIT__ [0-9][0-9]*$' "$base/macros" >/dev/null
 grep '^#define __MCPU_MATH_FN_LIMIT__ [0-9][0-9]*$' "$base/macros" >/dev/null
 grep '^#define __MCPU_BYTE_ORDER__ __ORDER_\(LITTLE\|BIG\)_ENDIAN__$' "$base/macros" >/dev/null
@@ -21,10 +21,10 @@ grep '^#define __MCPU_REAL_MAX_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
 grep '^#define __MCPU_COMPLEX_MAX_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
 grep '^#define __REGISTER_PREFIX__$' "$base/macros" >/dev/null
 grep '^#define __USER_LABEL_PREFIX__$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SIZE_TYPE__ uint[0-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SIZE_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SIZEOF_SIZE__ [1-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SIZE_MAX__ 0x[0-9a-f][0-9a-f]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZE_TYPE__ uint[0-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZE_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZEOF_SIZE__ [1-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZE_MAX__ 0x[0-9a-f][0-9a-f]*$' "$base/macros" >/dev/null
 grep '^#define __PTRDIFF_TYPE__ int64$' "$base/macros" >/dev/null
 grep '^#define __PTRDIFF_WIDTH__ 64$' "$base/macros" >/dev/null
 grep '^#define __PTRDIFF_MAX__ 0x7fffffffffffffff$' "$base/macros" >/dev/null
@@ -32,10 +32,10 @@ grep '^#define __SIZEOF_PTRDIFF__ 8$' "$base/macros" >/dev/null
 grep '^#define __INTPTR_TYPE__ int64$' "$base/macros" >/dev/null
 grep '^#define __INTPTR_WIDTH__ 64$' "$base/macros" >/dev/null
 grep '^#define __INTPTR_MAX__ 0x7fffffffffffffff$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SSIZE_TYPE__ int[0-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SSIZE_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SIZEOF_SSIZE__ [1-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SSIZE_MAX__ 0x[0-9a-f][0-9a-f]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SSIZE_TYPE__ int[0-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SSIZE_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZEOF_SSIZE__ [1-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SSIZE_MAX__ 0x[0-9a-f][0-9a-f]*$' "$base/macros" >/dev/null
 grep '^#define __UINTPTR_TYPE__ uint64$' "$base/macros" >/dev/null
 grep '^#define __UINTPTR_WIDTH__ 64$' "$base/macros" >/dev/null
 grep '^#define __UINTPTR_MAX__ 0xffffffffffffffff$' "$base/macros" >/dev/null
diff --git a/tests/t0029-predefined-abi-names.sh b/tests/t0029-predefined-abi-names.sh
index 37b2f55..3ed158c 100755
--- a/tests/t0029-predefined-abi-names.sh
+++ b/tests/t0029-predefined-abi-names.sh
@@ -6,14 +6,14 @@ trap 'rm -rf "$base"' EXIT HUP INT TERM
 
 "$MCPU_CPP" --no-config -dMP < /dev/null > "$base/macros"
 
-grep '^#define __MCPU_SIZE_TYPE__ uint[0-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SIZE_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SIZEOF_SIZE__ [1-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SIZE_MAX__ 0x[0-9a-f][0-9a-f]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SSIZE_TYPE__ int[0-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SSIZE_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SIZEOF_SSIZE__ [1-9][0-9]*$' "$base/macros" >/dev/null
-grep '^#define __MCPU_SSIZE_MAX__ 0x[0-9a-f][0-9a-f]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZE_TYPE__ uint[0-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZE_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZEOF_SIZE__ [1-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZE_MAX__ 0x[0-9a-f][0-9a-f]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SSIZE_TYPE__ int[0-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SSIZE_WIDTH__ [1-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SIZEOF_SSIZE__ [1-9][0-9]*$' "$base/macros" >/dev/null
+grep '^#define __MCPU_HOST_MACHINE_SSIZE_MAX__ 0x[0-9a-f][0-9a-f]*$' "$base/macros" >/dev/null
 grep '^#define __SIZEOF_PTRDIFF__ 8$' "$base/macros" >/dev/null
 grep '^#define __BYTE_ORDER__ __MCPU_BYTE_ORDER__$' "$base/macros" >/dev/null
 grep '^#define __MCPU_BYTE_ORDER__ __ORDER_\(LITTLE\|BIG\)_ENDIAN__$' "$base/macros" >/dev/null