diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.modbuiltin | 5 | ||||
-rw-r--r-- | scripts/kconfig/Makefile | 2 | ||||
-rw-r--r-- | scripts/mod/modpost.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin index 102a276f6eea..1adb974e6950 100644 --- a/scripts/Makefile.modbuiltin +++ b/scripts/Makefile.modbuiltin | |||
@@ -14,6 +14,11 @@ __modbuiltin: | |||
14 | 14 | ||
15 | include scripts/Kbuild.include | 15 | include scripts/Kbuild.include |
16 | 16 | ||
17 | ifneq ($(KBUILD_SRC),) | ||
18 | # Create output directory if not already present | ||
19 | _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) | ||
20 | endif | ||
21 | |||
17 | # The filename Kbuild has precedence over Makefile | 22 | # The filename Kbuild has precedence over Makefile |
18 | kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) | 23 | kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) |
19 | kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile) | 24 | kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile) |
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 7cdae39b8f09..7ea649da1940 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -219,7 +219,7 @@ HOSTCFLAGS_zconf.tab.o := -I$(src) | |||
219 | HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl | 219 | HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl |
220 | HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK | 220 | HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK |
221 | 221 | ||
222 | HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` | 222 | HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl |
223 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ | 223 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ |
224 | -D LKC_DIRECT_LINK | 224 | -D LKC_DIRECT_LINK |
225 | 225 | ||
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 3318692e4e76..f8779006986d 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -1342,7 +1342,7 @@ static unsigned int *reloc_location(struct elf_info *elf, | |||
1342 | int section = sechdr->sh_info; | 1342 | int section = sechdr->sh_info; |
1343 | 1343 | ||
1344 | return (void *)elf->hdr + sechdrs[section].sh_offset + | 1344 | return (void *)elf->hdr + sechdrs[section].sh_offset + |
1345 | (r->r_offset - sechdrs[section].sh_addr); | 1345 | r->r_offset - sechdrs[section].sh_addr; |
1346 | } | 1346 | } |
1347 | 1347 | ||
1348 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) | 1348 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) |