This is an archive of the discontinued LLVM Phabricator instance.

Differential D147988

[libc] Fix swab placement
ClosedPublic

Authored by Caslyn on Apr 10 2023, 8:07 PM.

Details

Reviewers
mcgrathr
Commits
rG95ca2e2cf9d6: [libc] Fix swab placement
Summary

Per https://reviews.llvm.org/D147970#4256889, swab.cpp is moved out of
the /linux subdirectory and cmake specifications are amended to reflect
that swab is not OS-specific.

Diff Detail

Event Timeline

Caslyn created this revision.Apr 10 2023, 8:07 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptApr 10 2023, 8:07 PM
Herald added subscribers: libc-commits, luke, frasercrmck and 22 others. · View Herald Transcript
Caslyn requested review of this revision.Apr 10 2023, 8:07 PM
Herald added a subscriber: • pcwang-thead. · View Herald TranscriptApr 10 2023, 8:07 PM
Harbormaster completed remote builds in B224689: Diff 512320.Apr 10 2023, 8:13 PM
mcgrathr accepted this revision.Apr 11 2023, 11:02 AM

lgtm

This revision is now accepted and ready to land.Apr 11 2023, 11:02 AM
Closed by commit rG95ca2e2cf9d6: [libc] Fix swab placement (authored by Caslyn). · Explain WhyApr 11 2023, 11:09 AM
This revision was automatically updated to reflect the committed changes.
Caslyn added a commit: rG95ca2e2cf9d6: [libc] Fix swab placement.

Revision Contents

PathSize
libc/
config/
linux/
aarch64/
2 lines
riscv64/
2 lines
x86_64/
2 lines
src/
unistd/
18 lines
linux/
8 lines
linux/

Diff 512528

libc/config/linux/aarch64/entrypoints.txt

Show First 20 Lines • Show All 183 Lines • ▼ Show 20 Linesset(TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.linkat libc.src.unistd.linkat
libc.src.unistd.lseek libc.src.unistd.lseek
libc.src.unistd.pread libc.src.unistd.pread
libc.src.unistd.pwrite libc.src.unistd.pwrite
libc.src.unistd.read libc.src.unistd.read
libc.src.unistd.readlink libc.src.unistd.readlink
libc.src.unistd.readlinkat libc.src.unistd.readlinkat
libc.src.unistd.rmdir libc.src.unistd.rmdir
libc.src.unistd.swab
libc.src.unistd.symlink libc.src.unistd.symlink
libc.src.unistd.symlinkat libc.src.unistd.symlinkat
libc.src.unistd.sysconf libc.src.unistd.sysconf
libc.src.unistd.truncate libc.src.unistd.truncate
libc.src.unistd.unlink libc.src.unistd.unlink
libc.src.unistd.unlinkat libc.src.unistd.unlinkat
libc.src.unistd.write libc.src.unistd.write
) )
▲ Show 20 Lines • Show All 258 Lines • ▼ Show 20 Lines list(APPEND TARGET_LIBC_ENTRYPOINTS
# unistd.h entrypoints # unistd.h entrypoints
libc.src.unistd.environ libc.src.unistd.environ
libc.src.unistd.execv libc.src.unistd.execv
libc.src.unistd.getopt libc.src.unistd.getopt
libc.src.unistd.optarg libc.src.unistd.optarg
libc.src.unistd.optind libc.src.unistd.optind
libc.src.unistd.optopt libc.src.unistd.optopt
libc.src.unistd.opterr libc.src.unistd.opterr
libc.src.unistd.swab
# sys/select.h entrypoints # sys/select.h entrypoints
libc.src.sys.select.select libc.src.sys.select.select
) )
endif() endif()
set(TARGET_LLVMLIBC_ENTRYPOINTS set(TARGET_LLVMLIBC_ENTRYPOINTS
${TARGET_LIBC_ENTRYPOINTS} ${TARGET_LIBC_ENTRYPOINTS}
${TARGET_LIBM_ENTRYPOINTS} ${TARGET_LIBM_ENTRYPOINTS}
) )

