From be1ff8e638264caafe126ac3fbee04df4e218adb Mon Sep 17 00:00:00 2001 From: Richard Raya Date: Sun, 29 Sep 2024 16:52:22 -0300 Subject: [PATCH] msm-4.14: Revert some unsafe optimizations Change-Id: I2c268f87ab8d9154758384c7a7639046c3784eb8 Signed-off-by: Richard Raya --- arch/arm64/crypto/Makefile | 4 ---- arch/arm64/kernel/Makefile | 3 --- arch/arm64/kernel/vdso/Makefile | 3 +-- arch/arm64/kernel/vdso32/Makefile | 2 +- arch/arm64/lib/Makefile | 5 ----- arch/arm64/mm/Makefile | 3 --- block/Makefile | 5 +---- crypto/Makefile | 4 ---- drivers/android/Makefile | 2 -- drivers/block/Makefile | 4 ---- drivers/block/zram/Makefile | 4 ---- drivers/char/Makefile | 2 -- drivers/cpufreq/Makefile | 5 ----- drivers/devfreq/Makefile | 4 ---- drivers/gpu/drm/Makefile | 4 ---- drivers/gpu/drm/msm/Makefile | 2 -- drivers/gpu/msm/Makefile | 3 --- drivers/staging/android/Makefile | 4 ---- drivers/staging/android/ion/Makefile | 4 ---- fs/erofs/Makefile | 3 --- fs/f2fs/Makefile | 3 --- fs/fuse/Makefile | 2 -- fs/proc/Makefile | 2 -- init/Makefile | 2 -- kernel/Makefile | 4 ---- kernel/bpf/Makefile | 2 -- kernel/cgroup/Makefile | 2 -- kernel/irq/Makefile | 3 --- kernel/printk/Makefile | 2 -- kernel/rcu/Makefile | 4 ---- kernel/sched/Makefile | 4 ---- kernel/time/Makefile | 3 --- kernel/trace/Makefile | 2 -- lib/Makefile | 4 ---- lib/crypto/Makefile | 1 - lib/fonts/Makefile | 2 -- lib/lz4/Makefile | 3 --- lib/lzo/Makefile | 2 -- lib/zstd/Makefile | 2 -- mm/Makefile | 4 ---- net/Makefile | 2 -- 41 files changed, 3 insertions(+), 122 deletions(-) diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile index 6b5124f08a57..2b3b640a1d9b 100644 --- a/arch/arm64/crypto/Makefile +++ b/arch/arm64/crypto/Makefile @@ -8,10 +8,6 @@ # published by the Free Software Foundation. # -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-$(CONFIG_CRYPTO_SHA1_ARM64_CE) += sha1-ce.o sha1-ce-y := sha1-ce-glue.o sha1-ce-core.o diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index f026b322c54f..c5bfdc522806 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -12,9 +12,6 @@ CFLAGS_REMOVE_insn.o = -pg CFLAGS_REMOVE_return_address.o = -pg CFLAGS_setup.o = -DUTS_MACHINE='"$(UTS_MACHINE)"' -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 # Object file lists. arm64-obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index 2d6a382f0bd0..cdf7c400514f 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -20,13 +20,12 @@ ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 --hash-style=sysv \ ccflags-y := -fno-stack-protector ccflags-y += -DDISABLE_BRANCH_PROFILING -ffixed-x18 ccflags-y += $(call cc-option, -fno-whole-program) -ccflags-y += -Ofast # Force -O2 to avoid libgcc dependencies CFLAGS_REMOVE_vgettimeofday.o = -pg -Os CFLAGS_vgettimeofday.o = -fPIC ifeq ($(cc-name),clang) -CFLAGS_vgettimeofday.o = -Ofast +CFLAGS_vgettimeofday.o = -O3 else CFLAGS_vgettimeofday.o = -O2 CFLAGS_vgettimeofday.o += -mcmodel=tiny diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 85ecafa41357..ca16bc547eae 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -73,7 +73,7 @@ VDSO_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -Wno-format-security \ -std=gnu89 ifeq ($(cc-name),clang) -VDSO_CFLAGS += -Ofast +VDSO_CFLAGS += -O3 else VDSO_CFLAGS += -O2 endif diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile index 40e2768e1cfe..d4718377b4e9 100644 --- a/arch/arm64/lib/Makefile +++ b/arch/arm64/lib/Makefile @@ -1,9 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 - -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - lib-y := clear_user.o delay.o copy_from_user.o \ copy_to_user.o copy_in_user.o copy_page.o \ clear_page.o memchr.o memcpy.o memmove.o memset.o \ diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile index 72c41aa5fe15..849c1df3d214 100644 --- a/arch/arm64/mm/Makefile +++ b/arch/arm64/mm/Makefile @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 obj-y := dma-mapping.o extable.o fault.o init.o \ cache.o copypage.o flush.o \ ioremap.o mmap.o pgd.o mmu.o \ diff --git a/block/Makefile b/block/Makefile index 09f123f02b2e..ab14055d8222 100644 --- a/block/Makefile +++ b/block/Makefile @@ -11,9 +11,6 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \ genhd.o partition-generic.o ioprio.o \ badblocks.o partitions/ -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-$(CONFIG_BOUNCE) += bounce.o obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_ioctl.o obj-$(CONFIG_BLK_DEV_BSG) += bsg.o @@ -40,4 +37,4 @@ obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += keyslot-manager.o bio-crypt-ctx.o \ blk-crypto.o -obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o +obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o \ No newline at end of file diff --git a/crypto/Makefile b/crypto/Makefile index a05728c1e594..423475b082d8 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -3,10 +3,6 @@ # Cryptographic API # -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-$(CONFIG_CRYPTO) += crypto.o crypto-y := api.o cipher.o compress.o memneq.o diff --git a/drivers/android/Makefile b/drivers/android/Makefile index 53989be6e157..7c91293b6d59 100644 --- a/drivers/android/Makefile +++ b/drivers/android/Makefile @@ -1,5 +1,3 @@ -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 ccflags-y += -I$(src) # needed for trace events obj-$(CONFIG_ANDROID_BINDERFS) += binderfs.o diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 68925cc999c1..c0ff3d997271 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -6,10 +6,6 @@ # Rewritten to use lists instead of if-statements. # -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-$(CONFIG_MAC_FLOPPY) += swim3.o obj-$(CONFIG_BLK_DEV_SWIM) += swim_mod.o obj-$(CONFIG_BLK_DEV_FD) += floppy.o diff --git a/drivers/block/zram/Makefile b/drivers/block/zram/Makefile index 38624ba97ab4..a60493b21678 100644 --- a/drivers/block/zram/Makefile +++ b/drivers/block/zram/Makefile @@ -1,6 +1,2 @@ -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 -ccflags-y += -Ofast - zram-y := zcomp.o zram_drv.o obj-$(CONFIG_ZRAM) += zram.o diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 27c92d88462a..f97b5c968555 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -2,8 +2,6 @@ # # Makefile for the kernel character device drivers. # -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 obj-y += mem.o random.o obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 1a316a5b1bed..c5abbf7aa58a 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -1,9 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 - -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - # CPUfreq core obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o diff --git a/drivers/devfreq/Makefile b/drivers/devfreq/Makefile index 87d1dcb1744f..7511f78ed909 100644 --- a/drivers/devfreq/Makefile +++ b/drivers/devfreq/Makefile @@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-$(CONFIG_PM_DEVFREQ) += devfreq.o obj-$(CONFIG_PM_DEVFREQ_EVENT) += devfreq-event.o obj-$(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND) += governor_simpleondemand.o diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index e9de93d6ae83..19bfbc1beddf 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -3,10 +3,6 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - drm-y := drm_auth.o drm_bufs.o drm_cache.o \ drm_context.o drm_dma.o \ drm_file.o drm_gem.o drm_ioctl.o drm_irq.o \ diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index ad3096e7d0aa..389f8ae3d2c9 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -9,8 +9,6 @@ ccflags-y += -Idrivers/gpu/drm/msm/hdmi ccflags-$(CONFIG_DRM_SDE_SHD) += -Idrivers/gpu/drm/msm/shd ccflags-$(CONFIG_DRM_SDE_SHP) += -Idrivers/gpu/drm/msm/shp -ccflags-y += -Ofast - msm_drm-y := \ dp/dp_usbpd.o \ dp/dp_parser.o \ diff --git a/drivers/gpu/msm/Makefile b/drivers/gpu/msm/Makefile index 3d5808d9cb66..19af028c1da8 100644 --- a/drivers/gpu/msm/Makefile +++ b/drivers/gpu/msm/Makefile @@ -1,7 +1,4 @@ ccflags-y := -Iinclude/linux -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 msm_kgsl_core-y = \ kgsl.o \ diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile index cd1bd9931402..766a635e0bbf 100644 --- a/drivers/staging/android/Makefile +++ b/drivers/staging/android/Makefile @@ -1,7 +1,3 @@ -ccflags-y += -Ofast - -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 ccflags-y += -I$(src) # needed for trace events obj-y += ion/ diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile index 764c9ef680ad..4224f9ab0d2e 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile @@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-$(CONFIG_ION) += ion.o ion_heap.o \ ion_page_pool.o ion_system_heap.o \ ion_carveout_heap.o ion_chunk_heap.o \ diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile index 5251cd6ac3ce..1f9aced49070 100644 --- a/fs/erofs/Makefile +++ b/fs/erofs/Makefile @@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-$(CONFIG_EROFS_FS) += erofs.o erofs-objs := super.o inode.o data.o namei.o dir.o utils.o pcpubuf.o erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o diff --git a/fs/f2fs/Makefile b/fs/f2fs/Makefile index 1190427cd0a4..8a7322d229e4 100644 --- a/fs/f2fs/Makefile +++ b/fs/f2fs/Makefile @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-$(CONFIG_F2FS_FS) += f2fs.o f2fs-y := dir.o file.o inode.o namei.o hash.o super.o inline.o diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile index 8b262d5c5825..9b0821548ab4 100644 --- a/fs/fuse/Makefile +++ b/fs/fuse/Makefile @@ -1,8 +1,6 @@ # # Makefile for the FUSE filesystem. # -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 obj-$(CONFIG_FUSE_FS) += fuse.o obj-$(CONFIG_CUSE) += cuse.o diff --git a/fs/proc/Makefile b/fs/proc/Makefile index b9c6481a3c8d..d8dcb188db6d 100644 --- a/fs/proc/Makefile +++ b/fs/proc/Makefile @@ -3,8 +3,6 @@ # Makefile for the Linux proc filesystem routines. # -ccflags-y += -Ofast - obj-y += proc.o CFLAGS_task_mmu.o += $(call cc-option,-Wno-override-init,) diff --git a/init/Makefile b/init/Makefile index 025f813167c0..e5dd3192ed35 100644 --- a/init/Makefile +++ b/init/Makefile @@ -4,8 +4,6 @@ # ccflags-y := -fno-function-sections -fno-data-sections -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 obj-y := main.o version.o mounts.o obj-y += noinitramfs.o diff --git a/kernel/Makefile b/kernel/Makefile index 388ca94e4d39..5b01c50af69a 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -35,10 +35,6 @@ CFLAGS_kcov.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) # cond_syscall is currently not LTO compatible CFLAGS_sys_ni.o = $(DISABLE_LTO) -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - # Don't instrument error handlers CFLAGS_cfi.o = $(DISABLE_CFI_CLANG) diff --git a/kernel/bpf/Makefile b/kernel/bpf/Makefile index 356a7df48224..be282c135a66 100644 --- a/kernel/bpf/Makefile +++ b/kernel/bpf/Makefile @@ -2,8 +2,6 @@ obj-y := core.o CFLAGS_core.o += $(call cc-disable-warning, override-init) -ccflags-y += -Ofast - obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o obj-$(CONFIG_BPF_SYSCALL) += hashtab.o arraymap.o percpu_freelist.o bpf_lru_list.o lpm_trie.o map_in_map.o ifeq ($(CONFIG_NET),y) diff --git a/kernel/cgroup/Makefile b/kernel/cgroup/Makefile index 3bee28d3cc40..3fd48a8123af 100644 --- a/kernel/cgroup/Makefile +++ b/kernel/cgroup/Makefile @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 obj-y := cgroup.o namespace.o cgroup-v1.o freezer.o obj-$(CONFIG_CGROUP_FREEZER) += legacy_freezer.o diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile index 5effe41150f2..ed15d142694b 100644 --- a/kernel/irq/Makefile +++ b/kernel/irq/Makefile @@ -1,8 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-y := irqdesc.o handle.o manage.o spurious.o resend.o chip.o dummychip.o devres.o obj-$(CONFIG_IRQ_TIMINGS) += timings.o obj-$(CONFIG_GENERIC_IRQ_CHIP) += generic-chip.o diff --git a/kernel/printk/Makefile b/kernel/printk/Makefile index bdc8f92431aa..4a2ffc39eb95 100644 --- a/kernel/printk/Makefile +++ b/kernel/printk/Makefile @@ -1,5 +1,3 @@ -ccflags-y += -Ofast - obj-y = printk.o obj-$(CONFIG_PRINTK) += printk_safe.o obj-$(CONFIG_A11Y_BRAILLE_CONSOLE) += braille.o diff --git a/kernel/rcu/Makefile b/kernel/rcu/Makefile index faef93a61229..020e8b6a644b 100644 --- a/kernel/rcu/Makefile +++ b/kernel/rcu/Makefile @@ -3,10 +3,6 @@ # and is generally not a function of system call inputs. KCOV_INSTRUMENT := n -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-y += update.o sync.o obj-$(CONFIG_TREE_SRCU) += srcutree.o obj-$(CONFIG_TINY_SRCU) += srcutiny.o diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile index 6927a6ed32e6..3d5d9d2c7499 100644 --- a/kernel/sched/Makefile +++ b/kernel/sched/Makefile @@ -16,10 +16,6 @@ ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y) CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer endif -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - obj-y += core.o loadavg.o clock.o cputime.o obj-y += idle_task.o fair.o rt.o deadline.o obj-y += wait.o wait_bit.o swait.o completion.o idle.o diff --git a/kernel/time/Makefile b/kernel/time/Makefile index 7ac4dfc60cca..f1e46f338a9c 100644 --- a/kernel/time/Makefile +++ b/kernel/time/Makefile @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 - -ccflags-y += -Ofast - obj-y += time.o timer.o hrtimer.o obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o obj-y += timeconv.o timecounter.o alarmtimer.o diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index e382db663fe4..62647c7a88ac 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -23,8 +23,6 @@ endif CFLAGS_trace_benchmark.o := -I$(src) CFLAGS_trace_events_filter.o := -I$(src) -ccflags-y += -Ofast - obj-$(CONFIG_TRACE_CLOCK) += trace_clock.o obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o diff --git a/lib/Makefile b/lib/Makefile index 907b22e09ad2..1b4fe20b2560 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -33,10 +33,6 @@ endif CFLAGS_string.o += $(call cc-option, -fno-stack-protector) endif -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - lib-y := ctype.o string.o vsprintf.o cmdline.o \ rbtree.o radix-tree.o dump_stack.o timerqueue.o\ idr.o int_sqrt.o extable.o \ diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 94360ceb7cc8..d0bca68618f0 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y += -Ofast obj-y += libblake2s.o libblake2s-y += blake2s.o blake2s-generic.o ifneq ($(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS),y) diff --git a/lib/fonts/Makefile b/lib/fonts/Makefile index 35b7bd077d23..d56f02dea83a 100644 --- a/lib/fonts/Makefile +++ b/lib/fonts/Makefile @@ -1,8 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Font handling -ccflags-y += -Ofast - font-objs := fonts.o font-objs-$(CONFIG_FONT_SUN8x16) += font_sun8x16.o diff --git a/lib/lz4/Makefile b/lib/lz4/Makefile index 556e18c0c534..bf1f698fd437 100644 --- a/lib/lz4/Makefile +++ b/lib/lz4/Makefile @@ -1,6 +1,3 @@ -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 ccflags-y += -O3 obj-$(CONFIG_LZ4_COMPRESS) += lz4_compress.o diff --git a/lib/lzo/Makefile b/lib/lzo/Makefile index 35c0335fb0cc..f0f7d7ca2b83 100644 --- a/lib/lzo/Makefile +++ b/lib/lzo/Makefile @@ -1,5 +1,3 @@ -ccflags-y += -Ofast - lzo_compress-objs := lzo1x_compress.o lzo_decompress-objs := lzo1x_decompress_safe.o diff --git a/lib/zstd/Makefile b/lib/zstd/Makefile index 4e294bee73b9..464c410b2768 100644 --- a/lib/zstd/Makefile +++ b/lib/zstd/Makefile @@ -12,8 +12,6 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd_compress.o obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd_decompress.o obj-$(CONFIG_ZSTD_COMMON) += zstd_common.o -ccflags-y += -Ofast - zstd_compress-y := \ zstd_compress_module.o \ compress/fse_compress.o \ diff --git a/mm/Makefile b/mm/Makefile index 6786a040c3f3..7b6881ca6dca 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -21,10 +21,6 @@ KCOV_INSTRUMENT_memcontrol.o := n KCOV_INSTRUMENT_mmzone.o := n KCOV_INSTRUMENT_vmstat.o := n -ccflags-y += -Ofast -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 - mmu-y := nommu.o mmu-$(CONFIG_MMU) := gup.o highmem.o memory.o mincore.o \ mlock.o mmap.o mprotect.o mremap.o msync.o \ diff --git a/net/Makefile b/net/Makefile index e8759dfd9916..968359fdfe48 100644 --- a/net/Makefile +++ b/net/Makefile @@ -5,8 +5,6 @@ # 2 Sep 2000, Christoph Hellwig # Rewritten to use lists instead of if-statements. # -ccflags-y += -mllvm -inline-threshold=15000 -ccflags-y += -mllvm -inlinehint-threshold=10000 obj-$(CONFIG_NET) := socket.o core/