Skip to content

Commit 04e8653

Browse files
jhuber6jhuber6
authored
[libc] Add "include/" to the LLVM include directories (#83199)
Summary: Recent changes added an include path in the float128 type that used the internal `libc` path to find the macro. This doesn't work once it's installed because we need to search from the root of the install dir. This patch adds "include/" to the include path so that our inclusion of installed headers always match the internal use.
1 parent 0e84e27 commit 04e8653

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+72
-60
lines changed

‎libc/benchmarks/automemcpy/lib/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ add_custom_command(
1818

1919
add_library(automemcpy_implementations "${Implementations}")
2020
target_link_libraries(automemcpy_implementations PUBLIC LLVMSupport libc-memory-benchmark)
21-
target_include_directories(automemcpy_implementations PRIVATE ${LIBC_SOURCE_DIR} ${LIBC_AUTOMEMCPY_INCLUDE_DIR})
21+
target_include_directories(automemcpy_implementations PRIVATE
22+
${LIBC_SOURCE_DIR} ${LIBC_SOURCE_DIR}/include ${LIBC_AUTOMEMCPY_INCLUDE_DIR})
2223
target_compile_options(automemcpy_implementations PRIVATE ${LIBC_COMPILE_OPTIONS_NATIVE} "SHELL:-mllvm -combiner-global-alias-analysis" -fno-builtin)
2324
llvm_update_compile_flags(automemcpy_implementations)
2425

‎libc/cmake/modules/LLVMLibCObjectRules.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ function(create_object_library fq_target_name)
5959
)
6060
target_include_directories(${fq_target_name} SYSTEM PRIVATE ${LIBC_INCLUDE_DIR})
6161
target_include_directories(${fq_target_name} PRIVATE ${LIBC_SOURCE_DIR})
62+
target_include_directories(${fq_target_name} PRIVATE ${LIBC_SOURCE_DIR}/include)
6263
target_compile_options(${fq_target_name} PRIVATE ${compile_options})
6364

6465
# The NVPTX target is installed as LLVM-IR but the internal testing toolchain
@@ -73,6 +74,7 @@ function(create_object_library fq_target_name)
7374
)
7475
target_include_directories(${internal_target_name} SYSTEM PRIVATE ${LIBC_INCLUDE_DIR})
7576
target_include_directories(${internal_target_name} PRIVATE ${LIBC_SOURCE_DIR})
77+
target_include_directories(${internal_target_name} PRIVATE ${LIBC_SOURCE_DIR}/include)
7678
target_compile_options(${internal_target_name} PRIVATE ${compile_options}
7779
-fno-lto -march=${LIBC_GPU_TARGET_ARCHITECTURE})
7880
endif()
@@ -279,6 +281,7 @@ function(create_entrypoint_object fq_target_name)
279281
target_compile_options(${internal_target_name} BEFORE PRIVATE ${common_compile_options})
280282
target_include_directories(${internal_target_name} SYSTEM PRIVATE ${LIBC_INCLUDE_DIR})
281283
target_include_directories(${internal_target_name} PRIVATE ${LIBC_SOURCE_DIR})
284+
target_include_directories(${internal_target_name} PRIVATE ${LIBC_SOURCE_DIR}/include)
282285
add_dependencies(${internal_target_name} ${full_deps_list})
283286
target_link_libraries(${internal_target_name} ${full_deps_list})
284287

@@ -300,6 +303,7 @@ function(create_entrypoint_object fq_target_name)
300303
target_compile_options(${fq_target_name} BEFORE PRIVATE ${common_compile_options} -DLIBC_COPT_PUBLIC_PACKAGING)
301304
target_include_directories(${fq_target_name} SYSTEM PRIVATE ${LIBC_INCLUDE_DIR})
302305
target_include_directories(${fq_target_name} PRIVATE ${LIBC_SOURCE_DIR})
306+
target_include_directories(${fq_target_name} PRIVATE ${LIBC_SOURCE_DIR}/include)
303307
add_dependencies(${fq_target_name} ${full_deps_list})
304308
target_link_libraries(${fq_target_name} ${full_deps_list})
305309

‎libc/cmake/modules/LLVMLibCTestRules.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ function(create_libc_unittest fq_target_name)
184184
)
185185
target_include_directories(${fq_build_target_name} SYSTEM PRIVATE ${LIBC_INCLUDE_DIR})
186186
target_include_directories(${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR})
187+
target_include_directories(${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR}/include)
187188
target_compile_options(${fq_build_target_name} PRIVATE ${compile_options})
188189

189190
if(NOT LIBC_UNITTEST_CXX_STANDARD)
@@ -317,6 +318,7 @@ function(add_libc_fuzzer target_name)
317318
)
318319
target_include_directories(${fq_target_name} SYSTEM PRIVATE ${LIBC_INCLUDE_DIR})
319320
target_include_directories(${fq_target_name} PRIVATE ${LIBC_SOURCE_DIR})
321+
target_include_directories(${fq_target_name} PRIVATE ${LIBC_SOURCE_DIR}/include)
320322

