diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
| commit | 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 (patch) | |
| tree | b19210e709de6ee0d22b67ef605a569500cf1a18 /scripts/Kbuild.include | |
| parent | cd979883b9ede90643e019f33cb317933eb867b4 (diff) | |
| parent | 683b6c6f82a60fabf47012581c2cfbf1b037ab95 (diff) | |
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.
Conflicts:
drivers/xen/events/events_base.c
Diffstat (limited to 'scripts/Kbuild.include')
| -rw-r--r-- | scripts/Kbuild.include | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 547e15daf03d..93a0da26582b 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
| @@ -155,6 +155,15 @@ ld-option = $(call try-run,\ | |||
| 155 | # Important: no spaces around options | 155 | # Important: no spaces around options |
| 156 | ar-option = $(call try-run, $(AR) rc$(1) "$$TMP",$(1),$(2)) | 156 | ar-option = $(call try-run, $(AR) rc$(1) "$$TMP",$(1),$(2)) |
| 157 | 157 | ||
| 158 | # ld-version | ||
| 159 | # Usage: $(call ld-version) | ||
| 160 | # Note this is mainly for HJ Lu's 3 number binutil versions | ||
| 161 | ld-version = $(shell $(LD) --version | $(srctree)/scripts/ld-version.sh) | ||
| 162 | |||
| 163 | # ld-ifversion | ||
| 164 | # Usage: $(call ld-ifversion, -ge, 22252, y) | ||
| 165 | ld-ifversion = $(shell [ $(call ld-version) $(1) $(2) ] && echo $(3)) | ||
| 166 | |||
| 158 | ###### | 167 | ###### |
| 159 | 168 | ||
| 160 | ### | 169 | ### |