projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: hci_qca: Fix crash with non-serdev devices
[linux-2.6-microblaze.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
929f51e
..
6355f82
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,7
+2,7
@@
VERSION = 5
PATCHLEVEL = 1
SUBLEVEL = 0
VERSION = 5
PATCHLEVEL = 1
SUBLEVEL = 0
-EXTRAVERSION = -rc
2
+EXTRAVERSION = -rc
5
NAME = Shy Crocodile
# *DOCUMENTATION*
NAME = Shy Crocodile
# *DOCUMENTATION*
@@
-401,6
+401,7
@@
NM = $(CROSS_COMPILE)nm
STRIP = $(CROSS_COMPILE)strip
OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
STRIP = $(CROSS_COMPILE)strip
OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
+PAHOLE = pahole
LEX = flex
YACC = bison
AWK = awk
LEX = flex
YACC = bison
AWK = awk
@@
-455,7
+456,7
@@
KBUILD_LDFLAGS :=
GCC_PLUGINS_CFLAGS :=
export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
GCC_PLUGINS_CFLAGS :=
export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
-export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS
+export CPP AR NM STRIP OBJCOPY OBJDUMP
PAHOLE
KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS
export MAKE LEX YACC AWK INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE
export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
export MAKE LEX YACC AWK INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE
export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
@@
-953,9
+954,11
@@
mod_sign_cmd = true
endif
export mod_sign_cmd
endif
export mod_sign_cmd
+HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
+
ifdef CONFIG_STACK_VALIDATION
has_libelf := $(call try-run,\
ifdef CONFIG_STACK_VALIDATION
has_libelf := $(call try-run,\
- echo "int main() {}" | $(HOSTCC) -xc -o /dev/null
-lelf
-,1,0)
+ echo "int main() {}" | $(HOSTCC) -xc -o /dev/null
$(HOST_LIBELF_LIBS)
-,1,0)
ifeq ($(has_libelf),1)
objtool_target := tools/objtool FORCE
else
ifeq ($(has_libelf),1)
objtool_target := tools/objtool FORCE
else