3 files changed, 4 insertions, 4 deletions
diff --git a/payloads/libpayload/include/assert.h b/payloads/libpayload/include/assert.h
index 2152af4f7a..6b4770b343 100644
--- a/payloads/libpayload/include/assert.h
+++ b/payloads/libpayload/include/assert.h
@@ -50,7 +50,7 @@ void mock_assert(const int result, const char *const expression, const char *con
 	if ((statement) == 0) {					\
 		fprintf(stderr, "assertion failed in file %s, "	\
 			"function %s(), line %d\n",		\
-			 __FILE__, __FUNCTION__, __LINE__);	\
+			 __FILE__, __func__, __LINE__);	\
 		abort();					\
 	}
 #endif
diff --git a/payloads/libpayload/include/die.h b/payloads/libpayload/include/die.h
index c7a6e92d04..01469de17a 100644
--- a/payloads/libpayload/include/die.h
+++ b/payloads/libpayload/include/die.h
@@ -35,7 +35,7 @@ void die_work(const char *file, const char *func, const int line,
 	__attribute__((noreturn));
 
 #define die(fmt, args...) \
-	do { die_work(__FILE__, __FUNCTION__, __LINE__, fmt, ##args); } \
+	do { die_work(__FILE__, __func__, __LINE__, fmt, ##args); } \
 	while (0)
 
 #define die_if(condition, fmt, args...) \
diff --git a/payloads/libpayload/include/stdlib.h b/payloads/libpayload/include/stdlib.h
index ac386c1fa2..e129cd10d4 100644
--- a/payloads/libpayload/include/stdlib.h
+++ b/payloads/libpayload/include/stdlib.h
@@ -148,7 +148,7 @@ static inline void *xmalloc_work(size_t size, const char *file,
 	}
 	return ret;
 }
-#define xmalloc(size) xmalloc_work((size), __FILE__, __FUNCTION__, __LINE__)
+#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)
@@ -157,7 +157,7 @@ static inline void *xzalloc_work(size_t size, const char *file,
 	memset(ret, 0, size);
 	return ret;
 }
-#define xzalloc(size) xzalloc_work((size), __FILE__, __FUNCTION__, __LINE__)
+#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)