[libc-commits] [libc] [libc] add missing headers in stdfix (PR #162078)

via libc-commits libc-commits at lists.llvm.org
Mon Oct 6 05:37:53 PDT 2025


llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-libc

Author: Shreeyash Pandey (bojle)

<details>
<summary>Changes</summary>

Fixes https://github.com/llvm/llvm-project/issues/129361

@<!-- -->michaelrj-google @<!-- -->PiJoules 

---

Patch is 37.51 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/162078.diff


66 Files Affected:

- (modified) libc/include/CMakeLists.txt (+12) 
- (modified) libc/include/llvm-libc-types/CMakeLists.txt (+12) 
- (added) libc/include/llvm-libc-types/int_hk_t.h (+14) 
- (added) libc/include/llvm-libc-types/int_hr_t.h (+14) 
- (added) libc/include/llvm-libc-types/int_k_t.h (+14) 
- (added) libc/include/llvm-libc-types/int_lk_t.h (+14) 
- (added) libc/include/llvm-libc-types/int_lr_t.h (+14) 
- (added) libc/include/llvm-libc-types/int_r_t.h (+14) 
- (modified) libc/include/llvm-libc-types/stdfix-types.h (+12-12) 
- (added) libc/include/llvm-libc-types/uint_uhk_t.h (+14) 
- (added) libc/include/llvm-libc-types/uint_uhr_t.h (+14) 
- (added) libc/include/llvm-libc-types/uint_uk_t.h (+14) 
- (added) libc/include/llvm-libc-types/uint_ulk_t.h (+14) 
- (added) libc/include/llvm-libc-types/uint_ulr_t.h (+14) 
- (added) libc/include/llvm-libc-types/uint_ur_t.h (+14) 
- (modified) libc/include/stdfix.yaml (+13) 
- (modified) libc/src/stdfix/bitshk.cpp (+1-1) 
- (modified) libc/src/stdfix/bitshk.h (+1-1) 
- (modified) libc/src/stdfix/bitshr.cpp (+1-1) 
- (modified) libc/src/stdfix/bitshr.h (+1-1) 
- (modified) libc/src/stdfix/bitsk.cpp (+1-1) 
- (modified) libc/src/stdfix/bitsk.h (+1-1) 
- (modified) libc/src/stdfix/bitslk.cpp (+1-1) 
- (modified) libc/src/stdfix/bitslk.h (+1-1) 
- (modified) libc/src/stdfix/bitslr.cpp (+1-1) 
- (modified) libc/src/stdfix/bitslr.h (+1-1) 
- (modified) libc/src/stdfix/bitsr.cpp (+1-1) 
- (modified) libc/src/stdfix/bitsr.h (+1-1) 
- (modified) libc/src/stdfix/bitsuhk.cpp (+1-1) 
- (modified) libc/src/stdfix/bitsuhk.h (+1-1) 
- (modified) libc/src/stdfix/bitsuhr.cpp (+1-1) 
- (modified) libc/src/stdfix/bitsuhr.h (+1-1) 
- (modified) libc/src/stdfix/bitsuk.cpp (+1-1) 
- (modified) libc/src/stdfix/bitsuk.h (+1-1) 
- (modified) libc/src/stdfix/bitsulk.cpp (+1-1) 
- (modified) libc/src/stdfix/bitsulk.h (+1-1) 
- (modified) libc/src/stdfix/bitsulr.cpp (+1-1) 
- (modified) libc/src/stdfix/bitsulr.h (+1-1) 
- (modified) libc/src/stdfix/bitsur.cpp (+1-1) 
- (modified) libc/src/stdfix/bitsur.h (+1-1) 
- (modified) libc/src/stdfix/bitusk.cpp (+1-1) 
- (modified) libc/src/stdfix/hkbits.h (+1-1) 
- (modified) libc/src/stdfix/hrbits.h (+1-1) 
- (modified) libc/src/stdfix/kbits.h (+1-1) 
- (modified) libc/src/stdfix/lkbits.h (+1-1) 
- (modified) libc/src/stdfix/lrbits.h (+1-1) 
- (modified) libc/src/stdfix/rbits.h (+1-1) 
- (modified) libc/src/stdfix/uhkbits.h (+1-1) 
- (modified) libc/src/stdfix/uhrbits.h (+1-1) 
- (modified) libc/src/stdfix/ukbits.h (+1-1) 
- (modified) libc/src/stdfix/ulkbits.h (+1-1) 
- (modified) libc/src/stdfix/ulrbits.h (+1-1) 
- (modified) libc/src/stdfix/urbits.h (+1) 
- (modified) libc/test/src/stdfix/FxBitsTest.h (-1) 
- (modified) libc/test/src/stdfix/bitshk_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitshr_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitsk_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitslk_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitslr_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitsr_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitsuhk_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitsuhr_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitsuk_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitsulk_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitsulr_test.cpp (+1-1) 
- (modified) libc/test/src/stdfix/bitsur_test.cpp (+1-1) 


``````````diff
diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index 8fd37b0ee5ad6..25d96ac5aaa97 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -167,6 +167,18 @@ add_header_macro(
   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-types/CMakeLists.txt b/libc/include/llvm-libc-types/CMakeLists.txt
index 70da983be9090..e71e19b86609b 100644
--- a/libc/include/llvm-libc-types/CMakeLists.txt
+++ b/libc/include/llvm-libc-types/CMakeLists.txt
@@ -172,6 +172,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 0000000000000..eb172245e457b
--- /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 0000000000000..89b57a80a15a6
--- /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 0000000000000..193f9d823808f
--- /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 0000000000000..c8f31373d0f46
--- /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 0000000000000..f2987e8d708d1
--- /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 0000000000000..6b528f4a84bdf
--- /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
index 542d45ea97e96..f9e501951a926 100644
--- a/libc/include/llvm-libc-types/stdfix-types.h
+++ b/libc/include/llvm-libc-types/stdfix-types.h
@@ -9,17 +9,17 @@
 #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;
+// 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 0000000000000..ed0f427ebecac
--- /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 0000000000000..e3eab1c24d0dd
--- /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 0000000000000..f9bbc7b78f9af
--- /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 0000000000000..b7a54b02d19d4
--- /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 0000000000000..9f4682c29c536
--- /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 0000000000000..267c9c44e9fd9
--- /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 5b385124eb63d..bcdd9c0a6f095 100644
--- a/libc/include/stdfix.yaml
+++ b/libc/include/stdfix.yaml
@@ -9,6 +9,19 @@ macros:
     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/bitshk.cpp b/libc/src/stdfix/bitshk.cpp
index d0a3e128bdd65..be4e71a06557d 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 a1505e2e56d85..24395762e0166 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 394d1f08f6ae5..e70bf0a9e55a7 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 d5b4b8f56a7e9..c1517a969f77b 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 f8c9d77d56e9c..0f1a3f3d0175b 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 32d5a724dfb0b..3e41b4359cc3f 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 f4af2a8cd8b99..1065c3223ac45 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 821116b9a7c1b..e1a0c18b5e67e 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 3b38aa21a6338..e8a499389db03 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 0cb597214f550..d0e468b63e32a 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 2b6ad2cfe189a..4eefe28a71f91 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 e071f034cd107..5742a59bb1d61 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 1b0bf59a550f1..62f7cf3d454d5 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 1e80286d77099..b3082829892aa 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...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/162078


More information about the libc-commits mailing list