[LIBC][NFC] Rename errno and assert files to match other files with functions
Rename the files containing the `__errno_location` function to `__errno_location.h/cpp` to match the other files and move the `llvmlibc_errno` macro to its own file. Split assert.h into `__assert_fail.h` (contains the function prototype) and assert.h (contains the assert macro). Reviewed By: sivachandra Differential Revision: https://reviews.llvm.org/D90653
This commit is contained in:
parent
33945cdd62
commit
5080840d28
|
@ -3,6 +3,7 @@ add_entrypoint_object(
|
|||
SRCS
|
||||
__assert_fail.cpp
|
||||
HDRS
|
||||
__assert_fail.h
|
||||
assert.h
|
||||
DEPENDS
|
||||
# These two dependencies are temporary and should be replaced by fprintf
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "src/assert/assert.h"
|
||||
#include "src/assert/__assert_fail.h"
|
||||
#include "src/stdlib/abort.h"
|
||||
|
||||
// These includes are temporary.
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
//===-- Internal header for __assert_fail -----------------------*- C++ -*-===//
|
||||
//
|
||||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
||||
// See https://llvm.org/LICENSE.txt for license information.
|
||||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#ifndef LLVM_LIBC_SRC_ASSERT_ASSERT_FAIL_H
|
||||
#define LLVM_LIBC_SRC_ASSERT_ASSERT_FAIL_H
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
namespace __llvm_libc {
|
||||
|
||||
[[noreturn]] void __assert_fail(const char *assertion, const char *file,
|
||||
unsigned line, const char *function);
|
||||
|
||||
} // namespace __llvm_libc
|
||||
|
||||
#endif // LLVM_LIBC_SRC_ASSERT_ASSERT_FAIL_H
|
|
@ -6,19 +6,11 @@
|
|||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#ifndef LLVM_LIBC_SRC_ASSERT_ASSERT_H
|
||||
#define LLVM_LIBC_SRC_ASSERT_ASSERT_H
|
||||
#include "src/assert/__assert_fail.h"
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
namespace __llvm_libc {
|
||||
|
||||
[[noreturn]] void __assert_fail(const char *assertion, const char *file, unsigned line,
|
||||
const char *function);
|
||||
|
||||
} // namespace __llvm_libc
|
||||
|
||||
#endif // LLVM_LIBC_SRC_ASSERT_ASSERT_H
|
||||
// There is no header guard here since assert is intended to be able to be
|
||||
// able to be included multiple times with NDEBUG defined differently, causing
|
||||
// different behavior.
|
||||
|
||||
#undef assert
|
||||
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
add_entrypoint_object(
|
||||
__errno_location
|
||||
SRCS
|
||||
errno_location.cpp
|
||||
__errno_location.cpp
|
||||
HDRS
|
||||
__errno_location.h
|
||||
llvmlibc_errno.h
|
||||
)
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "src/errno/llvmlibc_errno.h"
|
||||
#include "src/errno/__errno_location.h"
|
||||
|
||||
#include "src/__support/common.h"
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
//===-- Implementation header for __errno_location --------------*- C++ -*-===//
|
||||
//
|
||||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
||||
// See https://llvm.org/LICENSE.txt for license information.
|
||||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#ifndef LLVM_LIBC_SRC_ERRNO_ERRNO_LOCATION_H
|
||||
#define LLVM_LIBC_SRC_ERRNO_ERRNO_LOCATION_H
|
||||
|
||||
namespace __llvm_libc {
|
||||
|
||||
int *__errno_location();
|
||||
|
||||
} // namespace __llvm_libc
|
||||
|
||||
#endif // LLVM_LIBC_SRC_ERRNO_ERRNO_LOCATION_H
|
|
@ -6,6 +6,8 @@
|
|||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "src/errno/__errno_location.h"
|
||||
|
||||
#ifndef LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H
|
||||
#define LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H
|
||||
|
||||
|
@ -13,10 +15,4 @@
|
|||
// public header.
|
||||
#define llvmlibc_errno (*__llvm_libc::__errno_location())
|
||||
|
||||
namespace __llvm_libc {
|
||||
|
||||
int *__errno_location();
|
||||
|
||||
} // namespace __llvm_libc
|
||||
|
||||
#endif // LLVM_LIBC_SRC_ERRNO_LLVMLIBC_ERRNO_H
|
||||
|
|
Loading…
Reference in New Issue