Commit 37496845 authored by Madhavan Srinivasan's avatar Madhavan Srinivasan Committed by Michael Ellerman
Browse files

selftests/powerpc: Re-order *FLAGS to follow lib.mk 



In some powerpc/ sub-folder Makefiles, CFLAGS are defined before lib.mk
include. Clean it up by re-ordering the flags to follow after the mk
include. This is needed to support sub-folders in powerpc/ buildable on
its own.

Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240229093711.581230-1-maddy@linux.ibm.com
parent 29247de4

tools/testing/selftests/powerpc/benchmarks/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ TEST_GEN_FILES := exec_target 


TEST_FILES := settings



CFLAGS += -O2



top_srcdir = ../../../../..

include ../../lib.mk



CFLAGS += -O2



$(TEST_GEN_PROGS): ../harness.c



$(OUTPUT)/context_switch: ../utils.c

tools/testing/selftests/powerpc/copyloops/Makefile

+10 −10
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# The loops are all 64-bit code

CFLAGS += -m64

CFLAGS += -I$(CURDIR)

CFLAGS += -D SELFTEST

CFLAGS += -maltivec

CFLAGS += -mcpu=power4



# Use our CFLAGS for the implicit .S rule & set the asm machine type

ASFLAGS = $(CFLAGS) -Wa,-mpower4



TEST_GEN_PROGS := copyuser_64_t0 copyuser_64_t1 copyuser_64_t2 \

		copyuser_p7_t0 copyuser_p7_t1 \

		memcpy_64_t0 memcpy_64_t1 memcpy_64_t2 \
@@ -21,6 +11,16 @@ EXTRA_SOURCES := validate.c ../harness.c stubs.S 
top_srcdir = ../../../../..

include ../../lib.mk



# The loops are all 64-bit code

CFLAGS += -m64

CFLAGS += -I$(CURDIR)

CFLAGS += -D SELFTEST

CFLAGS += -maltivec

CFLAGS += -mcpu=power4



# Use our CFLAGS for the implicit .S rule & set the asm machine type

ASFLAGS = $(CFLAGS) -Wa,-mpower4



$(OUTPUT)/copyuser_64_t%:	copyuser_64.S $(EXTRA_SOURCES)

	$(CC) $(CPPFLAGS) $(CFLAGS) \

		-D COPY_LOOP=test___copy_tofrom_user_base \

tools/testing/selftests/powerpc/nx-gzip/Makefile

+2 −2
Original line number Diff line number Diff line 
CFLAGS = -O3 -m64 -I./include -I../include



TEST_GEN_FILES := gzfht_test gunz_test

TEST_PROGS := nx-gzip-test.sh



include ../../lib.mk



CFLAGS = -O3 -m64 -I./include -I../include



$(TEST_GEN_FILES): gzip_vas.c ../utils.c

tools/testing/selftests/powerpc/pmu/ebb/Makefile

+10 −10
Original line number Diff line number Diff line
@@ -4,16 +4,6 @@ include ../../../../../build/Build.include 
noarg:

	$(MAKE) -C ../../



# The EBB handler is 64-bit code and everything links against it

CFLAGS += -m64



TMPOUT = $(OUTPUT)/TMPDIR/

# Toolchains may build PIE by default which breaks the assembly

no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \

        $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie)



LDFLAGS += $(no-pie-option)



TEST_GEN_PROGS := reg_access_test event_attributes_test cycles_test	\

	 cycles_with_freeze_test pmc56_overflow_test		\

	 ebb_vs_cpu_event_test cpu_event_vs_ebb_test		\
@@ -29,6 +19,16 @@ TEST_GEN_PROGS := reg_access_test event_attributes_test cycles_test \ 
top_srcdir = ../../../../../..

include ../../../lib.mk



# The EBB handler is 64-bit code and everything links against it

CFLAGS += -m64



TMPOUT = $(OUTPUT)/TMPDIR/

# Toolchains may build PIE by default which breaks the assembly

no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \

        $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie)



LDFLAGS += $(no-pie-option)



$(TEST_GEN_PROGS): ../../harness.c ../../utils.c ../event.c ../lib.c \

	       ebb.c ebb_handler.S trace.c busy_loop.S

tools/testing/selftests/powerpc/pmu/event_code_tests/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

CFLAGS += -m64



TEST_GEN_PROGS := group_constraint_pmc56_test group_pmc56_exclude_constraints_test group_constraint_pmc_count_test \

	group_constraint_repeat_test group_constraint_radix_scope_qual_test reserved_bits_mmcra_sample_elig_mode_test \

	group_constraint_mmcra_sample_test invalid_event_code_test reserved_bits_mmcra_thresh_ctl_test \
@@ -12,4 +10,6 @@ TEST_GEN_PROGS := group_constraint_pmc56_test group_pmc56_exclude_constraints_te 
top_srcdir = ../../../../../..

include ../../../lib.mk



CFLAGS += -m64



$(TEST_GEN_PROGS): ../../harness.c ../../utils.c ../event.c ../lib.c ../sampling_tests/misc.h ../sampling_tests/misc.c