From f5e48e94a2f4d4bbd6e5628c7f2afafc6dbcc459 Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Thu, 7 Mar 2024 17:28:52 -0500
Subject: build: Build mlibc + add distclean target

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 lib/mlibc/options/lsb/generic/auxv.cpp     | 59 ------------------------------
 lib/mlibc/options/lsb/generic/dso_exit.cpp | 42 ---------------------
 lib/mlibc/options/lsb/generic/tls.cpp      | 23 ------------
 3 files changed, 124 deletions(-)
 delete mode 100644 lib/mlibc/options/lsb/generic/auxv.cpp
 delete mode 100644 lib/mlibc/options/lsb/generic/dso_exit.cpp
 delete mode 100644 lib/mlibc/options/lsb/generic/tls.cpp

(limited to 'lib/mlibc/options/lsb/generic')

diff --git a/lib/mlibc/options/lsb/generic/auxv.cpp b/lib/mlibc/options/lsb/generic/auxv.cpp
deleted file mode 100644
index a4d2c8f..0000000
--- a/lib/mlibc/options/lsb/generic/auxv.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-#include <errno.h>
-#include <stdint.h>
-#include <sys/auxv.h>
-
-#include <bits/ensure.h>
-
-extern "C" uintptr_t *__dlapi_entrystack();
-
-int peekauxval(unsigned long type, unsigned long *out) {
-	// Find the auxiliary vector by skipping args and environment.
-	auto aux = __dlapi_entrystack();
-	aux += *aux + 1; // Skip argc and all arguments
-	__ensure(!*aux);
-	aux++;
-	while(*aux) // Now, we skip the environment.
-		aux++;
-	aux++;
-
-	// Parse the auxiliary vector.
-	while(true) {
-		auto value = aux + 1;
-		if(*aux == AT_NULL) {
-			errno = ENOENT;
-			return -1;
-		}else if(*aux == type) {
-			*out = *value;
-			return 0;
-		}
-		aux += 2;
-	}
-}
-
-unsigned long getauxval(unsigned long type) {
-	unsigned long value = 0;
-	if(peekauxval(type, &value))
-		return 0;
-	return value;
-}
-
-// XXX(qookie):
-// This is here because libgcc will call into __getauxval on glibc Linux
-// (which is what it believes we are due to the aarch64-linux-gnu toolchain)
-// in order to find AT_HWCAP to discover if LSE atomics are supported.
-//
-// This is not necessary on a custom Linux toolchain and is purely an artifact of
-// using the host toolchain.
-
-// __gnu_linux__ is the define checked by libgcc
-#if defined(__aarch64__) && defined(__gnu_linux__)
-
-extern "C" unsigned long __getauxval(unsigned long type) {
-	unsigned long value = 0;
-	if(peekauxval(type, &value))
-		return 0;
-	return value;
-}
-
-#endif
diff --git a/lib/mlibc/options/lsb/generic/dso_exit.cpp b/lib/mlibc/options/lsb/generic/dso_exit.cpp
deleted file mode 100644
index b8b239d..0000000
--- a/lib/mlibc/options/lsb/generic/dso_exit.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// for memcpy()
-#include <string.h>
-
-#include <bits/ensure.h>
-#include <mlibc/allocator.hpp>
-
-#include <frg/eternal.hpp>
-#include <frg/vector.hpp>
-
-struct ExitHandler {
-	void (*function)(void *);
-	void *argument;
-	void *dsoHandle;
-};
-
-using ExitQueue = frg::vector<ExitHandler, MemoryAllocator>;
-
-ExitQueue &getExitQueue() {
-	// use frg::eternal to prevent the compiler from scheduling the destructor
-	// by generating a call to __cxa_atexit().
-	static frg::eternal<ExitQueue> singleton(getAllocator());
-	return singleton.get();
-}
-
-extern "C" int __cxa_atexit(void (*function)(void *), void *argument, void *handle) {
-	ExitHandler handler;
-	handler.function = function;
-	handler.argument = argument;
-	handler.dsoHandle = handle;
-	getExitQueue().push(handler);
-	return 0;
-}
-
-void __mlibc_do_finalize() {
-	ExitQueue &eq = getExitQueue();
-	for(size_t i = eq.size(); i > 0; i--) {
-		auto handler = &eq[i - 1];
-		handler->function(handler->argument);
-	}
-}
-
diff --git a/lib/mlibc/options/lsb/generic/tls.cpp b/lib/mlibc/options/lsb/generic/tls.cpp
deleted file mode 100644
index 1d7cc30..0000000
--- a/lib/mlibc/options/lsb/generic/tls.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <internal-config.h>
-#include <mlibc/thread.hpp>
-#include <mlibc/rtdl-abi.hpp>
-
-#if defined(__riscv) && defined(MLIBC_STATIC_BUILD)
-	// On RISC-V, linker optimisation is not guaranteed and so we may still get
-	// calls to this function in statically linked binaries.
-	// TODO: This will break dlopen calls from statically linked programs.
-	extern "C" void *__tls_get_addr(struct __abi_tls_entry *entry) {
-		Tcb *tcbPtr = mlibc::get_current_tcb();
-		auto dtvPtr = reinterpret_cast<char *>(tcbPtr->dtvPointers[0]);
-		return reinterpret_cast<void *>(dtvPtr + entry->offset + TLS_DTV_OFFSET);
-	}
-#elif defined(__i386__)
-	extern "C" __attribute__((regparm(1))) void *___tls_get_addr(struct __abi_tls_entry *entry) {
-		return __dlapi_get_tls(entry);
-	}
-#else
-	extern "C" void *__tls_get_addr(struct __abi_tls_entry *entry) {
-		return __dlapi_get_tls(entry);
-	}
-#endif
-
-- 
cgit v1.2.3