mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
fb847632d0
[ Upstream commit 386093c68ba3e8bcfe7f46deba901e0e80713c29 ]
There doesn't seem to be any reason for the rpath being set in
the binaries, at on systems that I tested on. On the other hand,
setting rpath is actually harming binaries in some cases, e.g.
if using nix-based compilation environments where /lib & /lib64
are not part of the actual environment.
Add a new Kconfig option (under EXPERT, for less user confusion)
that allows disabling the rpath additions.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Stable-dep-of: 846cfbeed09b ("um: Fix adding '-no-pie' for clang")
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 90091bdf5df0195de0d2d8e3e4d43aaaee122d34)
[vegard: fix trivial conflict due to missing commit
1572497cb0e6d2016078bc9d5a95786bb878389f ("kconfig: include common
Kconfig files from top-level Kconfig")]
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
62 lines
1.6 KiB
Makefile
62 lines
1.6 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
core-y += arch/x86/crypto/
|
|
|
|
ifeq ($(CONFIG_X86_32),y)
|
|
START := 0x8048000
|
|
|
|
LDFLAGS += -m elf_i386
|
|
ELF_ARCH := i386
|
|
ELF_FORMAT := elf32-i386
|
|
CHECKFLAGS += -D__i386__
|
|
|
|
KBUILD_CFLAGS += $(call cc-option,-m32)
|
|
KBUILD_AFLAGS += $(call cc-option,-m32)
|
|
LINK-y += $(call cc-option,-m32)
|
|
|
|
export LDFLAGS
|
|
|
|
LDS_EXTRA := -Ui386
|
|
export LDS_EXTRA
|
|
|
|
# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
|
|
include arch/x86/Makefile_32.cpu
|
|
|
|
# prevent gcc from keeping the stack 16 byte aligned. Taken from i386.
|
|
cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)
|
|
|
|
# Prevent sprintf in nfsd from being converted to strcpy and resulting in
|
|
# an unresolved reference.
|
|
cflags-y += -ffreestanding
|
|
|
|
# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
|
|
# a lot more stack due to the lack of sharing of stacklots. Also, gcc
|
|
# 4.3.0 needs -funit-at-a-time for extern inline functions.
|
|
KBUILD_CFLAGS += $(shell if [ $(cc-version) -lt 0400 ] ; then \
|
|
echo $(call cc-option,-fno-unit-at-a-time); \
|
|
else echo $(call cc-option,-funit-at-a-time); fi ;)
|
|
|
|
KBUILD_CFLAGS += $(cflags-y)
|
|
|
|
else
|
|
|
|
START := 0x60000000
|
|
|
|
KBUILD_CFLAGS += -fno-builtin -m64
|
|
|
|
CHECKFLAGS += -m64 -D__x86_64__
|
|
KBUILD_AFLAGS += -m64
|
|
LDFLAGS += -m elf_x86_64
|
|
KBUILD_CPPFLAGS += -m64
|
|
|
|
ELF_ARCH := i386:x86-64
|
|
ELF_FORMAT := elf64-x86-64
|
|
|
|
# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
|
|
|
|
LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib64
|
|
LINK-y += -m64
|
|
|
|
# Do unit-at-a-time unconditionally on x86_64, following the host
|
|
KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
|
|
endif
|