Commit cda5f94e authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

modpost: avoid using the alias attribute 

Aiden Leong reported modpost fails to build on macOS since commit
16a473f6 ("modpost: inform compilers that fatal() never returns"):

  scripts/mod/modpost.c:93:21: error: aliases are not supported on darwin

Nathan's research indicates that Darwin seems to support weak aliases
at least [1]. Although the situation might be improved in future Clang
versions, we can achieve a similar outcome without relying on it.

This commit makes fatal() a macro of error() + exit(1) in modpost.h, as
compilers recognize that exit() never returns.

[1]: https://github.com/llvm/llvm-project/issues/71001



Fixes: 16a473f6 ("modpost: inform compilers that fatal() never returns")
Reported-by: default avatarAiden Leong <aiden.leong@aibsd.com>
Closes: https://lore.kernel.org/all/d9ac2960-6644-4a87-b5e4-4bfb6e0364a8@aibsd.com/


Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 89876175

scripts/mod/modpost.c

+1 −11
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ void modpost_log(enum loglevel loglevel, const char *fmt, ...) 
		break;

	case LOG_ERROR:

		fprintf(stderr, "ERROR: ");

		break;

	case LOG_FATAL:

		fprintf(stderr, "FATAL: ");

		error_occurred = true;

		break;

	default: /* invalid loglevel, ignore */

		break;
@@ -83,16 +81,8 @@ void modpost_log(enum loglevel loglevel, const char *fmt, ...) 
	va_start(arglist, fmt);

	vfprintf(stderr, fmt, arglist);

	va_end(arglist);



	if (loglevel == LOG_FATAL)

		exit(1);

	if (loglevel == LOG_ERROR)

		error_occurred = true;

}



void __attribute__((alias("modpost_log")))

modpost_log_noret(enum loglevel loglevel, const char *fmt, ...);



static inline bool strends(const char *str, const char *postfix)

{

	if (strlen(str) < strlen(postfix))

scripts/mod/modpost.h

+1 −5
Original line number Diff line number Diff line
@@ -194,15 +194,11 @@ void *sym_get_data(const struct elf_info *info, const Elf_Sym *sym); 
enum loglevel {

	LOG_WARN,

	LOG_ERROR,

	LOG_FATAL

};



void __attribute__((format(printf, 2, 3)))

modpost_log(enum loglevel loglevel, const char *fmt, ...);



void __attribute__((format(printf, 2, 3), noreturn))

modpost_log_noret(enum loglevel loglevel, const char *fmt, ...);



/*

 * warn - show the given message, then let modpost continue running, still

 *        allowing modpost to exit successfully. This should be used when
@@ -218,4 +214,4 @@ modpost_log_noret(enum loglevel loglevel, const char *fmt, ...); 
 */

#define warn(fmt, args...)	modpost_log(LOG_WARN, fmt, ##args)

#define error(fmt, args...)	modpost_log(LOG_ERROR, fmt, ##args)

#define fatal(fmt, args...)	modpost_log_noret(LOG_FATAL, fmt, ##args)
 
#define fatal(fmt, args...)	do { error(fmt, ##args); exit(1); } while (1)