libpayload: Use __func__ instead of old __FUNCTION__
Change-Id: Ic3c22ac101a2ff44f97b2ac3fe3c0a89391718de
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72380
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
diff --git a/payloads/libpayload/include/assert.h b/payloads/libpayload/include/assert.h
index 2152af4..6b4770b 100644
--- a/payloads/libpayload/include/assert.h
+++ b/payloads/libpayload/include/assert.h
@@ -50,7 +50,7 @@
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 c7a6e92..01469de 100644
--- a/payloads/libpayload/include/die.h
+++ b/payloads/libpayload/include/die.h
@@ -35,7 +35,7 @@
__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 ac386c1..e129cd1 100644
--- a/payloads/libpayload/include/stdlib.h
+++ b/payloads/libpayload/include/stdlib.h
@@ -148,7 +148,7 @@
}
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 @@
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)