projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dmaengine-5.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma
[linux-2.6-block.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 9b08f6383a52841e75efc9d3e2a8066eb5560a29..4262ef93a294f4a8dd18c7a8d810e00444ee8c09 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,7
+2,7
@@
VERSION = 5
PATCHLEVEL = 3
SUBLEVEL = 0
VERSION = 5
PATCHLEVEL = 3
SUBLEVEL = 0
-EXTRAVERSION =
-rc8
+EXTRAVERSION =
NAME = Bobtail Squid
# *DOCUMENTATION*
NAME = Bobtail Squid
# *DOCUMENTATION*
@@
-913,6
+913,10
@@
ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
LDFLAGS_vmlinux += $(call ld-option, -X,)
endif
LDFLAGS_vmlinux += $(call ld-option, -X,)
endif
+ifeq ($(CONFIG_RELR),y)
+LDFLAGS_vmlinux += --pack-dyn-relocs=relr
+endif
+
# insure the checker run with the right endianness
CHECKFLAGS += $(if $(CONFIG_CPU_BIG_ENDIAN),-mbig-endian,-mlittle-endian)
# insure the checker run with the right endianness
CHECKFLAGS += $(if $(CONFIG_CPU_BIG_ENDIAN),-mbig-endian,-mlittle-endian)