forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2 
 kernel/arch/x86/entry/vdso/Makefile
....@@ -9,8 +9,10 @@
99 ARCH_REL_TYPE_ABS += R_386_GLOB_DAT|R_386_JMP_SLOT|R_386_RELATIVE
1010 include $(srctree)/lib/vdso/Makefile
1111 
12
+# Sanitizer runtimes are unavailable and cannot be linked here.
1213 KASAN_SANITIZE			:= n
1314 UBSAN_SANITIZE			:= n
15
+KCSAN_SANITIZE			:= n
1416 OBJECT_FILES_NON_STANDARD	:= y
1517 
1618 # Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
....@@ -23,9 +25,14 @@
2325 
2426 # files to link into the vdso
2527 vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o
28
+vobjs32-y := vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o
29
+vobjs32-y += vdso32/vclock_gettime.o
2630 
2731 # files to link into kernel
2832 obj-y				+= vma.o
33
+KASAN_SANITIZE_vma.o		:= y
34
+UBSAN_SANITIZE_vma.o		:= y
35
+KCSAN_SANITIZE_vma.o		:= y
2936 OBJECT_FILES_NON_STANDARD_vma.o	:= n
3037 
3138 # vDSO images to build
....@@ -36,10 +43,12 @@
3643 obj-$(VDSO32-y)			+= vdso32-setup.o
3744 
3845 vobjs := $(foreach F,$(vobjs-y),$(obj)/$F)
46
+vobjs32 := $(foreach F,$(vobjs32-y),$(obj)/$F)
3947 
4048 $(obj)/vdso.o: $(obj)/vdso.so
4149 
4250 targets += vdso.lds $(vobjs-y)
51
+targets += vdso32/vdso32.lds $(vobjs32-y)
4352 
4453 # Build the vDSO image C files and link them in.
4554 vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o)
....@@ -58,7 +67,7 @@
5867 	$(call if_changed,vdso_and_check)
5968 
6069 HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi
61
-hostprogs-y			+= vdso2c
70
+hostprogs += vdso2c
6271 
6372 quiet_cmd_vdso2c = VDSO2C  $@
6473       cmd_vdso2c = $(obj)/vdso2c $< $(<:%.dbg=%) $@
....@@ -71,9 +80,9 @@
7180 # optimize sibling calls.
7281 #
7382 CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 \
74
-       $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector) \
83
+       $(filter -g%,$(KBUILD_CFLAGS)) -fno-stack-protector \
7584        -fno-omit-frame-pointer -foptimize-sibling-calls \
76
-       -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO $(DISABLE_LTO)
85
+       -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO
7786 
7887 ifdef CONFIG_RETPOLINE
7988 ifneq ($(RETPOLINE_VDSO_CFLAGS),)
....@@ -82,14 +91,14 @@
8291 endif
8392 
8493 $(vobjs): KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO) $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL)
94
+$(vobjs): KBUILD_AFLAGS += -DBUILD_VDSO
8595 
8696 #
8797 # vDSO code runs in userspace and -pg doesn't help with profiling anyway.
8898 #
89
-CFLAGS_REMOVE_vdso-note.o = -pg
9099 CFLAGS_REMOVE_vclock_gettime.o = -pg
100
+CFLAGS_REMOVE_vdso32/vclock_gettime.o = -pg
91101 CFLAGS_REMOVE_vgetcpu.o = -pg
92
-CFLAGS_REMOVE_vvar.o = -pg
93102 
94103 #
95104 # X32 processes use x32 vDSO to access 64bit kernel data.
....@@ -121,18 +130,14 @@
121130 targets += vdsox32.lds $(vobjx32s-y)
122131 
123132 $(obj)/%.so: OBJCOPYFLAGS := -S
124
-$(obj)/%.so: $(obj)/%.so.dbg
133
+$(obj)/%.so: $(obj)/%.so.dbg FORCE
125134 	$(call if_changed,objcopy)
126135 
127136 $(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE
128137 	$(call if_changed,vdso_and_check)
129138 
130
-CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
139
+CPPFLAGS_vdso32/vdso32.lds = $(CPPFLAGS_vdso.lds)
131140 VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -soname linux-gate.so.1
132
-
133
-targets += vdso32/vdso32.lds
134
-targets += vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o
135
-targets += vdso32/vclock_gettime.o
136141 
137142 KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS)) -DBUILD_VDSO
138143 $(obj)/vdso32.so.dbg: KBUILD_AFLAGS = $(KBUILD_AFLAGS_32)
....@@ -144,11 +149,9 @@
144149 KBUILD_CFLAGS_32 := $(filter-out -mfentry,$(KBUILD_CFLAGS_32))
145150 KBUILD_CFLAGS_32 := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS_32))
146151 KBUILD_CFLAGS_32 := $(filter-out $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS_32))
147
-KBUILD_CFLAGS_32 := $(filter-out $(LTO_CFLAGS),$(KBUILD_CFLAGS_32))
148
-KBUILD_CFLAGS_32 := $(filter-out $(CFI_CFLAGS),$(KBUILD_CFLAGS_32))
149152 KBUILD_CFLAGS_32 := $(filter-out $(CC_FLAGS_LTO),$(KBUILD_CFLAGS_32))
150153 KBUILD_CFLAGS_32 += -m32 -msoft-float -mregparm=0 -fpic
151
-KBUILD_CFLAGS_32 += $(call cc-option, -fno-stack-protector)
154
+KBUILD_CFLAGS_32 += -fno-stack-protector
152155 KBUILD_CFLAGS_32 += $(call cc-option, -foptimize-sibling-calls)
153156 KBUILD_CFLAGS_32 += -fno-omit-frame-pointer
154157 KBUILD_CFLAGS_32 += -DDISABLE_BRANCH_PROFILING
....@@ -161,12 +164,7 @@
161164 
162165 $(obj)/vdso32.so.dbg: KBUILD_CFLAGS = $(KBUILD_CFLAGS_32)
163166 
164
-$(obj)/vdso32.so.dbg: FORCE \
165
-		      $(obj)/vdso32/vdso32.lds \
166
-		      $(obj)/vdso32/vclock_gettime.o \
167
-		      $(obj)/vdso32/note.o \
168
-		      $(obj)/vdso32/system_call.o \
169
-		      $(obj)/vdso32/sigreturn.o
167
+$(obj)/vdso32.so.dbg: $(obj)/vdso32/vdso32.lds $(vobjs32) FORCE
170168 	$(call if_changed,vdso_and_check)
171169 
172170 #
....@@ -178,9 +176,8 @@
178176 		       -T $(filter %.lds,$^) $(filter %.o,$^) && \
179177 		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
180178 
181
-VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
182
-	$(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \
183
-	-Bsymbolic
179
+VDSO_LDFLAGS = -shared --hash-style=both --build-id=sha1 \
180
+	$(call ld-option, --eh-frame-hdr) -Bsymbolic -z noexecstack
184181 GCOV_PROFILE := n
185182 
186183 quiet_cmd_vdso_and_check = VDSO    $@