diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 14:05:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 14:05:15 -0400 |
commit | 2a2ed2db353d949c06b6ef8b6913f65b39111eab (patch) | |
tree | d835c3dd101da91089c3bdf51c8632e84be37232 /scripts/mod/mk_elfconfig.c | |
parent | 972d19e837833b93466c6f6a8ef2a7d653000aa3 (diff) | |
parent | 070b98bfda3d27269519067c1c67eaef695f3e0c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
kbuild: trivial fixes in Makefile
kbuild: adding symbols in Kconfig and defconfig to TAGS
kbuild: replace abort() with exit(1)
kbuild: support for %.symtypes files
kbuild: fix silentoldconfig recursion
kbuild: add option for stripping modules while installing them
kbuild: kill some false positives from modpost
kbuild: export-symbol usage report generator
kbuild: fix make -rR breakage
kbuild: append -dirty for updated but uncommited changes
kbuild: append git revision for all untagged commits
kbuild: fix module.symvers parsing in modpost
kbuild: ignore make's built-in rules & variables
kbuild: bugfix with initramfs
kbuild: modpost build fix
kbuild: check license compatibility when building modules
kbuild: export-type enhancement to modpost.c
kbuild: add dependency on kernel.release to the package targets
kbuild: `make kernelrelease' speedup
kconfig: KCONFIG_OVERWRITECONFIG
...
Diffstat (limited to 'scripts/mod/mk_elfconfig.c')
-rw-r--r-- | scripts/mod/mk_elfconfig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mod/mk_elfconfig.c b/scripts/mod/mk_elfconfig.c index 3c92c83733f4..725d61c0fb43 100644 --- a/scripts/mod/mk_elfconfig.c +++ b/scripts/mod/mk_elfconfig.c | |||
@@ -28,7 +28,7 @@ main(int argc, char **argv) | |||
28 | printf("#define KERNEL_ELFCLASS ELFCLASS64\n"); | 28 | printf("#define KERNEL_ELFCLASS ELFCLASS64\n"); |
29 | break; | 29 | break; |
30 | default: | 30 | default: |
31 | abort(); | 31 | exit(1); |
32 | } | 32 | } |
33 | switch (ei[EI_DATA]) { | 33 | switch (ei[EI_DATA]) { |
34 | case ELFDATA2LSB: | 34 | case ELFDATA2LSB: |
@@ -38,7 +38,7 @@ main(int argc, char **argv) | |||
38 | printf("#define KERNEL_ELFDATA ELFDATA2MSB\n"); | 38 | printf("#define KERNEL_ELFDATA ELFDATA2MSB\n"); |
39 | break; | 39 | break; |
40 | default: | 40 | default: |
41 | abort(); | 41 | exit(1); |
42 | } | 42 | } |
43 | 43 | ||
44 | if (sizeof(unsigned long) == 4) { | 44 | if (sizeof(unsigned long) == 4) { |
@@ -53,7 +53,7 @@ main(int argc, char **argv) | |||
53 | else if (memcmp(endian_test.c, "\x02\x01", 2) == 0) | 53 | else if (memcmp(endian_test.c, "\x02\x01", 2) == 0) |
54 | printf("#define HOST_ELFDATA ELFDATA2LSB\n"); | 54 | printf("#define HOST_ELFDATA ELFDATA2LSB\n"); |
55 | else | 55 | else |
56 | abort(); | 56 | exit(1); |
57 | 57 | ||
58 | if ((strcmp(argv[1], "v850") == 0) || (strcmp(argv[1], "h8300") == 0)) | 58 | if ((strcmp(argv[1], "v850") == 0) || (strcmp(argv[1], "h8300") == 0)) |
59 | printf("#define MODULE_SYMBOL_PREFIX \"_\"\n"); | 59 | printf("#define MODULE_SYMBOL_PREFIX \"_\"\n"); |