d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mips build after r339931.

Browse Source 
I erroneously thought that it was two 64bit platforms which use link_elf_obj.c.

PR:		228854
Reported by:	ci.f.o.
MFC after:	3 days
X-MFC with:	r339931
Pointyhat to:	bz
This commit is contained in:
Bjoern A. Zeeb 2018-10-30 21:35:56 +00:00
parent 0f823b6497
commit 9afc56849a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/link_elf_obj.c
View File

@ -369,8 +369,9 @@ link_elf_link_preload(linker_class_t cls, const char *filename,
dpcpu = dpcpu_alloc(shdr[i].sh_size); dpcpu = dpcpu_alloc(shdr[i].sh_size);
if (dpcpu == NULL) { if (dpcpu == NULL) {
printf("%s: pcpu module space is out " printf("%s: pcpu module space is out "
"of space; cannot allocate %ld for " "of space; cannot allocate %#jx "
"%s\n", __func__, shdr[i].sh_size, "for %s\n", __func__,
(uintmax_t)shdr[i].sh_size,
filename); filename);
error = ENOSPC; error = ENOSPC;
goto out; goto out;
@ -387,8 +388,9 @@ link_elf_link_preload(linker_class_t cls, const char *filename,
vnet_data = vnet_data_alloc(shdr[i].sh_size); vnet_data = vnet_data_alloc(shdr[i].sh_size);
if (vnet_data == NULL) { if (vnet_data == NULL) {
printf("%s: vnet module space is out " printf("%s: vnet module space is out "
"of space; cannot allocate %ld for " "of space; cannot allocate %#jx "
"%s\n", __func__, shdr[i].sh_size, "for %s\n", __func__,
(uintmax_t)shdr[i].sh_size,
filename); filename);
error = ENOSPC; error = ENOSPC;
goto out; goto out;
@ -860,8 +862,9 @@ link_elf_load_file(linker_class_t cls, const char *filename,
dpcpu_alloc(shdr[i].sh_size); dpcpu_alloc(shdr[i].sh_size);
if (ef->progtab[pb].addr == NULL) { if (ef->progtab[pb].addr == NULL) {
printf("%s: pcpu module space is out " printf("%s: pcpu module space is out "
"of space; cannot allocate %ld for " "of space; cannot allocate %#jx "
"%s\n", __func__, shdr[i].sh_size, "for %s\n", __func__,
(uintmax_t)shdr[i].sh_size,
filename); filename);
} }
} }
@ -872,8 +875,9 @@ link_elf_load_file(linker_class_t cls, const char *filename,
vnet_data_alloc(shdr[i].sh_size); vnet_data_alloc(shdr[i].sh_size);
if (ef->progtab[pb].addr == NULL) { if (ef->progtab[pb].addr == NULL) {
printf("%s: vnet module space is out " printf("%s: vnet module space is out "
"of space; cannot allocate %ld for " "of space; cannot allocate %#jx "
"%s\n", __func__, shdr[i].sh_size, "for %s\n", __func__,
(uintmax_t)shdr[i].sh_size,
filename); filename);
} }
} }