aboutsummaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
Diffstat (limited to 'libc')
-rw-r--r--libc/include/CMakeLists.txt13
-rw-r--r--libc/include/llvm-libc-macros/gpu/signal-macros.h9
-rw-r--r--libc/include/llvm-libc-macros/linux/signal-macros.h9
-rw-r--r--libc/include/llvm-libc-types/CMakeLists.txt13
-rw-r--r--libc/include/llvm-libc-types/int_hk_t.h14
-rw-r--r--libc/include/llvm-libc-types/int_hr_t.h14
-rw-r--r--libc/include/llvm-libc-types/int_k_t.h14
-rw-r--r--libc/include/llvm-libc-types/int_lk_t.h14
-rw-r--r--libc/include/llvm-libc-types/int_lr_t.h14
-rw-r--r--libc/include/llvm-libc-types/int_r_t.h14
-rw-r--r--libc/include/llvm-libc-types/stdfix-types.h25
-rw-r--r--libc/include/llvm-libc-types/uint_uhk_t.h14
-rw-r--r--libc/include/llvm-libc-types/uint_uhr_t.h14
-rw-r--r--libc/include/llvm-libc-types/uint_uk_t.h14
-rw-r--r--libc/include/llvm-libc-types/uint_ulk_t.h14
-rw-r--r--libc/include/llvm-libc-types/uint_ulr_t.h14
-rw-r--r--libc/include/llvm-libc-types/uint_ur_t.h14
-rw-r--r--libc/include/stdfix.yaml14
-rw-r--r--libc/src/stdfix/CMakeLists.txt1
-rw-r--r--libc/src/stdfix/bitshk.cpp2
-rw-r--r--libc/src/stdfix/bitshk.h2
-rw-r--r--libc/src/stdfix/bitshr.cpp2
-rw-r--r--libc/src/stdfix/bitshr.h2
-rw-r--r--libc/src/stdfix/bitsk.cpp2
-rw-r--r--libc/src/stdfix/bitsk.h2
-rw-r--r--libc/src/stdfix/bitslk.cpp2
-rw-r--r--libc/src/stdfix/bitslk.h2
-rw-r--r--libc/src/stdfix/bitslr.cpp2
-rw-r--r--libc/src/stdfix/bitslr.h2
-rw-r--r--libc/src/stdfix/bitsr.cpp2
-rw-r--r--libc/src/stdfix/bitsr.h2
-rwxr-xr-xlibc/src/stdfix/bitsuhk.cpp2
-rwxr-xr-xlibc/src/stdfix/bitsuhk.h2
-rwxr-xr-xlibc/src/stdfix/bitsuhr.cpp2
-rwxr-xr-xlibc/src/stdfix/bitsuhr.h2
-rwxr-xr-xlibc/src/stdfix/bitsuk.cpp2
-rwxr-xr-xlibc/src/stdfix/bitsuk.h2
-rwxr-xr-xlibc/src/stdfix/bitsulk.cpp2
-rwxr-xr-xlibc/src/stdfix/bitsulk.h2
-rwxr-xr-xlibc/src/stdfix/bitsulr.cpp2
-rwxr-xr-xlibc/src/stdfix/bitsulr.h2
-rwxr-xr-xlibc/src/stdfix/bitsur.cpp2
-rwxr-xr-xlibc/src/stdfix/bitsur.h2
-rwxr-xr-xlibc/src/stdfix/bitusk.cpp2
-rw-r--r--libc/src/stdfix/hkbits.h2
-rw-r--r--libc/src/stdfix/hrbits.h2
-rw-r--r--libc/src/stdfix/kbits.h2
-rw-r--r--libc/src/stdfix/lkbits.h2
-rw-r--r--libc/src/stdfix/lrbits.h2
-rw-r--r--libc/src/stdfix/rbits.h2
-rw-r--r--libc/src/stdfix/uhkbits.h2
-rw-r--r--libc/src/stdfix/uhrbits.h2
-rw-r--r--libc/src/stdfix/ukbits.h2
-rw-r--r--libc/src/stdfix/ulkbits.h2
-rw-r--r--libc/src/stdfix/ulrbits.h2
-rw-r--r--libc/src/stdfix/urbits.h2
-rw-r--r--libc/test/src/stdfix/CMakeLists.txt13
-rw-r--r--libc/test/src/stdfix/FxBitsTest.h1
-rw-r--r--libc/test/src/stdfix/bitshk_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitshr_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitsk_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitslk_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitslr_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitsr_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitsuhk_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitsuhr_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitsuk_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitsulk_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitsulr_test.cpp2
-rw-r--r--libc/test/src/stdfix/bitsur_test.cpp2
70 files changed, 278 insertions, 86 deletions
diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index a277690..7b52daf 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -166,7 +166,18 @@ add_header_macro(
stdfix.h
DEPENDS
.llvm-libc-macros.stdfix_macros
- .llvm-libc-types.stdfix-types
+ .llvm-libc-types.int_hk_t
+ .llvm-libc-types.int_hr_t
+ .llvm-libc-types.int_k_t
+ .llvm-libc-types.int_lk_t
+ .llvm-libc-types.int_lr_t
+ .llvm-libc-types.int_r_t
+ .llvm-libc-types.uint_uhk_t
+ .llvm-libc-types.uint_uhr_t
+ .llvm-libc-types.uint_uk_t
+ .llvm-libc-types.uint_ulk_t
+ .llvm-libc-types.uint_ulr_t
+ .llvm-libc-types.uint_ur_t
)
diff --git a/libc/include/llvm-libc-macros/gpu/signal-macros.h b/libc/include/llvm-libc-macros/gpu/signal-macros.h
index f0d49ea..76488e9 100644
--- a/libc/include/llvm-libc-macros/gpu/signal-macros.h
+++ b/libc/include/llvm-libc-macros/gpu/signal-macros.h
@@ -9,6 +9,8 @@
#ifndef LLVM_LIBC_MACROS_GPU_SIGNAL_MACROS_H
#define LLVM_LIBC_MACROS_GPU_SIGNAL_MACROS_H
+#include "__llvm-libc-common.h"
+
#define SIGINT 2
#define SIGILL 4
#define SIGABRT 6
@@ -16,9 +18,10 @@
#define SIGSEGV 11
#define SIGTERM 15
-#define SIG_DFL ((void (*)(int))(0))
-#define SIG_IGN ((void (*)(int))(1))
-#define SIG_ERR ((void (*)(int))(-1))
+#define SIG_ERR __LLVM_LIBC_CAST(reinterpret_cast, void (*)(int), -1)
+#define SIG_DFL __LLVM_LIBC_CAST(reinterpret_cast, void (*)(int), 0)
+#define SIG_IGN __LLVM_LIBC_CAST(reinterpret_cast, void (*)(int), 1)
+#define SIG_HOLD __LLVM_LIBC_CAST(reinterpret_cast, void (*)(int), 2)
// Max signal number
#define NSIG 64
diff --git a/libc/include/llvm-libc-macros/linux/signal-macros.h b/libc/include/llvm-libc-macros/linux/signal-macros.h
index d220241..e7f268d 100644
--- a/libc/include/llvm-libc-macros/linux/signal-macros.h
+++ b/libc/include/llvm-libc-macros/linux/signal-macros.h
@@ -9,6 +9,8 @@
#ifndef LLVM_LIBC_MACROS_LINUX_SIGNAL_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SIGNAL_MACROS_H
+#include "__llvm-libc-common.h"
+
#define SIGHUP 1
#define SIGINT 2
#define SIGQUIT 3
@@ -86,9 +88,10 @@
#error "Signal stack sizes not defined for your platform."
#endif
-#define SIG_DFL ((void (*)(int))0)
-#define SIG_IGN ((void (*)(int))1)
-#define SIG_ERR ((void (*)(int))(-1))
+#define SIG_ERR __LLVM_LIBC_CAST(reinterpret_cast, void (*)(int), -1)
+#define SIG_DFL __LLVM_LIBC_CAST(reinterpret_cast, void (*)(int), 0)
+#define SIG_IGN __LLVM_LIBC_CAST(reinterpret_cast, void (*)(int), 1)
+#define SIG_HOLD __LLVM_LIBC_CAST(reinterpret_cast, void (*)(int), 2)
// SIGCHLD si_codes
#define CLD_EXITED 1 // child has exited
diff --git a/libc/include/llvm-libc-types/CMakeLists.txt b/libc/include/llvm-libc-types/CMakeLists.txt
index a428a0e..fcd0e12 100644
--- a/libc/include/llvm-libc-types/CMakeLists.txt
+++ b/libc/include/llvm-libc-types/CMakeLists.txt
@@ -174,7 +174,18 @@ DEPENDS
)
add_header(locale_t HDR locale_t.h)
add_header(struct_lconv HDR struct_lconv.h)
-add_header(stdfix-types HDR stdfix-types.h)
+add_header(int_hk_t HDR int_hk_t.h)
+add_header(int_hr_t HDR int_hr_t.h)
+add_header(int_k_t HDR int_k_t.h)
+add_header(int_lk_t HDR int_lk_t.h)
+add_header(int_lr_t HDR int_lr_t.h)
+add_header(int_r_t HDR int_r_t.h)
+add_header(uint_uhk_t HDR uint_uhk_t.h)
+add_header(uint_uhr_t HDR uint_uhr_t.h)
+add_header(uint_uk_t HDR uint_uk_t.h)
+add_header(uint_ulk_t HDR uint_ulk_t.h)
+add_header(uint_ulr_t HDR uint_ulr_t.h)
+add_header(uint_ur_t HDR uint_ur_t.h)
# UEFI
add_header(EFI_GUID HDR EFI_GUID.h DEPENDS libc.include.llvm-libc-macros.stdint_macros)
diff --git a/libc/include/llvm-libc-types/int_hk_t.h b/libc/include/llvm-libc-types/int_hk_t.h
new file mode 100644
index 0000000..eb17224
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_hk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_HK_T_H
+#define LLVM_LIBC_TYPES_INT_HK_T_H
+
+typedef signed short int_hk_t;
+
+#endif // LLVM_LIBC_TYPES_INT_HK_T_H
diff --git a/libc/include/llvm-libc-types/int_hr_t.h b/libc/include/llvm-libc-types/int_hr_t.h
new file mode 100644
index 0000000..89b57a8
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_hr_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_HR_T_H
+#define LLVM_LIBC_TYPES_INT_HR_T_H
+
+typedef signed char int_hr_t;
+
+#endif // LLVM_LIBC_TYPES_INT_HR_T_H
diff --git a/libc/include/llvm-libc-types/int_k_t.h b/libc/include/llvm-libc-types/int_k_t.h
new file mode 100644
index 0000000..193f9d8
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_k_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_K_T_H
+#define LLVM_LIBC_TYPES_INT_K_T_H
+
+typedef signed int int_k_t;
+
+#endif // LLVM_LIBC_TYPES_INT_K_T_H
diff --git a/libc/include/llvm-libc-types/int_lk_t.h b/libc/include/llvm-libc-types/int_lk_t.h
new file mode 100644
index 0000000..c8f3137
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_lk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_LK_T_H
+#define LLVM_LIBC_TYPES_INT_LK_T_H
+
+typedef signed long long int_lk_t;
+
+#endif // LLVM_LIBC_TYPES_INT_LK_T_H
diff --git a/libc/include/llvm-libc-types/int_lr_t.h b/libc/include/llvm-libc-types/int_lr_t.h
new file mode 100644
index 0000000..f2987e8
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_lr_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_LR_T_H
+#define LLVM_LIBC_TYPES_INT_LR_T_H
+
+typedef signed int int_lr_t;
+
+#endif // LLVM_LIBC_TYPES_INT_LR_T_H
diff --git a/libc/include/llvm-libc-types/int_r_t.h b/libc/include/llvm-libc-types/int_r_t.h
new file mode 100644
index 0000000..6b528f4
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_r_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_R_T_H
+#define LLVM_LIBC_TYPES_INT_R_T_H
+
+typedef signed short int int_r_t;
+
+#endif // LLVM_LIBC_TYPES_INT_R_T_H
diff --git a/libc/include/llvm-libc-types/stdfix-types.h b/libc/include/llvm-libc-types/stdfix-types.h
deleted file mode 100644
index 542d45e..0000000
--- a/libc/include/llvm-libc-types/stdfix-types.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//===-- Definition of stdfix integer types --------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIBC_TYPES_STDFIX_TYPES_H
-#define LLVM_LIBC_TYPES_STDFIX_TYPES_H
-
-typedef signed char int_hr_t;
-typedef signed short int int_r_t;
-typedef signed int int_lr_t;
-typedef signed short int_hk_t;
-typedef signed int int_k_t;
-typedef signed long long int_lk_t;
-typedef unsigned char uint_uhr_t;
-typedef unsigned short int uint_ur_t;
-typedef unsigned int uint_ulr_t;
-typedef unsigned short int uint_uhk_t;
-typedef unsigned int uint_uk_t;
-typedef unsigned long long uint_ulk_t;
-
-#endif // LLVM_LIBC_TYPES_STDFIX_TYPES_H
diff --git a/libc/include/llvm-libc-types/uint_uhk_t.h b/libc/include/llvm-libc-types/uint_uhk_t.h
new file mode 100644
index 0000000..ed0f427
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_uhk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_UHK_T_H
+#define LLVM_LIBC_TYPES_UINT_UHK_T_H
+
+typedef unsigned short int uint_uhk_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_UHK_T_H
diff --git a/libc/include/llvm-libc-types/uint_uhr_t.h b/libc/include/llvm-libc-types/uint_uhr_t.h
new file mode 100644
index 0000000..e3eab1c
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_uhr_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_UHR_T_H
+#define LLVM_LIBC_TYPES_UINT_UHR_T_H
+
+typedef unsigned char uint_uhr_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_UHR_T_H
diff --git a/libc/include/llvm-libc-types/uint_uk_t.h b/libc/include/llvm-libc-types/uint_uk_t.h
new file mode 100644
index 0000000..f9bbc7b
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_uk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_UK_T_H
+#define LLVM_LIBC_TYPES_UINT_UK_T_H
+
+typedef unsigned int uint_uk_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_UK_T_H
diff --git a/libc/include/llvm-libc-types/uint_ulk_t.h b/libc/include/llvm-libc-types/uint_ulk_t.h
new file mode 100644
index 0000000..b7a54b0
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_ulk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_ULK_T_H
+#define LLVM_LIBC_TYPES_UINT_ULK_T_H
+
+typedef unsigned long long uint_ulk_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_ULK_T_H
diff --git a/libc/include/llvm-libc-types/uint_ulr_t.h b/libc/include/llvm-libc-types/uint_ulr_t.h
new file mode 100644
index 0000000..9f4682c
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_ulr_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_ULR_T_H
+#define LLVM_LIBC_TYPES_UINT_ULR_T_H
+
+typedef unsigned int uint_ulr_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_ULR_T_H
diff --git a/libc/include/llvm-libc-types/uint_ur_t.h b/libc/include/llvm-libc-types/uint_ur_t.h
new file mode 100644
index 0000000..267c9c4
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_ur_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_UR_T_H
+#define LLVM_LIBC_TYPES_UINT_UR_T_H
+
+typedef unsigned short int uint_ur_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_UR_T_H
diff --git a/libc/include/stdfix.yaml b/libc/include/stdfix.yaml
index 451330c..9f1a32f 100644
--- a/libc/include/stdfix.yaml
+++ b/libc/include/stdfix.yaml
@@ -8,7 +8,19 @@ macros:
- macro_name: roundfx
macro_header: stdfix-macros.h
types:
- - type_name: stdfix-types
+ - type_name: int_hk_t
+ - type_name: int_hr_t
+ - type_name: int_k_t
+ - type_name: int_lk_t
+ - type_name: int_lr_t
+ - type_name: int_r_t
+ - type_name: uint_uhk_t
+ - type_name: uint_uhr_t
+ - type_name: uint_uk_t
+ - type_name: uint_ulk_t
+ - type_name: uint_ulr_t
+ - type_name: uint_ur_t
+
enums: []
objects: []
functions:
diff --git a/libc/src/stdfix/CMakeLists.txt b/libc/src/stdfix/CMakeLists.txt
index 3cbabd1..e9841cd 100644
--- a/libc/src/stdfix/CMakeLists.txt
+++ b/libc/src/stdfix/CMakeLists.txt
@@ -58,7 +58,6 @@ foreach(suffix IN ITEMS hr r lr hk k lk uhr ur ulr uhk uk ulk)
${libc_opt_high_flag}
DEPENDS
libc.src.__support.fixed_point.fx_bits
- libc.include.llvm-libc-types.stdfix-types
libc.include.llvm-libc-macros.stdfix_macros
)
diff --git a/libc/src/stdfix/bitshk.cpp b/libc/src/stdfix/bitshk.cpp
index d0a3e128..be4e71a 100644
--- a/libc/src/stdfix/bitshk.cpp
+++ b/libc/src/stdfix/bitshk.cpp
@@ -8,7 +8,7 @@
#include "bitshk.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // short accum
-#include "include/llvm-libc-types/stdfix-types.h" // int_hk_t
+#include "include/llvm-libc-types/int_hk_t.h"
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitshk.h b/libc/src/stdfix/bitshk.h
index a1505e2..2439576 100644
--- a/libc/src/stdfix/bitshk.h
+++ b/libc/src/stdfix/bitshk.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSHK_H
#include "include/llvm-libc-macros/stdfix-macros.h" // short accum
-#include "include/llvm-libc-types/stdfix-types.h" // int_hk_t
+#include "include/llvm-libc-types/int_hk_t.h" // int_hk_t
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitshr.cpp b/libc/src/stdfix/bitshr.cpp
index 394d1f0..e70bf0a 100644
--- a/libc/src/stdfix/bitshr.cpp
+++ b/libc/src/stdfix/bitshr.cpp
@@ -8,7 +8,7 @@
#include "bitshr.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // short fract
-#include "include/llvm-libc-types/stdfix-types.h" // int_hr_t
+#include "include/llvm-libc-types/int_hr_t.h"
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitshr.h b/libc/src/stdfix/bitshr.h
index d5b4b8f..c1517a9 100644
--- a/libc/src/stdfix/bitshr.h
+++ b/libc/src/stdfix/bitshr.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSHR_H
#include "include/llvm-libc-macros/stdfix-macros.h" // short fract
-#include "include/llvm-libc-types/stdfix-types.h" // int_hr_t
+#include "include/llvm-libc-types/int_hr_t.h"
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitsk.cpp b/libc/src/stdfix/bitsk.cpp
index f8c9d77..0f1a3f3 100644
--- a/libc/src/stdfix/bitsk.cpp
+++ b/libc/src/stdfix/bitsk.cpp
@@ -8,7 +8,7 @@
#include "bitsk.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // accum
-#include "include/llvm-libc-types/stdfix-types.h" // int_k_t
+#include "include/llvm-libc-types/int_k_t.h"
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitsk.h b/libc/src/stdfix/bitsk.h
index 32d5a72..3e41b43 100644
--- a/libc/src/stdfix/bitsk.h
+++ b/libc/src/stdfix/bitsk.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSK_H
#include "include/llvm-libc-macros/stdfix-macros.h" // accum
-#include "include/llvm-libc-types/stdfix-types.h" // int_k_t
+#include "include/llvm-libc-types/int_k_t.h"
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitslk.cpp b/libc/src/stdfix/bitslk.cpp
index f4af2a8..1065c32 100644
--- a/libc/src/stdfix/bitslk.cpp
+++ b/libc/src/stdfix/bitslk.cpp
@@ -8,7 +8,7 @@
#include "bitslk.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // long accum
-#include "include/llvm-libc-types/stdfix-types.h" // int_lk_t
+#include "include/llvm-libc-types/int_lk_t.h" // int_lk_t
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitslk.h b/libc/src/stdfix/bitslk.h
index 821116b..e1a0c18 100644
--- a/libc/src/stdfix/bitslk.h
+++ b/libc/src/stdfix/bitslk.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSLK_H
#include "include/llvm-libc-macros/stdfix-macros.h" // long accum
-#include "include/llvm-libc-types/stdfix-types.h" // int_lk_t
+#include "include/llvm-libc-types/int_lk_t.h"
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitslr.cpp b/libc/src/stdfix/bitslr.cpp
index 3b38aa2..e8a4993 100644
--- a/libc/src/stdfix/bitslr.cpp
+++ b/libc/src/stdfix/bitslr.cpp
@@ -8,7 +8,7 @@
#include "bitslr.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // long fract
-#include "include/llvm-libc-types/stdfix-types.h" // int_lr_t
+#include "include/llvm-libc-types/int_lr_t.h" // int_lr_t
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitslr.h b/libc/src/stdfix/bitslr.h
index 0cb5972..d0e468b6 100644
--- a/libc/src/stdfix/bitslr.h
+++ b/libc/src/stdfix/bitslr.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSLR_H
#include "include/llvm-libc-macros/stdfix-macros.h" // long fract
-#include "include/llvm-libc-types/stdfix-types.h" // int_lr_t
+#include "include/llvm-libc-types/int_lr_t.h" // int_lr_t
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitsr.cpp b/libc/src/stdfix/bitsr.cpp
index 2b6ad2c..4eefe28 100644
--- a/libc/src/stdfix/bitsr.cpp
+++ b/libc/src/stdfix/bitsr.cpp
@@ -8,7 +8,7 @@
#include "bitsr.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // fract
-#include "include/llvm-libc-types/stdfix-types.h" // int_r_t
+#include "include/llvm-libc-types/int_r_t.h" // int_r_t
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitsr.h b/libc/src/stdfix/bitsr.h
index e071f03..5742a59 100644
--- a/libc/src/stdfix/bitsr.h
+++ b/libc/src/stdfix/bitsr.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSR_H
#include "include/llvm-libc-macros/stdfix-macros.h" // fract
-#include "include/llvm-libc-types/stdfix-types.h" // int_r_t
+#include "include/llvm-libc-types/int_r_t.h"
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitsuhk.cpp b/libc/src/stdfix/bitsuhk.cpp
index 1b0bf59a..62f7cf3 100755
--- a/libc/src/stdfix/bitsuhk.cpp
+++ b/libc/src/stdfix/bitsuhk.cpp
@@ -8,7 +8,7 @@
#include "bitsuhk.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned short accum
-#include "include/llvm-libc-types/stdfix-types.h" // uint_uhk_t
+#include "include/llvm-libc-types/uint_uhk_t.h" // uint_uhk_t
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitsuhk.h b/libc/src/stdfix/bitsuhk.h
index 1e80286..b308282 100755
--- a/libc/src/stdfix/bitsuhk.h
+++ b/libc/src/stdfix/bitsuhk.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSUHK_H
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned short accum
-#include "include/llvm-libc-types/stdfix-types.h" // uint_uhk_t
+#include "include/llvm-libc-types/uint_uhk_t.h" // uint_uhk_t
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitsuhr.cpp b/libc/src/stdfix/bitsuhr.cpp
index 66152e1..236b2a0 100755
--- a/libc/src/stdfix/bitsuhr.cpp
+++ b/libc/src/stdfix/bitsuhr.cpp
@@ -8,7 +8,7 @@
#include "bitsuhr.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned short fract
-#include "include/llvm-libc-types/stdfix-types.h" // uint_uhr_t
+#include "include/llvm-libc-types/uint_uhr_t.h"
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitsuhr.h b/libc/src/stdfix/bitsuhr.h
index 0311665..662cd9c 100755
--- a/libc/src/stdfix/bitsuhr.h
+++ b/libc/src/stdfix/bitsuhr.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSUHR_H
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned short fract
-#include "include/llvm-libc-types/stdfix-types.h" // uint_uhr_t
+#include "include/llvm-libc-types/uint_uhr_t.h"
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitsuk.cpp b/libc/src/stdfix/bitsuk.cpp
index b0a92bd..32a4fbe 100755
--- a/libc/src/stdfix/bitsuk.cpp
+++ b/libc/src/stdfix/bitsuk.cpp
@@ -8,7 +8,7 @@
#include "bitsuk.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned accum
-#include "include/llvm-libc-types/stdfix-types.h" // uint_uk_t
+#include "include/llvm-libc-types/uint_uk_t.h" // uint_uk_t
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitsuk.h b/libc/src/stdfix/bitsuk.h
index fce37e8..b73d64b 100755
--- a/libc/src/stdfix/bitsuk.h
+++ b/libc/src/stdfix/bitsuk.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSUK_H
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned accum
-#include "include/llvm-libc-types/stdfix-types.h" // uint_uk_t
+#include "include/llvm-libc-types/uint_uk_t.h"
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitsulk.cpp b/libc/src/stdfix/bitsulk.cpp
index b8f61a1..d1000da 100755
--- a/libc/src/stdfix/bitsulk.cpp
+++ b/libc/src/stdfix/bitsulk.cpp
@@ -8,7 +8,7 @@
#include "bitsulk.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned long accum
-#include "include/llvm-libc-types/stdfix-types.h" // uint_ulk_t
+#include "include/llvm-libc-types/uint_ulk_t.h" // uint_ulk_t
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitsulk.h b/libc/src/stdfix/bitsulk.h
index 1bf681e..9a1a9e9 100755
--- a/libc/src/stdfix/bitsulk.h
+++ b/libc/src/stdfix/bitsulk.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSLK_H
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned long accum
-#include "include/llvm-libc-types/stdfix-types.h" // uint_ulk_t
+#include "include/llvm-libc-types/uint_ulk_t.h"
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitsulr.cpp b/libc/src/stdfix/bitsulr.cpp
index 9fd1b15..4099b71 100755
--- a/libc/src/stdfix/bitsulr.cpp
+++ b/libc/src/stdfix/bitsulr.cpp
@@ -8,7 +8,7 @@
#include "bitsulr.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned long fract
-#include "include/llvm-libc-types/stdfix-types.h" // uint_ulr_t
+#include "include/llvm-libc-types/uint_ulr_t.h"
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitsulr.h b/libc/src/stdfix/bitsulr.h
index cf0f6fb..7ca985d 100755
--- a/libc/src/stdfix/bitsulr.h
+++ b/libc/src/stdfix/bitsulr.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSULR_H
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned long fract
-#include "include/llvm-libc-types/stdfix-types.h" // uint_ulr_t
+#include "include/llvm-libc-types/uint_ulr_t.h" // uint_ulr_t
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitsur.cpp b/libc/src/stdfix/bitsur.cpp
index ffb52de..8d422d4 100755
--- a/libc/src/stdfix/bitsur.cpp
+++ b/libc/src/stdfix/bitsur.cpp
@@ -8,7 +8,7 @@
#include "bitsur.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned fract
-#include "include/llvm-libc-types/stdfix-types.h" // uint_ur_t
+#include "include/llvm-libc-types/uint_ur_t.h"
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/bitsur.h b/libc/src/stdfix/bitsur.h
index 4c938bb..c413ef6 100755
--- a/libc/src/stdfix/bitsur.h
+++ b/libc/src/stdfix/bitsur.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_BITSUR_H
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned fract
-#include "include/llvm-libc-types/stdfix-types.h" // uint_ur_t
+#include "include/llvm-libc-types/uint_ur_t.h" // uint_ur_t
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/bitusk.cpp b/libc/src/stdfix/bitusk.cpp
index ac0852e..8309927 100755
--- a/libc/src/stdfix/bitusk.cpp
+++ b/libc/src/stdfix/bitusk.cpp
@@ -8,7 +8,7 @@
#include "bitsuk.h"
#include "include/llvm-libc-macros/stdfix-macros.h" // unsigned accum
-#include "include/llvm-libc-types/stdfix-types.h" // uint_uk_t
+#include "include/llvm-libc-types/uint_uk_t.h"
#include "src/__support/common.h" // LLVM_LIBC_FUNCTION
#include "src/__support/fixed_point/fx_bits.h" // fixed_point
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
diff --git a/libc/src/stdfix/hkbits.h b/libc/src/stdfix/hkbits.h
index bf1bf82..f674492 100644
--- a/libc/src/stdfix/hkbits.h
+++ b/libc/src/stdfix/hkbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_HKBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_hk_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/hrbits.h b/libc/src/stdfix/hrbits.h
index c6bd99a..7cfda64 100644
--- a/libc/src/stdfix/hrbits.h
+++ b/libc/src/stdfix/hrbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_HRBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_hr_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/kbits.h b/libc/src/stdfix/kbits.h
index 7e709af..c45cf8d 100644
--- a/libc/src/stdfix/kbits.h
+++ b/libc/src/stdfix/kbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_KBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_k_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/lkbits.h b/libc/src/stdfix/lkbits.h
index 177f121..2d30bdb 100644
--- a/libc/src/stdfix/lkbits.h
+++ b/libc/src/stdfix/lkbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_LKBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_lk_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/lrbits.h b/libc/src/stdfix/lrbits.h
index 087aa19..000594ff 100644
--- a/libc/src/stdfix/lrbits.h
+++ b/libc/src/stdfix/lrbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_LRBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_lr_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/rbits.h b/libc/src/stdfix/rbits.h
index 4922e1c..df11cec 100644
--- a/libc/src/stdfix/rbits.h
+++ b/libc/src/stdfix/rbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_RBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_r_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/uhkbits.h b/libc/src/stdfix/uhkbits.h
index 7ef1598..3eef3aa 100644
--- a/libc/src/stdfix/uhkbits.h
+++ b/libc/src/stdfix/uhkbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_UHKBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_uhk_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/uhrbits.h b/libc/src/stdfix/uhrbits.h
index 4011a0e..7198e70 100644
--- a/libc/src/stdfix/uhrbits.h
+++ b/libc/src/stdfix/uhrbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_UHRBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_uhr_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/ukbits.h b/libc/src/stdfix/ukbits.h
index 2374f48..20302cd 100644
--- a/libc/src/stdfix/ukbits.h
+++ b/libc/src/stdfix/ukbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_UKBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_uk_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/ulkbits.h b/libc/src/stdfix/ulkbits.h
index 955c96c..04a74f3 100644
--- a/libc/src/stdfix/ulkbits.h
+++ b/libc/src/stdfix/ulkbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_ULKBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_ulk_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/ulrbits.h b/libc/src/stdfix/ulrbits.h
index 7ae49ba..e5d55ab 100644
--- a/libc/src/stdfix/ulrbits.h
+++ b/libc/src/stdfix/ulrbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_ULRBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_ulr_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/stdfix/urbits.h b/libc/src/stdfix/urbits.h
index 8fc0881..ffa3b38 100644
--- a/libc/src/stdfix/urbits.h
+++ b/libc/src/stdfix/urbits.h
@@ -10,7 +10,7 @@
#define LLVM_LIBC_SRC_STDFIX_URBITS_H
#include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_ur_t.h"
#include "src/__support/macros/config.h"
namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/test/src/stdfix/CMakeLists.txt b/libc/test/src/stdfix/CMakeLists.txt
index 7415222..04bedc3 100644
--- a/libc/test/src/stdfix/CMakeLists.txt
+++ b/libc/test/src/stdfix/CMakeLists.txt
@@ -4,7 +4,6 @@ endif()
add_custom_target(libc-stdfix-tests)
-
foreach(suffix IN ITEMS hr r lr hk k lk)
add_libc_test(
abs${suffix}_test
@@ -84,6 +83,18 @@ foreach(suffix IN ITEMS hr r lr hk k lk uhr ur ulr uhk uk ulk)
SRCS
bits${suffix}_test.cpp
DEPENDS
+ libc.include.llvm-libc-types.int_k_t
+ libc.include.llvm-libc-types.int_hr_t
+ libc.include.llvm-libc-types.int_lk_t
+ libc.include.llvm-libc-types.int_lr_t
+ libc.include.llvm-libc-types.int_r_t
+ libc.include.llvm-libc-types.uint_uhk_t
+ libc.include.llvm-libc-types.uint_uhr_t
+ libc.include.llvm-libc-types.uint_uk_t
+ libc.include.llvm-libc-types.uint_ulk_t
+ libc.include.llvm-libc-types.uint_ulr_t
+ libc.include.llvm-libc-types.uint_ur_t
+ libc.include.llvm-libc-types.int_hk_t
libc.src.stdfix.bits${suffix}
libc.src.__support.fixed_point.fx_rep
libc.src.__support.fixed_point.fx_bits
diff --git a/libc/test/src/stdfix/FxBitsTest.h b/libc/test/src/stdfix/FxBitsTest.h
index ae04cc1..18dacad 100644
--- a/libc/test/src/stdfix/FxBitsTest.h
+++ b/libc/test/src/stdfix/FxBitsTest.h
@@ -8,7 +8,6 @@
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-types/stdfix-types.h"
#include "src/__support/CPP/bit.h"
#include "src/__support/fixed_point/fx_bits.h"
diff --git a/libc/test/src/stdfix/bitshk_test.cpp b/libc/test/src/stdfix/bitshk_test.cpp
index ca83162d..85dbf0a8 100644
--- a/libc/test/src/stdfix/bitshk_test.cpp
+++ b/libc/test/src/stdfix/bitshk_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // int_hk_t
+#include "llvm-libc-types/int_hk_t.h" // int_hk_t
#include "src/stdfix/bitshk.h"
LIST_BITSFX_TESTS(hk, short accum, int_hk_t, LIBC_NAMESPACE::bitshk);
diff --git a/libc/test/src/stdfix/bitshr_test.cpp b/libc/test/src/stdfix/bitshr_test.cpp
index 220d7f6..d9583ad2 100644
--- a/libc/test/src/stdfix/bitshr_test.cpp
+++ b/libc/test/src/stdfix/bitshr_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // int_hr_t
+#include "llvm-libc-types/int_hr_t.h" // int_hr_t
#include "src/stdfix/bitshr.h"
LIST_BITSFX_TESTS(hr, short fract, int_hr_t, LIBC_NAMESPACE::bitshr);
diff --git a/libc/test/src/stdfix/bitsk_test.cpp b/libc/test/src/stdfix/bitsk_test.cpp
index 7e0057b..8d38ab5 100644
--- a/libc/test/src/stdfix/bitsk_test.cpp
+++ b/libc/test/src/stdfix/bitsk_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // int_k_t
+#include "llvm-libc-types/int_k_t.h" // int_k_t
#include "src/stdfix/bitsk.h"
LIST_BITSFX_TESTS(k, accum, int_k_t, LIBC_NAMESPACE::bitsk);
diff --git a/libc/test/src/stdfix/bitslk_test.cpp b/libc/test/src/stdfix/bitslk_test.cpp
index 46c04e2..fc6fcbb 100644
--- a/libc/test/src/stdfix/bitslk_test.cpp
+++ b/libc/test/src/stdfix/bitslk_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // int_lk_t
+#include "llvm-libc-types/int_lk_t.h" // int_lk_t
#include "src/stdfix/bitslk.h"
LIST_BITSFX_TESTS(lk, long accum, int_lk_t, LIBC_NAMESPACE::bitslk);
diff --git a/libc/test/src/stdfix/bitslr_test.cpp b/libc/test/src/stdfix/bitslr_test.cpp
index ef68d28..f88580c 100644
--- a/libc/test/src/stdfix/bitslr_test.cpp
+++ b/libc/test/src/stdfix/bitslr_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // int_lr_t
+#include "llvm-libc-types/int_lr_t.h" // int_lr_t
#include "src/stdfix/bitslr.h"
LIST_BITSFX_TESTS(hk, long fract, int_lr_t, LIBC_NAMESPACE::bitslr);
diff --git a/libc/test/src/stdfix/bitsr_test.cpp b/libc/test/src/stdfix/bitsr_test.cpp
index 0aeb980..e987a7f 100644
--- a/libc/test/src/stdfix/bitsr_test.cpp
+++ b/libc/test/src/stdfix/bitsr_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // int_r_t
+#include "llvm-libc-types/int_r_t.h" // int_r_t
#include "src/stdfix/bitsr.h"
LIST_BITSFX_TESTS(r, fract, int_r_t, LIBC_NAMESPACE::bitsr);
diff --git a/libc/test/src/stdfix/bitsuhk_test.cpp b/libc/test/src/stdfix/bitsuhk_test.cpp
index 5ddb783..5b09453 100644
--- a/libc/test/src/stdfix/bitsuhk_test.cpp
+++ b/libc/test/src/stdfix/bitsuhk_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // uint_uhk_t
+#include "llvm-libc-types/uint_uhk_t.h" // uint_uhk_t
#include "src/stdfix/bitsuhk.h"
LIST_BITSFX_TESTS(uhk, unsigned short accum, uint_uhk_t,
diff --git a/libc/test/src/stdfix/bitsuhr_test.cpp b/libc/test/src/stdfix/bitsuhr_test.cpp
index 6f5d559..0d006a3 100644
--- a/libc/test/src/stdfix/bitsuhr_test.cpp
+++ b/libc/test/src/stdfix/bitsuhr_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // uint_uhr_t
+#include "llvm-libc-types/uint_uhr_t.h" // uint_uhr_t
#include "src/stdfix/bitsuhr.h"
LIST_BITSFX_TESTS(uhr, unsigned short fract, uint_uhr_t,
diff --git a/libc/test/src/stdfix/bitsuk_test.cpp b/libc/test/src/stdfix/bitsuk_test.cpp
index 309c525..06a8a4e 100644
--- a/libc/test/src/stdfix/bitsuk_test.cpp
+++ b/libc/test/src/stdfix/bitsuk_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // uint_uk_t
+#include "llvm-libc-types/uint_uk_t.h" // uint_uk_t
#include "src/stdfix/bitsuk.h"
LIST_BITSFX_TESTS(uk, unsigned accum, uint_uk_t, LIBC_NAMESPACE::bitsuk);
diff --git a/libc/test/src/stdfix/bitsulk_test.cpp b/libc/test/src/stdfix/bitsulk_test.cpp
index cba011d..9d56a18 100644
--- a/libc/test/src/stdfix/bitsulk_test.cpp
+++ b/libc/test/src/stdfix/bitsulk_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // uint_ulk_t
+#include "llvm-libc-types/uint_ulk_t.h" // uint_ulk_t
#include "src/stdfix/bitsulk.h"
LIST_BITSFX_TESTS(ulk, unsigned long accum, uint_ulk_t,
diff --git a/libc/test/src/stdfix/bitsulr_test.cpp b/libc/test/src/stdfix/bitsulr_test.cpp
index 39b21c4..3ebbf8a 100644
--- a/libc/test/src/stdfix/bitsulr_test.cpp
+++ b/libc/test/src/stdfix/bitsulr_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // uint_ulr_t
+#include "llvm-libc-types/uint_ulr_t.h" // uint_ulr_t
#include "src/stdfix/bitsulr.h"
LIST_BITSFX_TESTS(ulr, unsigned long fract, uint_ulr_t,
diff --git a/libc/test/src/stdfix/bitsur_test.cpp b/libc/test/src/stdfix/bitsur_test.cpp
index b7c4b06..4f36807 100644
--- a/libc/test/src/stdfix/bitsur_test.cpp
+++ b/libc/test/src/stdfix/bitsur_test.cpp
@@ -8,7 +8,7 @@
#include "BitsFxTest.h"
-#include "llvm-libc-types/stdfix-types.h" // uint_ur_t
+#include "llvm-libc-types/uint_ur_t.h" // uint_ur_t
#include "src/stdfix/bitsur.h"
LIST_BITSFX_TESTS(ur, unsigned fract, uint_ur_t, LIBC_NAMESPACE::bitsur);