Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Revive proper alignment for the ksymtab and kcrctab sections
- Fix gen_compile_commands.py tool to resolve symbolic links
- Fix symbolic links to installed debug VDSO files
- Update MAINTAINERS
* tag 'kbuild-fixes-v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
linux/export: Ensure natural alignment of kcrctab array
kbuild: fix build ID symlinks to installed debug VDSO files
gen_compile_commands.py: fix path resolve with symlinks in it
MAINTAINERS: Add scripts/clang-tools to Kbuild section
linux/export: Fix alignment for 64-bit ksymtab entries
+10
-5
+1
MAINTAINERS
+1
MAINTAINERS
+5
-1
include/linux/export-internal.h
+5
-1
include/linux/export-internal.h
···
16
16
* and eliminates the need for absolute relocations that require runtime
17
17
* processing on relocatable kernels.
18
18
*/
19
+
#define __KSYM_ALIGN ".balign 4"
19
20
#define __KSYM_REF(sym) ".long " #sym "- ."
20
21
#elif defined(CONFIG_64BIT)
22
+
#define __KSYM_ALIGN ".balign 8"
21
23
#define __KSYM_REF(sym) ".quad " #sym
22
24
#else
25
+
#define __KSYM_ALIGN ".balign 4"
23
26
#define __KSYM_REF(sym) ".long " #sym
24
27
#endif
25
28
···
45
42
" .asciz \"" ns "\"" "\n" \
46
43
" .previous" "\n" \
47
44
" .section \"___ksymtab" sec "+" #name "\", \"a\"" "\n" \
48
-
" .balign 4" "\n" \
45
+
__KSYM_ALIGN "\n" \
49
46
"__ksymtab_" #name ":" "\n" \
50
47
__KSYM_REF(sym) "\n" \
51
48
__KSYM_REF(__kstrtab_ ##name) "\n" \
···
64
61
65
62
#define SYMBOL_CRC(sym, crc, sec) \
66
63
asm(".section \"___kcrctab" sec "+" #sym "\",\"a\"" "\n" \
64
+
".balign 4" "\n" \
67
65
"__crc_" #sym ":" "\n" \
68
66
".long " #crc "\n" \
69
67
".previous" "\n")
+1
-1
scripts/Makefile.vdsoinst
+1
-1
scripts/Makefile.vdsoinst
···
22
22
23
23
# Some architectures create .build-id symlinks
24
24
ifneq ($(filter arm sparc x86, $(SRCARCH)),)
25
-
link := $(install-dir)/.build-id/$$(shell $(READELF) -n $$(src) | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p')
25
+
link := $(install-dir)/.build-id/$$(shell $(READELF) -n $$(src) | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug
26
26
27
27
__default: $$(link)
28
28
$$(link): $$(dest) FORCE
+3
-3
scripts/clang-tools/gen_compile_commands.py
+3
-3
scripts/clang-tools/gen_compile_commands.py
···
64
64
args = parser.parse_args()
65
65
66
66
return (args.log_level,
67
-
os.path.abspath(args.directory),
67
+
os.path.realpath(args.directory),
68
68
args.output,
69
69
args.ar,
70
70
args.paths if len(args.paths) > 0 else [args.directory])
···
172
172
# by Make, so this code replaces the escaped version with '#'.
173
173
prefix = command_prefix.replace('\#', '#').replace('$(pound)', '#')
174
174
175
-
# Use os.path.abspath() to normalize the path resolving '.' and '..' .
176
-
abs_path = os.path.abspath(os.path.join(root_directory, file_path))
175
+
# Return the canonical path, eliminating any symbolic links encountered in the path.
176
+
abs_path = os.path.realpath(os.path.join(root_directory, file_path))
177
177
if not os.path.exists(abs_path):
178
178
raise ValueError('File %s not found' % abs_path)
179
179
return {