ffef593e93
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmBEt1AACgkQONu9yGCS aT5UcBAAuobHx4KFrA3/SWKQo81k7oyyXdbb8BJK3hYLCl+RFD7aYguZlvqITVw+ Hme5PQPnLvY3jc/TwhuIDOG2o2020mT79J8Ggo5ccP/pMIumOwi4LXLvcFQiUevo PnYbXM+QCmxyrm+d10gYeARaGDjP+rI5V46AeB+lkn9SgjzJB649d7BQxnQUxPfB bm+PyOhX7WgqvZFmkPR4RmLBBC57OfUtZoPID/mLW0w6kKYcy3GD1uHEp3TeG3Pe PVxjC57kEiHqnEck2df2XhaB12QlGUGxJXPDmhx6djsvpr3Ss4XOMOYVkZcfsWW5 hThRdiBEgoOhjhqpfpuKYXE0IrB41Uxd6LNd4piCGF1xfiPSWF2x0m8a0NmgAynN Ungl6BbvgSyawI0luZeocSStD2POEbx264qxvA2t+XlxGCxw8PpS4X5mtNAk7vao VathiQFdt9LVtFftq7tVcy1XMt7U6SSOj84opLig5S4LHrUPY+/E0qCgZ4V786eo fkE13zUpixsxgbvYphAYIErXrq9o0B3WtaAa4jFB/RBugHy5mDGCavM/MNVgitJr Y7L9dNzdx2FpAez/dbod+n/CH5wXsnmLa2ZGqqIBVhxHRMOlYTVKa1ioc0bHrjab 8giS1lm1EXOFgIPW7xI9aEG5alLy9s2ai29nAPmhpi1N72WUtQQ= =OmY7 -----END PGP SIGNATURE----- Merge 5.4.103 into android11-5.4-lts Changes in 5.4.103 net: usb: qmi_wwan: support ZTE P685M modem Input: elantech - fix protocol errors for some trackpoints in SMBus mode nvme-pci: refactor nvme_unmap_data nvme-pci: fix error unwind in nvme_map_data arm64 module: set plt* section addresses to 0x0 MIPS: VDSO: Use CLANG_FLAGS instead of filtering out '--target=' JFS: more checks for invalid superblock udlfb: Fix memory leak in dlfb_usb_probe media: mceusb: sanity check for prescaler value erofs: fix shift-out-of-bounds of blkszbits media: v4l2-ctrls.c: fix shift-out-of-bounds in std_validate xfs: Fix assert failure in xfs_setattr_size() net/af_iucv: remove WARN_ONCE on malformed RX packets smackfs: restrict bytes count in smackfs write functions net: fix up truesize of cloned skb in skb_prepare_for_shift() nbd: handle device refs for DESTROY_ON_DISCONNECT properly mm/hugetlb.c: fix unnecessary address expansion of pmd sharing net: bridge: use switchdev for port flags set through sysfs too net: ag71xx: remove unnecessary MTU reservation net: fix dev_ifsioc_locked() race condition dt-bindings: ethernet-controller: fix fixed-link specification dt-bindings: net: btusb: DT fix s/interrupt-name/interrupt-names/ MIPS: Drop 32-bit asm string functions drm/virtio: use kvmalloc for large allocations rsi: Fix TX EAPOL packet handling against iwlwifi AP rsi: Move card interrupt handling to RX thread staging: fwserial: Fix error handling in fwserial_create x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk vt/consolemap: do font sum unsigned wlcore: Fix command execute failure 19 for wl12xx Bluetooth: hci_h5: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for btrtl pktgen: fix misuse of BUG_ON() in pktgen_thread_worker() ath10k: fix wmi mgmt tx queue full due to race condition x86/build: Treat R_386_PLT32 relocation as R_386_PC32 Bluetooth: Fix null pointer dereference in amp_read_loc_assoc_final_data staging: most: sound: add sanity check for function argument staging: bcm2835-audio: Replace unsafe strcpy() with strscpy() brcmfmac: Add DMI nvram filename quirk for Predia Basic tablet brcmfmac: Add DMI nvram filename quirk for Voyo winpad A15 tablet drm/hisilicon: Fix use-after-free crypto: tcrypt - avoid signed overflow in byte count drm/amdgpu: Add check to prevent IH overflow PCI: Add a REBAR size quirk for Sapphire RX 5600 XT Pulse drm/amd/display: Guard against NULL pointer deref when get_i2c_info fails media: uvcvideo: Allow entities with no pads f2fs: handle unallocated section and zone on pinned/atgc f2fs: fix to set/clear I_LINKABLE under i_lock nvme-core: add cancel tagset helpers nvme-rdma: add clean action for failed reconnection nvme-tcp: add clean action for failed reconnection ASoC: Intel: Add DMI quirk table to soc_intel_is_byt_cr() btrfs: fix error handling in commit_fs_roots perf/x86/kvm: Add Cascade Lake Xeon steppings to isolation_ucodes[] parisc: Bump 64-bit IRQ stack size to 64 KB sched/features: Fix hrtick reprogramming ASoC: Intel: bytcr_rt5640: Add quirk for the Estar Beauty HD MID 7316R tablet ASoC: Intel: bytcr_rt5640: Add quirk for the Voyo Winpad A15 tablet ASoC: Intel: bytcr_rt5651: Add quirk for the Jumper EZpad 7 tablet ASoC: Intel: bytcr_rt5640: Add quirk for the Acer One S1002 tablet scsi: iscsi: Restrict sessions and handles to admin capabilities sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output scsi: iscsi: Ensure sysfs attributes are limited to PAGE_SIZE scsi: iscsi: Verify lengths on passthrough PDUs Xen/gnttab: handle p2m update errors on a per-slot basis xen-netback: respect gnttab_map_refs()'s return value zsmalloc: account the number of compacted pages correctly swap: fix swapfile read/write offset media: v4l: ioctl: Fix memory leak in video_usercopy ALSA: hda/realtek: Add quirk for Clevo NH55RZQ ALSA: hda/realtek: Add quirk for Intel NUC 10 ALSA: hda/realtek: Apply dual codec quirks for MSI Godlike X570 board Linux 5.4.103 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I01d8e054de227c576cd495475b66aaf960017adb
218 lines
6.3 KiB
Makefile
218 lines
6.3 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
# Objects to go into the VDSO.
|
|
|
|
# Absolute relocation type $(ARCH_REL_TYPE_ABS) needs to be defined before
|
|
# the inclusion of generic Makefile.
|
|
ARCH_REL_TYPE_ABS := R_MIPS_JUMP_SLOT|R_MIPS_GLOB_DAT
|
|
include $(srctree)/lib/vdso/Makefile
|
|
|
|
obj-vdso-y := elf.o vgettimeofday.o sigreturn.o
|
|
|
|
# Common compiler flags between ABIs.
|
|
ccflags-vdso := \
|
|
$(filter -I%,$(KBUILD_CFLAGS)) \
|
|
$(filter -E%,$(KBUILD_CFLAGS)) \
|
|
$(filter -mmicromips,$(KBUILD_CFLAGS)) \
|
|
$(filter -march=%,$(KBUILD_CFLAGS)) \
|
|
$(filter -m%-float,$(KBUILD_CFLAGS)) \
|
|
$(filter -mno-loongson-%,$(KBUILD_CFLAGS)) \
|
|
$(CLANG_FLAGS) \
|
|
-D__VDSO__
|
|
|
|
ifndef CONFIG_64BIT
|
|
ccflags-vdso += -DBUILD_VDSO32
|
|
endif
|
|
|
|
#
|
|
# The -fno-jump-tables flag only prevents the compiler from generating
|
|
# jump tables but does not prevent the compiler from emitting absolute
|
|
# offsets.
|
|
cflags-vdso := $(ccflags-vdso) \
|
|
$(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \
|
|
-O3 -g -fPIC -fno-strict-aliasing -fno-common -fno-builtin -G 0 \
|
|
-fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \
|
|
$(call cc-option, -fno-asynchronous-unwind-tables) \
|
|
$(call cc-option, -fno-stack-protector)
|
|
aflags-vdso := $(ccflags-vdso) \
|
|
-D__ASSEMBLY__ -Wa,-gdwarf-2
|
|
|
|
ifneq ($(c-gettimeofday-y),)
|
|
CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y)
|
|
|
|
# config-n32-o32-env.c prepares the environment to build a 32bit vDSO
|
|
# library on a 64bit kernel.
|
|
# Note: Needs to be included before than the generic library.
|
|
CFLAGS_vgettimeofday-o32.o = -include $(srctree)/$(src)/config-n32-o32-env.c -include $(c-gettimeofday-y)
|
|
CFLAGS_vgettimeofday-n32.o = -include $(srctree)/$(src)/config-n32-o32-env.c -include $(c-gettimeofday-y)
|
|
endif
|
|
|
|
CFLAGS_REMOVE_vgettimeofday.o = -pg
|
|
|
|
#
|
|
# For the pre-R6 code in arch/mips/vdso/vdso.h for locating
|
|
# the base address of VDSO, the linker will emit a R_MIPS_PC32
|
|
# relocation in binutils > 2.25 but it will fail with older versions
|
|
# because that relocation is not supported for that symbol. As a result
|
|
# of which we are forced to disable the VDSO symbols when building
|
|
# with < 2.25 binutils on pre-R6 kernels. For more references on why we
|
|
# can't use other methods to get the base address of VDSO please refer to
|
|
# the comments on that file.
|
|
#
|
|
ifndef CONFIG_CPU_MIPSR6
|
|
ifeq ($(call ld-ifversion, -lt, 225000000, y),y)
|
|
$(warning MIPS VDSO requires binutils >= 2.25)
|
|
obj-vdso-y := $(filter-out vgettimeofday.o, $(obj-vdso-y))
|
|
ccflags-vdso += -DDISABLE_MIPS_VDSO
|
|
endif
|
|
endif
|
|
|
|
# VDSO linker flags.
|
|
VDSO_LDFLAGS := \
|
|
-Wl,-Bsymbolic -Wl,--no-undefined -Wl,-soname=linux-vdso.so.1 \
|
|
$(addprefix -Wl$(comma),$(filter -E%,$(KBUILD_CFLAGS))) \
|
|
-nostdlib -shared -Wl,--hash-style=sysv -Wl,--build-id
|
|
|
|
CFLAGS_REMOVE_vdso.o = -pg
|
|
|
|
GCOV_PROFILE := n
|
|
UBSAN_SANITIZE := n
|
|
|
|
#
|
|
# Shared build commands.
|
|
#
|
|
|
|
quiet_cmd_vdsold_and_vdso_check = LD $@
|
|
cmd_vdsold_and_vdso_check = $(cmd_vdsold); $(cmd_vdso_check)
|
|
|
|
quiet_cmd_vdsold = VDSO $@
|
|
cmd_vdsold = $(CC) $(c_flags) $(VDSO_LDFLAGS) \
|
|
-Wl,-T $(filter %.lds,$^) $(filter %.o,$^) -o $@
|
|
|
|
quiet_cmd_vdsoas_o_S = AS $@
|
|
cmd_vdsoas_o_S = $(CC) $(a_flags) -c -o $@ $<
|
|
|
|
# Strip rule for the raw .so files
|
|
$(obj)/%.so.raw: OBJCOPYFLAGS := -S
|
|
$(obj)/%.so.raw: $(obj)/%.so.dbg.raw FORCE
|
|
$(call if_changed,objcopy)
|
|
|
|
hostprogs-y := genvdso
|
|
|
|
quiet_cmd_genvdso = GENVDSO $@
|
|
define cmd_genvdso
|
|
$(foreach file,$(filter %.raw,$^),cp $(file) $(file:%.raw=%) &&) \
|
|
$(obj)/genvdso $(<:%.raw=%) $(<:%.dbg.raw=%) $@ $(VDSO_NAME)
|
|
endef
|
|
|
|
#
|
|
# Build native VDSO.
|
|
#
|
|
|
|
native-abi := $(filter -mabi=%,$(KBUILD_CFLAGS))
|
|
|
|
targets += $(obj-vdso-y)
|
|
targets += vdso.lds
|
|
targets += vdso.so.dbg.raw vdso.so.raw
|
|
targets += vdso.so.dbg vdso.so
|
|
targets += vdso-image.c
|
|
|
|
obj-vdso := $(obj-vdso-y:%.o=$(obj)/%.o)
|
|
|
|
$(obj-vdso): KBUILD_CFLAGS := $(cflags-vdso) $(native-abi)
|
|
$(obj-vdso): KBUILD_AFLAGS := $(aflags-vdso) $(native-abi)
|
|
|
|
$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) $(native-abi)
|
|
|
|
$(obj)/vdso.so.dbg.raw: $(obj)/vdso.lds $(obj-vdso) FORCE
|
|
$(call if_changed,vdsold_and_vdso_check)
|
|
|
|
$(obj)/vdso-image.c: $(obj)/vdso.so.dbg.raw $(obj)/vdso.so.raw \
|
|
$(obj)/genvdso FORCE
|
|
$(call if_changed,genvdso)
|
|
|
|
obj-y += vdso-image.o
|
|
|
|
#
|
|
# Build O32 VDSO.
|
|
#
|
|
|
|
# Define these outside the ifdef to ensure they are picked up by clean.
|
|
targets += $(obj-vdso-y:%.o=%-o32.o)
|
|
targets += vdso-o32.lds
|
|
targets += vdso-o32.so.dbg.raw vdso-o32.so.raw
|
|
targets += vdso-o32.so.dbg vdso-o32.so
|
|
targets += vdso-o32-image.c
|
|
|
|
ifdef CONFIG_MIPS32_O32
|
|
|
|
obj-vdso-o32 := $(obj-vdso-y:%.o=$(obj)/%-o32.o)
|
|
|
|
$(obj-vdso-o32): KBUILD_CFLAGS := $(cflags-vdso) -mabi=32
|
|
$(obj-vdso-o32): KBUILD_AFLAGS := $(aflags-vdso) -mabi=32
|
|
|
|
$(obj)/%-o32.o: $(src)/%.S FORCE
|
|
$(call if_changed_dep,vdsoas_o_S)
|
|
|
|
$(obj)/%-o32.o: $(src)/%.c FORCE
|
|
$(call cmd,force_checksrc)
|
|
$(call if_changed_rule,cc_o_c)
|
|
|
|
$(obj)/vdso-o32.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) -mabi=32
|
|
$(obj)/vdso-o32.lds: $(src)/vdso.lds.S FORCE
|
|
$(call if_changed_dep,cpp_lds_S)
|
|
|
|
$(obj)/vdso-o32.so.dbg.raw: $(obj)/vdso-o32.lds $(obj-vdso-o32) FORCE
|
|
$(call if_changed,vdsold_and_vdso_check)
|
|
|
|
$(obj)/vdso-o32-image.c: VDSO_NAME := o32
|
|
$(obj)/vdso-o32-image.c: $(obj)/vdso-o32.so.dbg.raw $(obj)/vdso-o32.so.raw \
|
|
$(obj)/genvdso FORCE
|
|
$(call if_changed,genvdso)
|
|
|
|
obj-y += vdso-o32-image.o
|
|
|
|
endif
|
|
|
|
#
|
|
# Build N32 VDSO.
|
|
#
|
|
|
|
targets += $(obj-vdso-y:%.o=%-n32.o)
|
|
targets += vdso-n32.lds
|
|
targets += vdso-n32.so.dbg.raw vdso-n32.so.raw
|
|
targets += vdso-n32.so.dbg vdso-n32.so
|
|
targets += vdso-n32-image.c
|
|
|
|
ifdef CONFIG_MIPS32_N32
|
|
|
|
obj-vdso-n32 := $(obj-vdso-y:%.o=$(obj)/%-n32.o)
|
|
|
|
$(obj-vdso-n32): KBUILD_CFLAGS := $(cflags-vdso) -mabi=n32
|
|
$(obj-vdso-n32): KBUILD_AFLAGS := $(aflags-vdso) -mabi=n32
|
|
|
|
$(obj)/%-n32.o: $(src)/%.S FORCE
|
|
$(call if_changed_dep,vdsoas_o_S)
|
|
|
|
$(obj)/%-n32.o: $(src)/%.c FORCE
|
|
$(call cmd,force_checksrc)
|
|
$(call if_changed_rule,cc_o_c)
|
|
|
|
$(obj)/vdso-n32.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) -mabi=n32
|
|
$(obj)/vdso-n32.lds: $(src)/vdso.lds.S FORCE
|
|
$(call if_changed_dep,cpp_lds_S)
|
|
|
|
$(obj)/vdso-n32.so.dbg.raw: $(obj)/vdso-n32.lds $(obj-vdso-n32) FORCE
|
|
$(call if_changed,vdsold_and_vdso_check)
|
|
|
|
$(obj)/vdso-n32-image.c: VDSO_NAME := n32
|
|
$(obj)/vdso-n32-image.c: $(obj)/vdso-n32.so.dbg.raw $(obj)/vdso-n32.so.raw \
|
|
$(obj)/genvdso FORCE
|
|
$(call if_changed,genvdso)
|
|
|
|
obj-y += vdso-n32-image.o
|
|
|
|
endif
|
|
|
|
# FIXME: Need install rule for debug.
|
|
# Needs to deal with dependency for generation of dbg by cmd_genvdso...
|