This is an archive of the discontinued LLVM Phabricator instance.

Differential D138142

[libc] Fix assert.h and ctype.h not being built
ClosedPublic

Authored by jhuber6 on Nov 16 2022, 9:30 AM.

Details

Reviewers
sivachandra
lntue
michaelrj
Commits
rGdabb7514f562: [libc] Fix assert.h and ctype.h not being built
Summary

The assert.h and ctype.h headers are never built despite their
entrypoints being present in the generated library. This patch adds a
dependency on these headers so that they will be built properly.

Diff Detail

Event Timeline

jhuber6 created this revision.Nov 16 2022, 9:30 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptNov 16 2022, 9:30 AM
Herald added subscribers: libc-commits, ecnelises, tschuett. · View Herald Transcript
jhuber6 requested review of this revision.Nov 16 2022, 9:30 AM
Harbormaster completed remote builds in B198018: Diff 475849.Nov 16 2022, 9:36 AM
sivachandra accepted this revision.Nov 16 2022, 9:41 AM
This revision is now accepted and ready to land.Nov 16 2022, 9:41 AM
Closed by commit rGdabb7514f562: [libc] Fix assert.h and ctype.h not being built (authored by jhuber6). · Explain WhyNov 16 2022, 10:00 AM
This revision was automatically updated to reflect the committed changes.
jhuber6 added a commit: rGdabb7514f562: [libc] Fix assert.h and ctype.h not being built.

Revision Contents

PathSize
libc/
config/
linux/
aarch64/
2 lines
x86_64/
2 lines
include/
2 lines
src/
assert/
1 line
ctype/
1 line

Diff 475856

libc/config/linux/aarch64/headers.txt

set(TARGET_PUBLIC_HEADERS set(TARGET_PUBLIC_HEADERS
libc.include.assert_h libc.include.assert
libc.include.ctype libc.include.ctype
libc.include.errno libc.include.errno
libc.include.fenv libc.include.fenv
libc.include.inttypes libc.include.inttypes
libc.include.math libc.include.math
libc.include.pthread libc.include.pthread
libc.include.signal libc.include.signal
libc.include.stdio libc.include.stdio
libc.include.stdlib libc.include.stdlib
libc.include.string libc.include.string
libc.include.sys_mman libc.include.sys_mman
libc.include.sys_syscall libc.include.sys_syscall
libc.include.threads libc.include.threads
libc.include.time libc.include.time
libc.include.unistd libc.include.unistd
) )

libc/config/linux/x86_64/headers.txt

set(TARGET_PUBLIC_HEADERS set(TARGET_PUBLIC_HEADERS
libc.include.assert_h libc.include.assert
libc.include.ctype libc.include.ctype
libc.include.dirent libc.include.dirent
libc.include.errno libc.include.errno
libc.include.fcntl libc.include.fcntl
libc.include.fenv libc.include.fenv
libc.include.inttypes libc.include.inttypes
libc.include.math libc.include.math
libc.include.pthread libc.include.pthread
Show All 26 Lines

libc/include/CMakeLists.txt

Show First 20 Lines • Show All 63 Lines • ▼ Show 20 Linesadd_gen_header(
GEN_HDR math.h GEN_HDR math.h
DEPENDS DEPENDS
.llvm_libc_common_h .llvm_libc_common_h
.llvm-libc-types.double_t .llvm-libc-types.double_t
.llvm-libc-types.float_t .llvm-libc-types.float_t
) )
add_gen_header( add_gen_header(
assert_h assert
DEF_FILE assert.h.def DEF_FILE assert.h.def
GEN_HDR assert.h GEN_HDR assert.h
DEPENDS DEPENDS
.llvm_libc_common_h .llvm_libc_common_h
) )
add_gen_header( add_gen_header(
setjmp setjmp
▲ Show 20 Lines • Show All 381 Lines • Show Last 20 Lines

libc/src/assert/CMakeLists.txt

add_entrypoint_object( add_entrypoint_object(
__assert_fail __assert_fail
SRCS SRCS
__assert_fail.cpp __assert_fail.cpp
HDRS HDRS
__assert_fail.h __assert_fail.h
assert.h assert.h
DEPENDS DEPENDS
libc.include.assert
libc.src.__support.OSUtil.osutil libc.src.__support.OSUtil.osutil
libc.src.stdlib.abort libc.src.stdlib.abort
) )

libc/src/ctype/CMakeLists.txt

add_entrypoint_object( add_entrypoint_object(
isalnum isalnum
SRCS SRCS
isalnum.cpp isalnum.cpp
HDRS HDRS
isalnum.h isalnum.h
DEPENDS DEPENDS
libc.include.ctype
libc.src.__support.ctype_utils libc.src.__support.ctype_utils
) )
add_entrypoint_object( add_entrypoint_object(
isalpha isalpha
SRCS SRCS
isalpha.cpp isalpha.cpp
HDRS HDRS
▲ Show 20 Lines • Show All 132 Lines • Show Last 20 Lines