Skip to content

[libc] Add link.h and elf.h placeholder #97504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libc/config/linux/aarch64/entrypoints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.ctype.toupper

# dlfcn.h entrypoints
libc.src.dlfcn.dladdr
libc.src.dlfcn.dlclose
libc.src.dlfcn.dlerror
libc.src.dlfcn.dlopen
Expand All @@ -32,6 +33,9 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.fcntl.open
libc.src.fcntl.openat

# link.h entrypoints
libc.src.link.dl_iterate_phdr

# sched.h entrypoints
libc.src.sched.sched_get_priority_max
libc.src.sched.sched_get_priority_min
Expand Down
13 changes: 13 additions & 0 deletions libc/config/linux/api.td
Original file line number Diff line number Diff line change
Expand Up @@ -308,3 +308,16 @@ def SearchAPI : PublicAPI<"search.h"> {
def SysStatvfsAPI : PublicAPI<"sys/statvfs.h"> {
let Types = ["fsblkcnt_t", "fsfilcnt_t", "struct statvfs"];
}

def LinkAPI : PublicAPI<"link.h"> {
let Types = [
"struct dl_phdr_info",
"__dl_iterate_phdr_callback_t"
];
}

def DlfcnAPI : PublicAPI<"dlfcn.h"> {
let Types = [
"Dl_info"
];
}
4 changes: 4 additions & 0 deletions libc/config/linux/x86_64/entrypoints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.ctype.toupper

# dlfcn.h entrypoints
libc.src.dlfcn.dladdr
libc.src.dlfcn.dlclose
libc.src.dlfcn.dlerror
libc.src.dlfcn.dlopen
Expand All @@ -32,6 +33,9 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.fcntl.open
libc.src.fcntl.openat

# link.h entrypoints
libc.src.link.dl_iterate_phdr

# sched.h entrypoints
libc.src.sched.sched_get_priority_max
libc.src.sched.sched_get_priority_min
Expand Down
14 changes: 14 additions & 0 deletions libc/include/elf.h.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//===-- C standard library header elf.h -----------------------------------===//
//
// 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_ELF_H
#define LLVM_LIBC_ELF_H

#include "llvm-libc-macros/elf-macros.h"

#endif // LLVM_LIBC_ELF_H
16 changes: 16 additions & 0 deletions libc/include/link.h.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//===-- C standard library header link.h ----------------------------------===//
//
// 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_LINK_H
#define LLVM_LIBC_LINK_H

#include "llvm-libc-macros/link-macros.h"

%%public_api()

#endif // LLVM_LIBC_LINK_H
30 changes: 30 additions & 0 deletions libc/spec/linux.td
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ def StructEpollEventPtr : PtrType<StructEpollEvent>;

def StructEpollData : NamedType<"struct epoll_data">;

def StructDlPhdrInfo : NamedType<"struct dl_phdr_info">;
def DlIteratePhdrCallback : NamedType<"__dl_iterate_phdr_callback_t">;

def Linux : StandardSpec<"Linux"> {
HeaderSpec Errno = HeaderSpec<
"errno.h",
Expand Down Expand Up @@ -264,8 +267,35 @@ def Linux : StandardSpec<"Linux"> {
]
>;

HeaderSpec Link = HeaderSpec<
"link.h",
[], // Macros
[StructDlPhdrInfo, DlIteratePhdrCallback], // Types
[], // Enumerations
[
FunctionSpec<
"dl_iterate_phdr",
RetValSpec<IntType>,
[
ArgSpec<DlIteratePhdrCallback>,
ArgSpec<VoidPtr>
]
>,
] // Functions
>;

HeaderSpec Elf = HeaderSpec<
"elf.h",
[], // Macros
[], // Types
[], // Enumerations
[] // Functions
>;

let Headers = [
Elf,
Errno,
Link,
SysEpoll,
SysMMan,
SysPrctl,
Expand Down
10 changes: 9 additions & 1 deletion libc/spec/posix.td
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ def PThreadOnceT : NamedType<"pthread_once_t">;
def PThreadOnceTPtr : PtrType<PThreadOnceT>;
def PThreadOnceCallback : NamedType<"__pthread_once_func_t">;

def DlInfo : NamedType<"Dl_info">;
def DlInfoPtr : PtrType<DlInfo>;

def InoT : NamedType<"ino_t">;
def UidT : NamedType<"uid_t">;
def GidT : NamedType<"gid_t">;
Expand Down Expand Up @@ -230,9 +233,14 @@ def POSIX : StandardSpec<"POSIX"> {
Macro<"RTLD_GLOBAL">,
Macro<"RTLD_LOCAL">,
],
[], // Types
[DlInfo], // Types
[], // Enumerations
[
FunctionSpec<
"dladdr",
RetValSpec<IntType>,
[ArgSpec<ConstVoidPtr>, ArgSpec<DlInfoPtr>]
>,
FunctionSpec<
"dlclose",
RetValSpec<IntType>,
Expand Down
1 change: 1 addition & 0 deletions libc/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ add_subdirectory(dlfcn)
add_subdirectory(errno)
add_subdirectory(fenv)
add_subdirectory(inttypes)
add_subdirectory(link)
add_subdirectory(math)
add_subdirectory(stdbit)
add_subdirectory(stdfix)
Expand Down
11 changes: 11 additions & 0 deletions libc/src/dlfcn/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
add_entrypoint_object(
dladdr
SRCS
dladdr.cpp
HDRS
dladdr.h
DEPENDS
libc.include.dlfcn
libc.src.errno.errno
)

add_entrypoint_object(
dlclose
SRCS
Expand Down
18 changes: 18 additions & 0 deletions libc/src/dlfcn/dladdr.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//===-- Implementation of dladdr -----------------------------------------===//
//
// 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
//
//===----------------------------------------------------------------------===//

#include "dladdr.h"

#include "src/__support/common.h"

namespace LIBC_NAMESPACE {

// TODO(@izaakschroeder): https://github.com/llvm/llvm-project/issues/97929
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The format I've seen more commonly used in LLVM is TODO(#97929): More details....

LLVM_LIBC_FUNCTION(int, dladdr, (const void *, Dl_info *)) { return 0; }

} // namespace LIBC_NAMESPACE
20 changes: 20 additions & 0 deletions libc/src/dlfcn/dladdr.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//===-- Implementation header of dladdr ------------------------*- 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_DLFCN_DLADDR_H
#define LLVM_LIBC_SRC_DLFCN_DLADDR_H

namespace LIBC_NAMESPACE {

#include "include/llvm-libc-types/Dl_info.h"

int dladdr(const void *, Dl_info *);

} // namespace LIBC_NAMESPACE

#endif // LLVM_LIBC_SRC_DLFCN_DLADDR_H
9 changes: 9 additions & 0 deletions libc/src/link/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
add_entrypoint_object(
dl_iterate_phdr
SRCS
dl_iterate_phdr.cpp
HDRS
dl_iterate_phdr.h
DEPENDS
libc.src.__support.common
)
20 changes: 20 additions & 0 deletions libc/src/link/dl_iterate_phdr.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//===-- Implementation of dl_iterate_phdr ---------------------------------===//
//
// 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
//
//===----------------------------------------------------------------------===//

#include "dl_iterate_phdr.h"
#include "src/__support/common.h"

namespace LIBC_NAMESPACE {

// TODO(@izaakschroeder): https://github.com/llvm/llvm-project/issues/97928
LLVM_LIBC_FUNCTION(int, dl_iterate_phdr,
(__dl_iterate_phdr_callback_t, void *)) {
return -1;
}

} // namespace LIBC_NAMESPACE
20 changes: 20 additions & 0 deletions libc/src/link/dl_iterate_phdr.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//===-- Implementation header for dl_iterate_phdr ---------------*- 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_LINK_DL_ITERATE_PHDR_H
#define LLVM_LIBC_SRC_LINK_DL_ITERATE_PHDR_H

namespace LIBC_NAMESPACE {

#include "include/llvm-libc-types/__dl_iterate_phdr_callback_t.h"

int dl_iterate_phdr(__dl_iterate_phdr_callback_t, void *);

} // namespace LIBC_NAMESPACE

#endif // LLVM_LIBC_SRC_LINK_DL_ITERATE_PHDR_H
Loading