[libc-commits] [libc] [libc] Remove relative includes (PR #203288)
via libc-commits
libc-commits at lists.llvm.org
Thu Jun 11 07:19:40 PDT 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-libc
Author: Pavel Labath (labath)
<details>
<summary>Changes</summary>
IIUC, this is the old style (which I've unwittingly propagated) and is no longer needed/desired.
This cleans removes all ".." occurences from libc/include.
I've needed to add a target_include_directories stanza to unit test library targets, as they didn't have it yet.
Assisted by `xargs sed`.
---
Patch is 32.10 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/203288.diff
57 Files Affected:
- (modified) libc/include/llvm-libc-macros/float16-macros.h (+1-1)
- (modified) libc/include/llvm-libc-macros/link-macros.h (+35-35)
- (modified) libc/include/llvm-libc-macros/locale-macros.h (+1-1)
- (modified) libc/include/llvm-libc-macros/netinet-in-macros.h (+1-1)
- (modified) libc/include/llvm-libc-macros/stdio-macros.h (+1-1)
- (modified) libc/include/llvm-libc-macros/wchar-macros.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_BOOT_SERVICES.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_CAPSULE.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_DEVICE_PATH_PROTOCOL.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_GUID.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_PHYSICAL_ADDRESS.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_RUNTIME_SERVICES.h (+2-2)
- (modified) libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h (+2-2)
- (modified) libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h (+2-2)
- (modified) libc/include/llvm-libc-types/EFI_STATUS.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_SYSTEM_TABLE.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_TABLE_HEADER.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_TIME.h (+1-1)
- (modified) libc/include/llvm-libc-types/EFI_VIRTUAL_ADDRESS.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf32_Addr.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf32_Half.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf32_Lword.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf32_Off.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf32_Sword.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf32_Word.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf32_Xword.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf32_auxv_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf64_Addr.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf64_Half.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf64_Lword.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf64_Off.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf64_Sword.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf64_Sxword.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf64_Word.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf64_Xword.h (+1-1)
- (modified) libc/include/llvm-libc-types/Elf64_auxv_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/cfloat128.h (+1-1)
- (modified) libc/include/llvm-libc-types/cfloat16.h (+1-1)
- (modified) libc/include/llvm-libc-types/char16_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/char32_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/constraint_handler_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/errno_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/fd_set.h (+1-1)
- (modified) libc/include/llvm-libc-types/float128.h (+1-1)
- (modified) libc/include/llvm-libc-types/in_port_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/mbstate_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/pthread_id_np_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/rsize_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/sigset_t.h (+1-1)
- (modified) libc/include/llvm-libc-types/struct_dl_phdr_info.h (+1-1)
- (modified) libc/include/llvm-libc-types/struct_in6_addr.h (+1-1)
- (modified) libc/include/llvm-libc-types/struct_udphdr.h (+1-1)
- (modified) libc/include/llvm-libc-types/x86_64/ucontext_t.h (+2-2)
- (modified) libc/include/sys/queue.h (+1-1)
- (modified) libc/test/UnitTest/CMakeLists.txt (+1)
``````````diff
diff --git a/libc/include/llvm-libc-macros/float16-macros.h b/libc/include/llvm-libc-macros/float16-macros.h
index 528c7f016f873..5dcc440edf59d 100644
--- a/libc/include/llvm-libc-macros/float16-macros.h
+++ b/libc/include/llvm-libc-macros/float16-macros.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_MACROS_FLOAT16_MACROS_H
#define LLVM_LIBC_MACROS_FLOAT16_MACROS_H
-#include "../llvm-libc-types/float128.h"
+#include "llvm-libc-types/float128.h"
#if defined(__FLT16_MANT_DIG__) && \
(!defined(__GNUC__) || __GNUC__ >= 13 || \
diff --git a/libc/include/llvm-libc-macros/link-macros.h b/libc/include/llvm-libc-macros/link-macros.h
index 64fee52f936b0..3f72fad15b1c4 100644
--- a/libc/include/llvm-libc-macros/link-macros.h
+++ b/libc/include/llvm-libc-macros/link-macros.h
@@ -9,41 +9,41 @@
#ifndef LLVM_LIBC_MACROS_LINK_MACROS_H
#define LLVM_LIBC_MACROS_LINK_MACROS_H
-#include "../llvm-libc-types/Elf32_Addr.h"
-#include "../llvm-libc-types/Elf32_Chdr.h"
-#include "../llvm-libc-types/Elf32_Dyn.h"
-#include "../llvm-libc-types/Elf32_Ehdr.h"
-#include "../llvm-libc-types/Elf32_Half.h"
-#include "../llvm-libc-types/Elf32_Lword.h"
-#include "../llvm-libc-types/Elf32_Nhdr.h"
-#include "../llvm-libc-types/Elf32_Off.h"
-#include "../llvm-libc-types/Elf32_Phdr.h"
-#include "../llvm-libc-types/Elf32_Rel.h"
-#include "../llvm-libc-types/Elf32_Rela.h"
-#include "../llvm-libc-types/Elf32_Shdr.h"
-#include "../llvm-libc-types/Elf32_Sword.h"
-#include "../llvm-libc-types/Elf32_Sym.h"
-#include "../llvm-libc-types/Elf32_Word.h"
-#include "../llvm-libc-types/Elf32_Xword.h"
-#include "../llvm-libc-types/Elf32_auxv_t.h"
-#include "../llvm-libc-types/Elf64_Addr.h"
-#include "../llvm-libc-types/Elf64_Chdr.h"
-#include "../llvm-libc-types/Elf64_Dyn.h"
-#include "../llvm-libc-types/Elf64_Ehdr.h"
-#include "../llvm-libc-types/Elf64_Half.h"
-#include "../llvm-libc-types/Elf64_Lword.h"
-#include "../llvm-libc-types/Elf64_Nhdr.h"
-#include "../llvm-libc-types/Elf64_Off.h"
-#include "../llvm-libc-types/Elf64_Phdr.h"
-#include "../llvm-libc-types/Elf64_Rel.h"
-#include "../llvm-libc-types/Elf64_Rela.h"
-#include "../llvm-libc-types/Elf64_Shdr.h"
-#include "../llvm-libc-types/Elf64_Sword.h"
-#include "../llvm-libc-types/Elf64_Sxword.h"
-#include "../llvm-libc-types/Elf64_Sym.h"
-#include "../llvm-libc-types/Elf64_Word.h"
-#include "../llvm-libc-types/Elf64_Xword.h"
-#include "../llvm-libc-types/Elf64_auxv_t.h"
+#include "llvm-libc-types/Elf32_Addr.h"
+#include "llvm-libc-types/Elf32_Chdr.h"
+#include "llvm-libc-types/Elf32_Dyn.h"
+#include "llvm-libc-types/Elf32_Ehdr.h"
+#include "llvm-libc-types/Elf32_Half.h"
+#include "llvm-libc-types/Elf32_Lword.h"
+#include "llvm-libc-types/Elf32_Nhdr.h"
+#include "llvm-libc-types/Elf32_Off.h"
+#include "llvm-libc-types/Elf32_Phdr.h"
+#include "llvm-libc-types/Elf32_Rel.h"
+#include "llvm-libc-types/Elf32_Rela.h"
+#include "llvm-libc-types/Elf32_Shdr.h"
+#include "llvm-libc-types/Elf32_Sword.h"
+#include "llvm-libc-types/Elf32_Sym.h"
+#include "llvm-libc-types/Elf32_Word.h"
+#include "llvm-libc-types/Elf32_Xword.h"
+#include "llvm-libc-types/Elf32_auxv_t.h"
+#include "llvm-libc-types/Elf64_Addr.h"
+#include "llvm-libc-types/Elf64_Chdr.h"
+#include "llvm-libc-types/Elf64_Dyn.h"
+#include "llvm-libc-types/Elf64_Ehdr.h"
+#include "llvm-libc-types/Elf64_Half.h"
+#include "llvm-libc-types/Elf64_Lword.h"
+#include "llvm-libc-types/Elf64_Nhdr.h"
+#include "llvm-libc-types/Elf64_Off.h"
+#include "llvm-libc-types/Elf64_Phdr.h"
+#include "llvm-libc-types/Elf64_Rel.h"
+#include "llvm-libc-types/Elf64_Rela.h"
+#include "llvm-libc-types/Elf64_Shdr.h"
+#include "llvm-libc-types/Elf64_Sword.h"
+#include "llvm-libc-types/Elf64_Sxword.h"
+#include "llvm-libc-types/Elf64_Sym.h"
+#include "llvm-libc-types/Elf64_Word.h"
+#include "llvm-libc-types/Elf64_Xword.h"
+#include "llvm-libc-types/Elf64_auxv_t.h"
#ifdef __LP64__
#define ElfW(type) Elf64_##type
diff --git a/libc/include/llvm-libc-macros/locale-macros.h b/libc/include/llvm-libc-macros/locale-macros.h
index 892f8b69f3a77..82871080e588a 100644
--- a/libc/include/llvm-libc-macros/locale-macros.h
+++ b/libc/include/llvm-libc-macros/locale-macros.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_MACROS_LOCALE_MACROS_H
#define LLVM_LIBC_MACROS_LOCALE_MACROS_H
-#include "../llvm-libc-types/locale_t.h"
+#include "llvm-libc-types/locale_t.h"
#define LC_CTYPE 0
#define LC_NUMERIC 1
diff --git a/libc/include/llvm-libc-macros/netinet-in-macros.h b/libc/include/llvm-libc-macros/netinet-in-macros.h
index f85f6f5403635..077309cd18dc5 100644
--- a/libc/include/llvm-libc-macros/netinet-in-macros.h
+++ b/libc/include/llvm-libc-macros/netinet-in-macros.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_MACROS_NETINET_IN_MACROS_H
#define LLVM_LIBC_MACROS_NETINET_IN_MACROS_H
-#include "../llvm-libc-types/in_addr_t.h"
#include "__llvm-libc-common.h"
+#include "llvm-libc-types/in_addr_t.h"
#define IPPROTO_IP 0
#define IPPROTO_ICMP 1
diff --git a/libc/include/llvm-libc-macros/stdio-macros.h b/libc/include/llvm-libc-macros/stdio-macros.h
index 96f0e6933ade6..b355c3bdf119f 100644
--- a/libc/include/llvm-libc-macros/stdio-macros.h
+++ b/libc/include/llvm-libc-macros/stdio-macros.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_MACROS_STDIO_MACROS_H
#define LLVM_LIBC_MACROS_STDIO_MACROS_H
-#include "../llvm-libc-types/FILE.h"
+#include "llvm-libc-types/FILE.h"
#ifdef __cplusplus
extern "C" FILE *stdin;
diff --git a/libc/include/llvm-libc-macros/wchar-macros.h b/libc/include/llvm-libc-macros/wchar-macros.h
index 2a0cabd6133a4..52f4b7a768e04 100644
--- a/libc/include/llvm-libc-macros/wchar-macros.h
+++ b/libc/include/llvm-libc-macros/wchar-macros.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_MACROS_WCHAR_MACROS_H
#define LLVM_LIBC_MACROS_WCHAR_MACROS_H
-#include "../llvm-libc-types/wint_t.h"
+#include "llvm-libc-types/wint_t.h"
#ifndef WEOF
#define WEOF ((wint_t)(0xffffffffu))
diff --git a/libc/include/llvm-libc-types/EFI_BOOT_SERVICES.h b/libc/include/llvm-libc-types/EFI_BOOT_SERVICES.h
index 8b7a6aadd7a24..b99201b6a0eae 100644
--- a/libc/include/llvm-libc-types/EFI_BOOT_SERVICES.h
+++ b/libc/include/llvm-libc-types/EFI_BOOT_SERVICES.h
@@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_TYPES_EFI_BOOT_SERVICES_H
#define LLVM_LIBC_TYPES_EFI_BOOT_SERVICES_H
-#include "../llvm-libc-macros/EFIAPI-macros.h"
#include "EFI_ALLOCATE_TYPE.h"
#include "EFI_DEVICE_PATH_PROTOCOL.h"
#include "EFI_EVENT.h"
@@ -25,6 +24,7 @@
#include "EFI_TIMER_DELAY.h"
#include "EFI_TPL.h"
#include "char16_t.h"
+#include "llvm-libc-macros/EFIAPI-macros.h"
#include "size_t.h"
#define EFI_BOOT_SERVICES_SIGNATURE 0x56524553544f4f42
diff --git a/libc/include/llvm-libc-types/EFI_CAPSULE.h b/libc/include/llvm-libc-types/EFI_CAPSULE.h
index c7440c9b03b75..070ae637d1d93 100644
--- a/libc/include/llvm-libc-types/EFI_CAPSULE.h
+++ b/libc/include/llvm-libc-types/EFI_CAPSULE.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TYPES_EFI_CAPSULE_H
#define LLVM_LIBC_TYPES_EFI_CAPSULE_H
-#include "../llvm-libc-macros/stdint-macros.h"
#include "EFI_GUID.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef struct {
EFI_GUID CapsuleGuid;
diff --git a/libc/include/llvm-libc-types/EFI_DEVICE_PATH_PROTOCOL.h b/libc/include/llvm-libc-types/EFI_DEVICE_PATH_PROTOCOL.h
index f6a0b2e1f45c0..da1ae674de0ad 100644
--- a/libc/include/llvm-libc-types/EFI_DEVICE_PATH_PROTOCOL.h
+++ b/libc/include/llvm-libc-types/EFI_DEVICE_PATH_PROTOCOL.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_EFI_DEVICE_PATH_PROTOCOL_H
#define LLVM_LIBC_TYPES_EFI_DEVICE_PATH_PROTOCOL_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
#define EFI_DEVICE_PATH_PROTOCOL_GUID \
{0x09576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}}
diff --git a/libc/include/llvm-libc-types/EFI_GUID.h b/libc/include/llvm-libc-types/EFI_GUID.h
index b3530008384dd..9527d6d6c8c7d 100644
--- a/libc/include/llvm-libc-types/EFI_GUID.h
+++ b/libc/include/llvm-libc-types/EFI_GUID.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_EFI_GUID_H
#define LLVM_LIBC_TYPES_EFI_GUID_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef struct {
uint32_t Data1;
diff --git a/libc/include/llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h b/libc/include/llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h
index 72d0579aef76c..a5b126a07d3ad 100644
--- a/libc/include/llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h
+++ b/libc/include/llvm-libc-types/EFI_MEMORY_DESCRIPTOR.h
@@ -9,9 +9,9 @@
#ifndef LLVM_LIBC_TYPES_EFI_MEMORY_DESCRIPTOR_H
#define LLVM_LIBC_TYPES_EFI_MEMORY_DESCRIPTOR_H
-#include "../llvm-libc-macros/stdint-macros.h"
#include "EFI_PHYSICAL_ADDRESS.h"
#include "EFI_VIRTUAL_ADDRESS.h"
+#include "llvm-libc-macros/stdint-macros.h"
#define EFI_MEMORY_DESCRIPTOR_VERSION 1
diff --git a/libc/include/llvm-libc-types/EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h b/libc/include/llvm-libc-types/EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h
index de0c59c139efb..5090bdb512ff2 100644
--- a/libc/include/llvm-libc-types/EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h
+++ b/libc/include/llvm-libc-types/EFI_OPEN_PROTOCOL_INFORMATION_ENTRY.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TYPES_EFI_OPEN_PROTOCOL_INFORMATION_ENTRY_H
#define LLVM_LIBC_TYPES_EFI_OPEN_PROTOCOL_INFORMATION_ENTRY_H
-#include "../llvm-libc-macros/stdint-macros.h"
#include "EFI_HANDLE.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef struct {
EFI_HANDLE AgentHandle;
diff --git a/libc/include/llvm-libc-types/EFI_PHYSICAL_ADDRESS.h b/libc/include/llvm-libc-types/EFI_PHYSICAL_ADDRESS.h
index 8880ee66c0f8d..50ab366ca8a9e 100644
--- a/libc/include/llvm-libc-types/EFI_PHYSICAL_ADDRESS.h
+++ b/libc/include/llvm-libc-types/EFI_PHYSICAL_ADDRESS.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_EFI_PHYSICAL_ADDRESS_H
#define LLVM_LIBC_TYPES_EFI_PHYSICAL_ADDRESS_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint64_t EFI_PHYSICAL_ADDRESS;
diff --git a/libc/include/llvm-libc-types/EFI_RUNTIME_SERVICES.h b/libc/include/llvm-libc-types/EFI_RUNTIME_SERVICES.h
index 8913118b0844c..cc4dfcb0c9bc9 100644
--- a/libc/include/llvm-libc-types/EFI_RUNTIME_SERVICES.h
+++ b/libc/include/llvm-libc-types/EFI_RUNTIME_SERVICES.h
@@ -9,8 +9,6 @@
#ifndef LLVM_LIBC_TYPES_EFI_RUNTIME_SERVICES_H
#define LLVM_LIBC_TYPES_EFI_RUNTIME_SERVICES_H
-#include "../llvm-libc-macros/EFIAPI-macros.h"
-#include "../llvm-libc-macros/stdint-macros.h"
#include "EFI_CAPSULE.h"
#include "EFI_MEMORY_DESCRIPTOR.h"
#include "EFI_PHYSICAL_ADDRESS.h"
@@ -18,6 +16,8 @@
#include "EFI_TABLE_HEADER.h"
#include "EFI_TIME.h"
#include "char16_t.h"
+#include "llvm-libc-macros/EFIAPI-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
#include "size_t.h"
#define EFI_RUNTIME_SERVICES_SIGNATURE 0x56524553544e5552
diff --git a/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h b/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h
index a6dc0952b6310..e158fdbf3c8fa 100644
--- a/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h
+++ b/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_INPUT_PROTOCOL.h
@@ -9,11 +9,11 @@
#ifndef LLVM_LIBC_TYPES_EFI_SIMPLE_TEXT_INPUT_PROTOCOL_H
#define LLVM_LIBC_TYPES_EFI_SIMPLE_TEXT_INPUT_PROTOCOL_H
-#include "../llvm-libc-macros/EFIAPI-macros.h"
-#include "../llvm-libc-macros/stdint-macros.h"
#include "EFI_EVENT.h"
#include "EFI_STATUS.h"
#include "char16_t.h"
+#include "llvm-libc-macros/EFIAPI-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \
{0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b}}
diff --git a/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h b/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h
index 91d169f018dbc..85da18c95ab9e 100644
--- a/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h
+++ b/libc/include/llvm-libc-types/EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h
@@ -9,9 +9,9 @@
#ifndef LLVM_LIBC_TYPES_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_H
#define LLVM_LIBC_TYPES_EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_H
-#include "../llvm-libc-macros/EFIAPI-macros.h"
-#include "../llvm-libc-macros/stdint-macros.h"
#include "EFI_STATUS.h"
+#include "llvm-libc-macros/EFIAPI-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
#include "size_t.h"
#define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID \
diff --git a/libc/include/llvm-libc-types/EFI_STATUS.h b/libc/include/llvm-libc-types/EFI_STATUS.h
index bb9542bed8efc..a74762e6d0ea3 100644
--- a/libc/include/llvm-libc-types/EFI_STATUS.h
+++ b/libc/include/llvm-libc-types/EFI_STATUS.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_EFI_STATUS_H
#define LLVM_LIBC_TYPES_EFI_STATUS_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uintptr_t EFI_STATUS;
diff --git a/libc/include/llvm-libc-types/EFI_SYSTEM_TABLE.h b/libc/include/llvm-libc-types/EFI_SYSTEM_TABLE.h
index 290067ad862e1..57f223bc31898 100644
--- a/libc/include/llvm-libc-types/EFI_SYSTEM_TABLE.h
+++ b/libc/include/llvm-libc-types/EFI_SYSTEM_TABLE.h
@@ -9,7 +9,6 @@
#ifndef LLVM_LIBC_TYPES_EFI_SYSTEM_TABLE_H
#define LLVM_LIBC_TYPES_EFI_SYSTEM_TABLE_H
-#include "../llvm-libc-macros/stdint-macros.h"
#include "EFI_BOOT_SERVICES.h"
#include "EFI_CONFIGURATION_TABLE.h"
#include "EFI_HANDLE.h"
@@ -18,6 +17,7 @@
#include "EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.h"
#include "EFI_STATUS.h"
#include "EFI_TABLE_HEADER.h"
+#include "llvm-libc-macros/stdint-macros.h"
#include "char16_t.h"
#include "size_t.h"
diff --git a/libc/include/llvm-libc-types/EFI_TABLE_HEADER.h b/libc/include/llvm-libc-types/EFI_TABLE_HEADER.h
index 293968ecc4d1b..78dc17904b7f5 100644
--- a/libc/include/llvm-libc-types/EFI_TABLE_HEADER.h
+++ b/libc/include/llvm-libc-types/EFI_TABLE_HEADER.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_EFI_TABLE_HEADER_H
#define LLVM_LIBC_TYPES_EFI_TABLE_HEADER_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef struct {
uint64_t Signature;
diff --git a/libc/include/llvm-libc-types/EFI_TIME.h b/libc/include/llvm-libc-types/EFI_TIME.h
index b0e38b987d44e..986aa5ebb2469 100644
--- a/libc/include/llvm-libc-types/EFI_TIME.h
+++ b/libc/include/llvm-libc-types/EFI_TIME.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_EFI_TIME_H
#define LLVM_LIBC_TYPES_EFI_TIME_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef struct {
uint16_t Year; // 1900 - 9999
diff --git a/libc/include/llvm-libc-types/EFI_VIRTUAL_ADDRESS.h b/libc/include/llvm-libc-types/EFI_VIRTUAL_ADDRESS.h
index 46cbec734dadc..9be36cc8684be 100644
--- a/libc/include/llvm-libc-types/EFI_VIRTUAL_ADDRESS.h
+++ b/libc/include/llvm-libc-types/EFI_VIRTUAL_ADDRESS.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_EFI_VIRTUAL_ADDRESS_H
#define LLVM_LIBC_TYPES_EFI_VIRTUAL_ADDRESS_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint64_t EFI_VIRTUAL_ADDRESS;
diff --git a/libc/include/llvm-libc-types/Elf32_Addr.h b/libc/include/llvm-libc-types/Elf32_Addr.h
index 16cca621fbd47..cba3398a548e3 100644
--- a/libc/include/llvm-libc-types/Elf32_Addr.h
+++ b/libc/include/llvm-libc-types/Elf32_Addr.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF32_ADDR_H
#define LLVM_LIBC_TYPES_ELF32_ADDR_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint32_t Elf32_Addr;
diff --git a/libc/include/llvm-libc-types/Elf32_Half.h b/libc/include/llvm-libc-types/Elf32_Half.h
index b614b416d51af..dbd0d12525534 100644
--- a/libc/include/llvm-libc-types/Elf32_Half.h
+++ b/libc/include/llvm-libc-types/Elf32_Half.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF32_HALF_H
#define LLVM_LIBC_TYPES_ELF32_HALF_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint16_t Elf32_Half;
diff --git a/libc/include/llvm-libc-types/Elf32_Lword.h b/libc/include/llvm-libc-types/Elf32_Lword.h
index 5d1e634a1b9b5..de6daad474566 100644
--- a/libc/include/llvm-libc-types/Elf32_Lword.h
+++ b/libc/include/llvm-libc-types/Elf32_Lword.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF32_LWORD_H
#define LLVM_LIBC_TYPES_ELF32_LWORD_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint32_t Elf32_Lword;
diff --git a/libc/include/llvm-libc-types/Elf32_Off.h b/libc/include/llvm-libc-types/Elf32_Off.h
index 46c7118d95e77..d57d72f9807d6 100644
--- a/libc/include/llvm-libc-types/Elf32_Off.h
+++ b/libc/include/llvm-libc-types/Elf32_Off.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF32_OFF_H
#define LLVM_LIBC_TYPES_ELF32_OFF_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint32_t Elf32_Off;
diff --git a/libc/include/llvm-libc-types/Elf32_Sword.h b/libc/include/llvm-libc-types/Elf32_Sword.h
index 8adbba727afde..99b11f841fc53 100644
--- a/libc/include/llvm-libc-types/Elf32_Sword.h
+++ b/libc/include/llvm-libc-types/Elf32_Sword.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF32_SWORD_H
#define LLVM_LIBC_TYPES_ELF32_SWORD_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef int32_t Elf32_Sword;
diff --git a/libc/include/llvm-libc-types/Elf32_Word.h b/libc/include/llvm-libc-types/Elf32_Word.h
index 7444a8b41ff4b..1198df89b6f9f 100644
--- a/libc/include/llvm-libc-types/Elf32_Word.h
+++ b/libc/include/llvm-libc-types/Elf32_Word.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF32_WORD_H
#define LLVM_LIBC_TYPES_ELF32_WORD_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint32_t Elf32_Word;
diff --git a/libc/include/llvm-libc-types/Elf32_Xword.h b/libc/include/llvm-libc-types/Elf32_Xword.h
index 9a4898043b041..208f675739af0 100644
--- a/libc/include/llvm-libc-types/Elf32_Xword.h
+++ b/libc/include/llvm-libc-types/Elf32_Xword.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF32_XWORD_H
#define LLVM_LIBC_TYPES_ELF32_XWORD_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint64_t Elf32_Xword;
diff --git a/libc/include/llvm-libc-types/Elf32_auxv_t.h b/libc/include/llvm-libc-types/Elf32_auxv_t.h
index 280b85af9876f..5ca0d5fbe09bc 100644
--- a/libc/include/llvm-libc-types/Elf32_auxv_t.h
+++ b/libc/include/llvm-libc-types/Elf32_auxv_t.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF32_AUXV_T_H
#define LLVM_LIBC_TYPES_ELF32_AUXV_T_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef struct {
uint32_t a_type;
diff --git a/libc/include/llvm-libc-types/Elf64_Addr.h b/libc/include/llvm-libc-types/Elf64_Addr.h
index a186c1b316f40..c603e54814334 100644
--- a/libc/include/llvm-libc-types/Elf64_Addr.h
+++ b/libc/include/llvm-libc-types/Elf64_Addr.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF64_ADDR_H
#define LLVM_LIBC_TYPES_ELF64_ADDR_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint64_t Elf64_Addr;
diff --git a/libc/include/llvm-libc-types/Elf64_Half.h b/libc/include/llvm-libc-types/Elf64_Half.h
index 2f0bfe88992d0..ba6f1ea4b6b87 100644
--- a/libc/include/llvm-libc-types/Elf64_Half.h
+++ b/libc/include/llvm-libc-types/Elf64_Half.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF64_HALF_H
#define LLVM_LIBC_TYPES_ELF64_HALF_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint16_t Elf64_Half;
diff --git a/libc/include/llvm-libc-types/Elf64_Lword.h b/libc/include/llvm-libc-types/Elf64_Lword.h
index 5435e1d8e5deb..35b802e28a397 100644
--- a/libc/include/llvm-libc-types/Elf64_Lword.h
+++ b/libc/include/llvm-libc-types/Elf64_Lword.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ELF64_LWORD_H
#define LLVM_LIBC_TYPES_ELF64_LWORD_H
-#include "../llvm-libc-macros/stdint-macros.h"
+#include "llvm-libc-macros/stdint-macros.h"
typedef uint64_t Elf64_Lword;
diff --git a/libc/include/llvm-libc-types/Elf64_Off.h b/libc/include/llvm-libc-types/Elf64_Off.h
index 8a3e49f2ed1b8..a89669112496c 100644
...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/203288
More information about the libc-commits
mailing list