From 31f9ef8f90c202a123f09e2c72193d196ff691d5 Mon Sep 17 00:00:00 2001 From: Alexander Kartashov Date: Tue, 22 Jan 2013 22:52:00 +0400 Subject: [PATCH] zdtm: moved lib/atomic.h to lib/arch/x86/include/asm/atomic.h The file lib/atomic.h is the only machine-dependent file in the test suite that breaks compilation of the test static/session01 on ARM. The file is moved into a separate directory and the build system is modified accordingly to prevent this. Signed-off-by: Alexander Kartashov Signed-off-by: Pavel Emelyanov --- test/zdtm/lib/{ => arch/x86/include/asm}/atomic.h | 0 test/zdtm/lib/lock.h | 2 +- test/zdtm/live/static/Makefile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename test/zdtm/lib/{ => arch/x86/include/asm}/atomic.h (100%) diff --git a/test/zdtm/lib/atomic.h b/test/zdtm/lib/arch/x86/include/asm/atomic.h similarity index 100% rename from test/zdtm/lib/atomic.h rename to test/zdtm/lib/arch/x86/include/asm/atomic.h diff --git a/test/zdtm/lib/lock.h b/test/zdtm/lib/lock.h index 20d7cbd08..9abd01ab6 100644 --- a/test/zdtm/lib/lock.h +++ b/test/zdtm/lib/lock.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include "asm/atomic.h" #define BUG_ON(condition) \ do { \ diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile index b2d33666e..194930b7e 100644 --- a/test/zdtm/live/static/Makefile +++ b/test/zdtm/live/static/Makefile @@ -1,6 +1,6 @@ LIBDIR = ../../lib LIB = $(LIBDIR)/libzdtmtst.a -override CPPFLAGS += -I$(LIBDIR) +override CPPFLAGS += -I$(LIBDIR) -iquote $(LIBDIR)/arch/$(ARCH)/include CFLAGS = -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 TST_NOFILE = \