3 files changed, 20 insertions, 60 deletions

diff --git a/payloads/libpayload/include/die.h b/payloads/libpayload/include/die.h
index 01469de17a..fb61d4a8fc 100644
--- a/payloads/libpayload/include/die.h
+++ b/payloads/libpayload/include/die.h
@@ -29,13 +29,14 @@
 #ifndef __DIE_H__
 #define __DIE_H__
 
-void die_work(const char *file, const char *func, const int line,
-	   const char *fmt, ...)
-	__attribute__((format (printf, 4, 5)))
-	__attribute__((noreturn));
+#include <stdio.h>
+#include <stdlib.h>
 
 #define die(fmt, args...) \
-	do { die_work(__FILE__, __func__, __LINE__, fmt, ##args); } \
+	do {  \
+		printf("%s:%d %s(): " fmt, __FILE__, __LINE__, __func__, ##args); \
+		abort(); \
+	} \
 	while (0)
 
 #define die_if(condition, fmt, args...) \
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 05164e5da9..c6d2fc629b 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -525,4 +525,15 @@ int getline(char *buffer, int len);
 /* Defined in arch/${ARCH}/selfboot.c */
 void selfboot(void *entry);
 
+/* Enter remote GDB mode. Will initialize connection if not already up. */
+void gdb_enter(void);
+/* Disconnect existing GDB connection if one exists. */
+void gdb_exit(s8 exit_status);
+
+void __noreturn halt(void);
+#if CONFIG(LP_REMOTEGDB)
+/* Override abort()/halt() to trap into GDB if it is enabled. */
+#define halt() do { gdb_enter(); halt(); } while (0)
+#endif
+
 #endif
diff --git a/payloads/libpayload/include/stdlib.h b/payloads/libpayload/include/stdlib.h
index cb9addfbde..319e5a4229 100644
--- a/payloads/libpayload/include/stdlib.h
+++ b/payloads/libpayload/include/stdlib.h
@@ -30,6 +30,7 @@
 #ifndef _STDLIB_H
 #define _STDLIB_H
 
+#include <commonlib/bsd/stdlib.h>
 #include <die.h>
 #include <stddef.h>
 #include <string.h>
@@ -38,11 +39,7 @@
  * @defgroup malloc Memory allocation functions
  * @{
  */
-void free(void *ptr);
-void *malloc(size_t size);
-void *calloc(size_t nmemb, size_t size);
 void *realloc(void *ptr, size_t size);
-void *memalign(size_t align, size_t size);
 void *dma_malloc(size_t size);
 void *dma_memalign(size_t align, size_t size);
 
@@ -136,43 +133,8 @@ void print_malloc_map(void);
 
 void init_dma_memory(void *start, u32 size);
 int dma_initialized(void);
-int dma_coherent(const void *ptr);
 void dma_allocator_range(void **start_out, size_t *size_out);
 
-static inline void *xmalloc_work(size_t size, const char *file,
-				 const char *func, int line)
-{
-	void *ret = malloc(size);
-	if (!ret && size) {
-		die_work(file, func, line, "Failed to malloc %zu bytes.\n",
-			 size);
-	}
-	return ret;
-}
-#define xmalloc(size) xmalloc_work((size), __FILE__, __func__, __LINE__)
-
-static inline void *xzalloc_work(size_t size, const char *file,
-				 const char *func, int line)
-{
-	void *ret = xmalloc_work(size, file, func, line);
-	memset(ret, 0, size);
-	return ret;
-}
-#define xzalloc(size) xzalloc_work((size), __FILE__, __func__, __LINE__)
-
-static inline void *xmemalign_work(size_t align, size_t size, const char *file,
-				  const char *func, int line)
-{
-	void *ret = memalign(align, size);
-	if (!ret && size) {
-		die_work(file, func, line,
-			 "Failed to memalign %zu bytes with %zu alignment.\n",
-			 size, align);
-	}
-	return ret;
-}
-#define xmemalign(align, size) \
-	xmemalign_work((align), (size), __FILE__, __func__, __LINE__)
 /** @} */
 
 /**
@@ -205,22 +167,6 @@ long int labs(long int j);
 long long int llabs(long long int j);
 /** @} */
 
-/* Enter remote GDB mode. Will initialize connection if not already up. */
-void gdb_enter(void);
-/* Disconnect existing GDB connection if one exists. */
-void gdb_exit(s8 exit_status);
-
-/**
- * Stop execution and halt the processor (this function does not return).
- */
-void halt(void) __attribute__((noreturn));
-void exit(int status) __attribute__((noreturn));
-#define abort() halt()    /**< Alias for the halt() function */
-#if CONFIG(LP_REMOTEGDB)
-/* Override abort()/halt() to trap into GDB if it is enabled. */
-#define halt() do { gdb_enter(); halt(); } while (0)
-#endif
-
 void qsort(void *aa, size_t n, size_t es, int (*cmp)(const void *, const void *));
 char *getenv(const char*);
 uint64_t __umoddi3(uint64_t num, uint64_t den);
@@ -228,4 +174,6 @@ uint64_t  __udivdi3(uint64_t num, uint64_t den);
 uint64_t __ashldi3(uint64_t num, unsigned shift);
 uint64_t __lshrdi3(uint64_t num, unsigned shift);
 
+void __noreturn exit(int status);
+
 #endif