321323
target_link_libraries(${fq_target_name} PRIVATE
322324
${link_object_files}
@@ -457,6 +459,7 @@ function(add_integration_test test_name)
457459
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
458460
target_include_directories(${fq_build_target_name} SYSTEM PRIVATE ${LIBC_INCLUDE_DIR})
459461
target_include_directories(${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR})
462+
target_include_directories(${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR}/include)
460463

461464
_get_hermetic_test_compile_options(compile_options "${INTEGRATION_TEST_COMPILE_OPTIONS}")
462465
target_compile_options(${fq_build_target_name} PRIVATE ${compile_options})
@@ -632,6 +635,7 @@ function(add_libc_hermetic_test test_name)
632635
_get_hermetic_test_compile_options(compile_options "${HERMETIC_TEST_COMPILE_OPTIONS}")
633636
target_include_directories(${fq_build_target_name} SYSTEM PRIVATE ${LIBC_INCLUDE_DIR})
634637
target_include_directories(${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR})
638+
target_include_directories(${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR}/include)
635639
_get_hermetic_test_compile_options(compile_options "${HERMETIC_TEST_COMPILE_OPTIONS}")
636640
target_compile_options(${fq_build_target_name} PRIVATE ${compile_options})
637641

‎libc/cmake/modules/compiler_features/check_fixed_point.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "include/llvm-libc-macros/stdfix-macros.h"
1+
#include "llvm-libc-macros/stdfix-macros.h"
22

33
#ifndef LIBC_COMPILER_HAS_FIXED_POINT
44
#error unsupported

‎libc/fuzzing/stdio/printf_fixed_conv_fuzz.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212
#include "src/stdio/snprintf.h"
1313

14-
#include "include/llvm-libc-macros/stdfix-macros.h"
14+
#include "llvm-libc-macros/stdfix-macros.h"
1515
#include "src/__support/fixed_point/fx_bits.h"
1616
#include "src/__support/fixed_point/fx_rep.h"
1717

‎libc/include/llvm-libc-types/float128.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef __LLVM_LIBC_TYPES_FLOAT128_H__
1010
#define __LLVM_LIBC_TYPES_FLOAT128_H__
1111

12-
#include <include/llvm-libc-macros/float-macros.h> // LDBL_MANT_DIG
12+
#include "llvm-libc-macros/float-macros.h" // LDBL_MANT_DIG
1313

1414
// Currently, C23 `_Float128` type is only defined as a built-in type in GCC 7
1515
// or later, and only for C. For C++, or for clang, `__float128` is defined

‎libc/src/__support/CPP/limits.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_LIMITS_H
1010
#define LLVM_LIBC_SRC___SUPPORT_CPP_LIMITS_H
1111

12-
#include "include/llvm-libc-macros/limits-macros.h" // CHAR_BIT
12+
#include "llvm-libc-macros/limits-macros.h" // CHAR_BIT
1313
#include "src/__support/CPP/type_traits/is_integral.h"
1414
#include "src/__support/CPP/type_traits/is_signed.h"
1515
#include "src/__support/macros/attributes.h" // LIBC_INLINE

‎libc/src/__support/CPP/type_traits/is_fixed_point.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "src/__support/CPP/type_traits/remove_cv.h"
1313
#include "src/__support/macros/attributes.h"
1414

15-
#include "include/llvm-libc-macros/stdfix-macros.h"
15+
#include "llvm-libc-macros/stdfix-macros.h"
1616

1717
namespace LIBC_NAMESPACE::cpp {
1818

‎libc/src/__support/HashTable/table.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_SRC___SUPPORT_HASHTABLE_table_H
1010
#define LLVM_LIBC_SRC___SUPPORT_HASHTABLE_table_H
1111

12-
#include "include/llvm-libc-types/ENTRY.h"
12+
#include "llvm-libc-types/ENTRY.h"
1313
#include "src/__support/CPP/bit.h" // bit_ceil
1414
#include "src/__support/CPP/new.h"
1515
#include "src/__support/HashTable/bitmask.h"

‎libc/src/__support/fixed_point/fx_bits.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_SRC___SUPPORT_FIXEDPOINT_FXBITS_H
1010
#define LLVM_LIBC_SRC___SUPPORT_FIXEDPOINT_FXBITS_H
1111

12-
#include "include/llvm-libc-macros/stdfix-macros.h"
12+
#include "llvm-libc-macros/stdfix-macros.h"
1313
#include "src/__support/CPP/bit.h"
1414
#include "src/__support/CPP/type_traits.h"
1515
#include "src/__support/macros/attributes.h" // LIBC_INLINE

0 commit comments

Comments
 (0)