libc/config/linux/riscv64/entrypoints.txt

Show First 20 Lines • Show All 185 Lines • ▼ Show 20 Linesset(TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.linkat libc.src.unistd.linkat
libc.src.unistd.lseek libc.src.unistd.lseek
libc.src.unistd.pread libc.src.unistd.pread
libc.src.unistd.pwrite libc.src.unistd.pwrite
libc.src.unistd.read libc.src.unistd.read
libc.src.unistd.readlink libc.src.unistd.readlink
libc.src.unistd.readlinkat libc.src.unistd.readlinkat
libc.src.unistd.rmdir libc.src.unistd.rmdir
libc.src.unistd.swab
libc.src.unistd.symlink libc.src.unistd.symlink
libc.src.unistd.symlinkat libc.src.unistd.symlinkat
libc.src.unistd.sysconf libc.src.unistd.sysconf
libc.src.unistd.truncate libc.src.unistd.truncate
libc.src.unistd.unlink libc.src.unistd.unlink
libc.src.unistd.unlinkat libc.src.unistd.unlinkat
libc.src.unistd.write libc.src.unistd.write
) )
▲ Show 20 Lines • Show All 286 Lines • ▼ Show 20 Lines list(APPEND TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.execv libc.src.unistd.execv
libc.src.unistd.fork libc.src.unistd.fork
libc.src.unistd.__llvm_libc_syscall libc.src.unistd.__llvm_libc_syscall
libc.src.unistd.getopt libc.src.unistd.getopt
libc.src.unistd.optarg libc.src.unistd.optarg
libc.src.unistd.optind libc.src.unistd.optind
libc.src.unistd.optopt libc.src.unistd.optopt
libc.src.unistd.opterr libc.src.unistd.opterr
libc.src.unistd.swab
# sys/select.h entrypoints # sys/select.h entrypoints
libc.src.sys.select.select libc.src.sys.select.select
) )
endif() endif()
set(TARGET_LLVMLIBC_ENTRYPOINTS set(TARGET_LLVMLIBC_ENTRYPOINTS
${TARGET_LIBC_ENTRYPOINTS} ${TARGET_LIBC_ENTRYPOINTS}
${TARGET_LIBM_ENTRYPOINTS} ${TARGET_LIBM_ENTRYPOINTS}
) )

libc/config/linux/x86_64/entrypoints.txt

Show First 20 Lines • Show All 187 Lines • ▼ Show 20 Linesset(TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.linkat libc.src.unistd.linkat
libc.src.unistd.lseek libc.src.unistd.lseek
libc.src.unistd.pread libc.src.unistd.pread
libc.src.unistd.pwrite libc.src.unistd.pwrite
libc.src.unistd.read libc.src.unistd.read
libc.src.unistd.readlink libc.src.unistd.readlink
libc.src.unistd.readlinkat libc.src.unistd.readlinkat
libc.src.unistd.rmdir libc.src.unistd.rmdir
libc.src.unistd.swab
libc.src.unistd.symlink libc.src.unistd.symlink
libc.src.unistd.symlinkat libc.src.unistd.symlinkat
libc.src.unistd.sysconf libc.src.unistd.sysconf
libc.src.unistd.truncate libc.src.unistd.truncate
libc.src.unistd.unlink libc.src.unistd.unlink
libc.src.unistd.unlinkat libc.src.unistd.unlinkat
libc.src.unistd.write libc.src.unistd.write
▲ Show 20 Lines • Show All 297 Lines • ▼ Show 20 Lines list(APPEND TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.execv libc.src.unistd.execv
libc.src.unistd.fork libc.src.unistd.fork
libc.src.unistd.__llvm_libc_syscall libc.src.unistd.__llvm_libc_syscall
libc.src.unistd.getopt libc.src.unistd.getopt
libc.src.unistd.optarg libc.src.unistd.optarg
libc.src.unistd.optind libc.src.unistd.optind
libc.src.unistd.optopt libc.src.unistd.optopt
libc.src.unistd.opterr libc.src.unistd.opterr
libc.src.unistd.swab
# sys/select.h entrypoints # sys/select.h entrypoints
libc.src.sys.select.select libc.src.sys.select.select
) )
endif() endif()
set(TARGET_LLVMLIBC_ENTRYPOINTS set(TARGET_LLVMLIBC_ENTRYPOINTS
${TARGET_LIBC_ENTRYPOINTS} ${TARGET_LIBC_ENTRYPOINTS}
${TARGET_LIBM_ENTRYPOINTS} ${TARGET_LIBM_ENTRYPOINTS}
) )

