[libc-commits] [libc] [libc] Fix non-relative includes of __llvm-libc-common.h (PR #209412)

[via libc-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-libc

Author: Pavel Labath (labath)

<details>
<summary>Changes</summary>

This seems to work, but I ran into this problem when trying to expand hermetic tests.

The hdrgen-generated headers already use relative includes of this file.

---
Full diff: https://github.com/llvm/llvm-project/pull/209412.diff


5 Files Affected:

- (modified) libc/include/llvm-libc-macros/gpu/signal-macros.h (+1-1) 
- (modified) libc/include/llvm-libc-macros/linux/signal-macros.h (+1-1) 
- (modified) libc/include/llvm-libc-macros/netinet-in-macros.h (+1-1) 
- (modified) libc/include/llvm-libc-types/__futex_word.h (+1-1) 
- (modified) libc/include/sys/prctl.h.def (+1-1) 


``````````diff
diff --git a/libc/include/llvm-libc-macros/gpu/signal-macros.h b/libc/include/llvm-libc-macros/gpu/signal-macros.h
index 76488e9796fc4..ab3166454ba13 100644
--- a/libc/include/llvm-libc-macros/gpu/signal-macros.h
+++ b/libc/include/llvm-libc-macros/gpu/signal-macros.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_MACROS_GPU_SIGNAL_MACROS_H
 #define LLVM_LIBC_MACROS_GPU_SIGNAL_MACROS_H
 
-#include "__llvm-libc-common.h"
+#include "../../__llvm-libc-common.h"
 
 #define SIGINT 2
 #define SIGILL 4
diff --git a/libc/include/llvm-libc-macros/linux/signal-macros.h b/libc/include/llvm-libc-macros/linux/signal-macros.h
index e7f268df87cba..280f7e7709579 100644
--- a/libc/include/llvm-libc-macros/linux/signal-macros.h
+++ b/libc/include/llvm-libc-macros/linux/signal-macros.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_MACROS_LINUX_SIGNAL_MACROS_H
 #define LLVM_LIBC_MACROS_LINUX_SIGNAL_MACROS_H
 
-#include "__llvm-libc-common.h"
+#include "../../__llvm-libc-common.h"
 
 #define SIGHUP 1
 #define SIGINT 2
diff --git a/libc/include/llvm-libc-macros/netinet-in-macros.h b/libc/include/llvm-libc-macros/netinet-in-macros.h
index 7c9c337fded23..10a563d21a0cf 100644
--- a/libc/include/llvm-libc-macros/netinet-in-macros.h
+++ b/libc/include/llvm-libc-macros/netinet-in-macros.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_MACROS_NETINET_IN_MACROS_H
 
 #include "../llvm-libc-types/in_addr_t.h"
-#include "__llvm-libc-common.h"
+#include "../__llvm-libc-common.h"
 
 #define IPPROTO_IP 0
 #define IPPROTO_ICMP 1
diff --git a/libc/include/llvm-libc-types/__futex_word.h b/libc/include/llvm-libc-types/__futex_word.h
index 302984a8867dd..a5b6e6c5b18a4 100644
--- a/libc/include/llvm-libc-types/__futex_word.h
+++ b/libc/include/llvm-libc-types/__futex_word.h
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_TYPES___FUTEX_WORD_H
 #define LLVM_LIBC_TYPES___FUTEX_WORD_H
 
-#include "__llvm-libc-common.h"
+#include "../__llvm-libc-common.h"
 
 typedef struct {
   // Futex word should be aligned appropriately to allow target atomic
diff --git a/libc/include/sys/prctl.h.def b/libc/include/sys/prctl.h.def
index 08648c9f47922..29cc2963f7bea 100644
--- a/libc/include/sys/prctl.h.def
+++ b/libc/include/sys/prctl.h.def
@@ -9,7 +9,7 @@
 #ifndef LLVM_LIBC_SYS_PRCTL_H
 #define LLVM_LIBC_SYS_PRCTL_H
 
-#include "__llvm-libc-common.h"
+#include "../__llvm-libc-common.h"
 
 // Process control is highly platform specific, so the platform usually defines
 // the macros itself.

``````````

</details>


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