mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	perf build: Add arch x86 objects building
Move the x86 arch objects building under build framework to be included in the libperf build object. Adding also arch/$(ARCH)/Build files for the rest of the archs. The reason for this is that in arch/Build we now do: +libperf-y += $(ARCH)/ which would make the build to fail on other architectures, because the build framework requires 'Build' file in nested directories and this patch adds it only for x86. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Tested-by: Will Deacon <will.deacon@arm.com> Cc: Alexis Berlemont <alexis.berlemont@gmail.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-5enob06z07m7ew6nzzdmp3n2@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
		
							parent
							
								
									cb4e67fdee
								
							
						
					
					
						commit
						5e8c0fb6a9
					
				
					 11 changed files with 13 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -1 +1,2 @@
 | 
			
		|||
libperf-y += common.o
 | 
			
		||||
libperf-y += $(ARCH)/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										0
									
								
								tools/perf/arch/arm/Build
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								tools/perf/arch/arm/Build
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								tools/perf/arch/arm64/Build
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								tools/perf/arch/arm64/Build
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								tools/perf/arch/powerpc/Build
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								tools/perf/arch/powerpc/Build
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								tools/perf/arch/s390/Build
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								tools/perf/arch/s390/Build
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								tools/perf/arch/sh/Build
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								tools/perf/arch/sh/Build
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								tools/perf/arch/sparc/Build
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								tools/perf/arch/sparc/Build
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										2
									
								
								tools/perf/arch/x86/Build
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								tools/perf/arch/x86/Build
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
libperf-y += util/
 | 
			
		||||
libperf-$(CONFIG_DWARF_UNWIND) += tests/
 | 
			
		||||
| 
						 | 
				
			
			@ -1,19 +1,4 @@
 | 
			
		|||
ifndef NO_DWARF
 | 
			
		||||
PERF_HAVE_DWARF_REGS := 1
 | 
			
		||||
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
 | 
			
		||||
endif
 | 
			
		||||
ifndef NO_LIBUNWIND
 | 
			
		||||
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o
 | 
			
		||||
endif
 | 
			
		||||
ifndef NO_LIBDW_DWARF_UNWIND
 | 
			
		||||
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libdw.o
 | 
			
		||||
endif
 | 
			
		||||
ifndef NO_DWARF_UNWIND
 | 
			
		||||
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/regs_load.o
 | 
			
		||||
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/dwarf-unwind.o
 | 
			
		||||
endif
 | 
			
		||||
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o
 | 
			
		||||
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/tsc.o
 | 
			
		||||
LIB_H += arch/$(ARCH)/util/tsc.h
 | 
			
		||||
HAVE_KVM_STAT_SUPPORT := 1
 | 
			
		||||
LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/kvm-stat.o
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								tools/perf/arch/x86/tests/Build
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								tools/perf/arch/x86/tests/Build
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
libperf-y += regs_load.o
 | 
			
		||||
libperf-y += dwarf-unwind.o
 | 
			
		||||
							
								
								
									
										8
									
								
								tools/perf/arch/x86/util/Build
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								tools/perf/arch/x86/util/Build
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,8 @@
 | 
			
		|||
libperf-y += header.o
 | 
			
		||||
libperf-y += tsc.o
 | 
			
		||||
libperf-y += kvm-stat.o
 | 
			
		||||
 | 
			
		||||
libperf-$(CONFIG_DWARF) += dwarf-regs.o
 | 
			
		||||
 | 
			
		||||
libperf-$(CONFIG_LIBUNWIND)          += unwind-libunwind.o
 | 
			
		||||
libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
 | 
			
		||||
		Loading…
	
		Reference in a new issue