libc/src/unistd/CMakeLists.txt

Show First 20 Lines • Show All 186 Lines • ▼ Show 20 Lines
add_entrypoint_object( add_entrypoint_object(
rmdir rmdir
ALIAS ALIAS
DEPENDS DEPENDS
.${LIBC_TARGET_OS}.rmdir .${LIBC_TARGET_OS}.rmdir
) )
add_entrypoint_object( add_entrypoint_object(
swab
ALIAS
DEPENDS
.${LIBC_TARGET_OS}.swab
)
add_entrypoint_object(
symlink symlink
ALIAS ALIAS
DEPENDS DEPENDS
.${LIBC_TARGET_OS}.symlink .${LIBC_TARGET_OS}.symlink
) )
add_entrypoint_object( add_entrypoint_object(
symlinkat symlinkat
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Linesadd_entrypoint_object(
DEPENDS DEPENDS
libc.include.unistd libc.include.unistd
libc.src.__support.CPP.optional libc.src.__support.CPP.optional
libc.src.__support.CPP.string_view libc.src.__support.CPP.string_view
libc.src.__support.File.file libc.src.__support.File.file
libc.src.stdio.fprintf libc.src.stdio.fprintf
) )
add_entrypoint_object(
swab
SRCS
swab.cpp
HDRS
swab.h
DEPENDS
libc.include.unistd
libc.src.__support.CPP.optional
)
# These aren't actual external per-se, but this is just an easy way to create # These aren't actual external per-se, but this is just an easy way to create
# targets that don't do anything. They exist to be referenced in entrypoints.txt # targets that don't do anything. They exist to be referenced in entrypoints.txt
# so that the header will properly expose their definitions. Their declaration # so that the header will properly expose their definitions. Their declaration
# is in getopt.cpp. # is in getopt.cpp.
add_entrypoint_external( add_entrypoint_external(
optarg optarg
) )
Show All 11 Lines

libc/src/unistd/linux/CMakeLists.txt

Show First 20 Lines • Show All 348 Lines • ▼ Show 20 Lines DEPENDS
libc.include.fcntl libc.include.fcntl
libc.include.unistd libc.include.unistd
libc.include.sys_syscall libc.include.sys_syscall
libc.src.__support.OSUtil.osutil libc.src.__support.OSUtil.osutil
libc.src.errno.errno libc.src.errno.errno
) )
add_entrypoint_object( add_entrypoint_object(
swab
SRCS
swab.cpp
HDRS
../swab.h
)
add_entrypoint_object(
symlink symlink
SRCS SRCS
symlink.cpp symlink.cpp
HDRS HDRS
../symlink.h ../symlink.h
DEPENDS DEPENDS
libc.include.fcntl libc.include.fcntl
libc.include.unistd libc.include.unistd
▲ Show 20 Lines • Show All 95 Lines • Show Last 20 Lines

libc/src/unistd/linux/swab.cpp

  • This file was moved to libc/src/unistd/swab.cpp.

libc/src/unistd/swab.cpp

  • This file was moved from libc/src/unistd/linux/swab.cpp.
The contents of this file were not changed.