Merge tag 'kbuild-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada: - Remove potentially incomplete targets when Kbuid is interrupted by SIGINT etc in case GNU Make may miss to do that when stderr is piped to another program. - Rewrite the single target build so it works more correctly. - Fix rpm-pkg builds with V=1. - List top-level subdirectories in ./Kbuild. - Ignore auto-generated __kstrtab_* and __kstrtabns_* symbols in kallsyms. - Avoid two different modules in lib/zstd/ having shared code, which potentially causes building the common code as build-in and modular back-and-forth. - Unify two modpost invocations to optimize the build process. - Remove head-y syntax in favor of linker scripts for placing particular sections in the head of vmlinux. - Bump the minimal GNU Make version to 3.82. - Clean up misc Makefiles and scripts. * tag 'kbuild-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (41 commits) docs: bump minimal GNU Make version to 3.82 ia64: simplify esi object addition in Makefile Revert "kbuild: Check if linker supports the -X option" kbuild: rebuild .vmlinux.export.o when its prerequisite is updated kbuild: move modules.builtin(.modinfo) rules to Makefile.vmlinux_o zstd: Fixing mixed module-builtin objects kallsyms: ignore __kstrtab_* and __kstrtabns_* symbols kallsyms: take the input file instead of reading stdin kallsyms: drop duplicated ignore patterns from kallsyms.c kbuild: reuse mksysmap output for kallsyms mksysmap: update comment about __crc_* kbuild: remove head-y syntax kbuild: use obj-y instead extra-y for objects placed at the head kbuild: hide error checker logs for V=1 builds kbuild: re-run modpost when it is updated kbuild: unify two modpost invocations kbuild: move vmlinux.o rule to the top Makefile kbuild: move .vmlinux.objs rule to Makefile.modpost kbuild: list sub-directories in ./Kbuild Makefile.compiler: replace cc-ifversion with compiler-specific macros ...
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -87,7 +88,7 @@ static unsigned char best_table_len[256];
|
||||
static void usage(void)
|
||||
{
|
||||
fprintf(stderr, "Usage: kallsyms [--all-symbols] [--absolute-percpu] "
|
||||
"[--base-relative] < in.map > out.S\n");
|
||||
"[--base-relative] in.map > out.S\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -123,9 +124,6 @@ static bool is_ignored_symbol(const char *name, char type)
|
||||
|
||||
/* Symbol names that begin with the following are ignored.*/
|
||||
static const char * const ignored_prefixes[] = {
|
||||
"$", /* local symbols for ARM, MIPS, etc. */
|
||||
".L", /* local labels, .LBB,.Ltmpxxx,.L__unnamed_xx,.LASANPC, etc. */
|
||||
"__crc_", /* modversions */
|
||||
"__efistub_", /* arm64 EFI stub namespace */
|
||||
"__kvm_nvhe_$", /* arm64 local symbols in non-VHE KVM namespace */
|
||||
"__kvm_nvhe_.L", /* arm64 local symbols in non-VHE KVM namespace */
|
||||
@@ -330,12 +328,19 @@ static void shrink_table(void)
|
||||
}
|
||||
}
|
||||
|
||||
static void read_map(FILE *in)
|
||||
static void read_map(const char *in)
|
||||
{
|
||||
FILE *fp;
|
||||
struct sym_entry *sym;
|
||||
|
||||
while (!feof(in)) {
|
||||
sym = read_symbol(in);
|
||||
fp = fopen(in, "r");
|
||||
if (!fp) {
|
||||
perror(in);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
while (!feof(fp)) {
|
||||
sym = read_symbol(fp);
|
||||
if (!sym)
|
||||
continue;
|
||||
|
||||
@@ -346,12 +351,15 @@ static void read_map(FILE *in)
|
||||
table = realloc(table, sizeof(*table) * table_size);
|
||||
if (!table) {
|
||||
fprintf(stderr, "out of memory\n");
|
||||
fclose(fp);
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
|
||||
table[table_cnt++] = sym;
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
static void output_label(const char *label)
|
||||
@@ -805,22 +813,26 @@ static void record_relative_base(void)
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
if (argc >= 2) {
|
||||
int i;
|
||||
for (i = 1; i < argc; i++) {
|
||||
if(strcmp(argv[i], "--all-symbols") == 0)
|
||||
all_symbols = 1;
|
||||
else if (strcmp(argv[i], "--absolute-percpu") == 0)
|
||||
absolute_percpu = 1;
|
||||
else if (strcmp(argv[i], "--base-relative") == 0)
|
||||
base_relative = 1;
|
||||
else
|
||||
usage();
|
||||
}
|
||||
} else if (argc != 1)
|
||||
while (1) {
|
||||
static struct option long_options[] = {
|
||||
{"all-symbols", no_argument, &all_symbols, 1},
|
||||
{"absolute-percpu", no_argument, &absolute_percpu, 1},
|
||||
{"base-relative", no_argument, &base_relative, 1},
|
||||
{},
|
||||
};
|
||||
|
||||
int c = getopt_long(argc, argv, "", long_options, NULL);
|
||||
|
||||
if (c == -1)
|
||||
break;
|
||||
if (c != 0)
|
||||
usage();
|
||||
}
|
||||
|
||||
if (optind >= argc)
|
||||
usage();
|
||||
|
||||
read_map(stdin);
|
||||
read_map(argv[optind]);
|
||||
shrink_table();
|
||||
if (absolute_percpu)
|
||||
make_percpus_absolute();
|
||||
|
||||
Reference in New Issue
Block a user