Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 01:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86/vdso, build: When vdso2c fails, unlink the output

Browse Source 
This avoids bizarre failures if make is run again.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/1764385fe9931e8940b9d001132515448ea89523.1401464755.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Andy Lutomirski 2014-05-30 08:48:48 -07:00 committed by H. Peter Anvin
parent 94aca80897
commit 011561837d
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/vdso/vdso2c.c
View File

@ -14,6 +14,8 @@
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/types.h> #include <linux/types.h>
const char *outfilename;
/* Symbols that we need in vdso2c. */ /* Symbols that we need in vdso2c. */
enum { enum {
sym_vvar_page, sym_vvar_page,
@ -44,6 +46,7 @@ static void fail(const char *format, ...)
va_start(ap, format); va_start(ap, format);
fprintf(stderr, "Error: "); fprintf(stderr, "Error: ");
vfprintf(stderr, format, ap); vfprintf(stderr, format, ap);
unlink(outfilename);
exit(1); exit(1);
va_end(ap); va_end(ap);
} }
@ -82,17 +85,16 @@ static void fail(const char *format, ...)
#undef Elf_Sym #undef Elf_Sym
#undef Elf_Dyn #undef Elf_Dyn
static int go(void *addr, size_t len, FILE *outfile, const char *name) static void go(void *addr, size_t len, FILE *outfile, const char *name)
{ {
Elf64_Ehdr *hdr = (Elf64_Ehdr *)addr; Elf64_Ehdr *hdr = (Elf64_Ehdr *)addr;
if (hdr->e_ident[EI_CLASS] == ELFCLASS64) { if (hdr->e_ident[EI_CLASS] == ELFCLASS64) {
return go64(addr, len, outfile, name); go64(addr, len, outfile, name);
} else if (hdr->e_ident[EI_CLASS] == ELFCLASS32) { } else if (hdr->e_ident[EI_CLASS] == ELFCLASS32) {
return go32(addr, len, outfile, name); go32(addr, len, outfile, name);
} else { } else {
fprintf(stderr, "Error: unknown ELF class\n"); fail("unknown ELF class\n");
return 1;
} }
} }
@ -102,7 +104,6 @@ int main(int argc, char **argv)
off_t len; off_t len;
void *addr; void *addr;
FILE *outfile; FILE *outfile;
int ret;
char *name, *tmp; char *name, *tmp;
int namelen; int namelen;
@ -143,14 +144,15 @@ int main(int argc, char **argv)
if (addr == MAP_FAILED) if (addr == MAP_FAILED)
err(1, "mmap"); err(1, "mmap");
outfile = fopen(argv[2], "w"); outfilename = argv[2];
outfile = fopen(outfilename, "w");
if (!outfile) if (!outfile)
err(1, "%s", argv[2]); err(1, "%s", argv[2]);
ret = go(addr, (size_t)len, outfile, name); go(addr, (size_t)len, outfile, name);
munmap(addr, len); munmap(addr, len);
fclose(outfile); fclose(outfile);
return ret; return 0;
} }

10
arch/x86/vdso/vdso2c.h
View File

@ -4,7 +4,7 @@
* are built for 32-bit userspace. * are built for 32-bit userspace.
*/ */
static int GOFUNC(void *addr, size_t len, FILE *outfile, const char *name) static void GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
{ {
int found_load = 0; int found_load = 0;
unsigned long load_size = -1; /* Work around bogus warning */ unsigned long load_size = -1; /* Work around bogus warning */
@ -62,10 +62,8 @@ static int GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
alt_sec = sh; alt_sec = sh;
} }
if (!symtab_hdr) { if (!symtab_hdr)
fail("no symbol table\n"); fail("no symbol table\n");
return 1;
}
strtab_hdr = addr + hdr->e_shoff + strtab_hdr = addr + hdr->e_shoff +
hdr->e_shentsize * symtab_hdr->sh_link; hdr->e_shentsize * symtab_hdr->sh_link;
@ -112,7 +110,7 @@ static int GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
if (!name) { if (!name) {
fwrite(addr, load_size, 1, outfile); fwrite(addr, load_size, 1, outfile);
return 0; return;
} }
fprintf(outfile, "/* AUTOMATICALLY GENERATED -- DO NOT EDIT */\n\n"); fprintf(outfile, "/* AUTOMATICALLY GENERATED -- DO NOT EDIT */\n\n");
@ -152,6 +150,4 @@ static int GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
required_syms[i], syms[i]); required_syms[i], syms[i]);
} }
fprintf(outfile, "};\n"); fprintf(outfile, "};\n");
return 0;
} }