vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix symbols appearing in several modules in linux*.

Browse source 
If same symbol is provided by 2 modules its semantics are undefined.
Avoid this by depending rather than double-including files.
This commit is contained in:
Vladimir Serbinenko 2017-08-14 14:09:30 +02:00
parent 21e4a6fa03
commit 26e5aea941
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
grub-core/Makefile.core.def
View file

@ -770,6 +770,7 @@ module = {
module = { module = {
name = boot; name = boot;
common = commands/boot.c; common = commands/boot.c;
common = lib/cmdline.c;
i386_pc = lib/i386/pc/biosnum.c; i386_pc = lib/i386/pc/biosnum.c;
enable = x86; enable = x86;
enable = emu; enable = emu;
@ -1630,8 +1631,6 @@ module = {
module = { module = {
name = linux16; name = linux16;
common = loader/i386/pc/linux.c; common = loader/i386/pc/linux.c;
common = loader/linux.c;
common = lib/cmdline.c;
enable = x86; enable = x86;
}; };
@ -1666,7 +1665,6 @@ module = {
cppflags = "-DGRUB_USE_MULTIBOOT2"; cppflags = "-DGRUB_USE_MULTIBOOT2";
common = loader/multiboot.c; common = loader/multiboot.c;
common = lib/cmdline.c;
common = loader/multiboot_mbi2.c; common = loader/multiboot_mbi2.c;
enable = x86; enable = x86;
enable = mips; enable = mips;
@ -1675,7 +1673,6 @@ module = {
module = { module = {
name = multiboot; name = multiboot;
common = loader/multiboot.c; common = loader/multiboot.c;
common = lib/cmdline.c;
x86 = loader/i386/multiboot_mbi.c; x86 = loader/i386/multiboot_mbi.c;
extra_dist = loader/multiboot_elfxx.c; extra_dist = loader/multiboot_elfxx.c;
enable = x86; enable = x86;
@ -1683,7 +1680,6 @@ module = {
module = { module = {
name = xen_boot; name = xen_boot;
common = lib/cmdline.c;
arm64 = loader/arm64/xen_boot.c; arm64 = loader/arm64/xen_boot.c;
enable = arm64; enable = arm64;
}; };
@ -1700,7 +1696,6 @@ module = {
arm = loader/arm/linux.c; arm = loader/arm/linux.c;
arm64 = loader/arm64/linux.c; arm64 = loader/arm64/linux.c;
common = loader/linux.c; common = loader/linux.c;
common = lib/cmdline.c;
enable = noemu; enable = noemu;
}; };