Skip to content

Commit

Permalink
[libc][NFC] Remove all Linux specific code to respective linux/ direc…
Browse files Browse the repository at this point in the history
…tories

These were all the non OS agnostic implementations I could find in general directories.

Currently none of these functions are actually enabled, but for when they do it makes sense that they be in linux/ specific directories.

Reviewed By: sivachandra

Differential Revision: https://reviews.llvm.org/D119164
  • Loading branch information
abrachet committed Feb 8, 2022
1 parent c8ba2b6 commit 70ae480
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 23 deletions.
3 changes: 0 additions & 3 deletions libc/src/assert/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ add_entrypoint_object(
__assert_fail.h
assert.h
DEPENDS
# These two dependencies are temporary and should be replaced by fprintf
# later.
libc.src.__support.OSUtil.osutil
libc.include.sys_syscall
libc.src.stdlib.abort
)
14 changes: 1 addition & 13 deletions libc/src/assert/__assert_fail.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,12 @@
//
//===----------------------------------------------------------------------===//

#include "src/__support/OSUtil/io.h"
#include "src/assert/__assert_fail.h"
#include "src/stdlib/abort.h"

// These includes are temporary.
#include "include/sys/syscall.h" // For syscall numbers.
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.

namespace __llvm_libc {

// This is just a temporary solution to make assert available to internal
// llvm libc code. In the future writeToStderr will not exist and __assert_fail
// will call fprintf(stderr, ...).
static void write_to_stderr(const char *s) {
size_t length = 0;
for (const char *curr = s; *curr; ++curr, ++length);
__llvm_libc::syscall(SYS_write, 2, s, length);
}

LLVM_LIBC_FUNCTION(void, __assert_fail,
(const char *assertion, const char *file, unsigned line,
const char *function)) {
Expand Down
9 changes: 2 additions & 7 deletions libc/src/stdlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,7 @@ add_entrypoint_object(

# add_entrypoint_object(
# abort
# SRCS
# abort.cpp
# HDRS
# abort.h
# ALIAS
# DEPENDS
# libc.include.stdlib
# libc.src.signal.raise
# ._Exit
# .${LIBC_TARGET_OS}.abort
# )
12 changes: 12 additions & 0 deletions libc/src/stdlib/linux/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@ add_entrypoint_object(
libc.include.stdlib
libc.src.__support.OSUtil.osutil
)

# add_entrypoint_object(
# abort
# SRCS
# abort.cpp
# HDRS
# ../abort.h
# DEPENDS
# libc.include.stdlib
# libc.src.signal.raise
# ._Exit
# )
File renamed without changes.

0 comments on commit 70ae480

Please sign in to comment.