* [LTP] [PATCH 1/1] utils/compat_16.mk: Further cleanup of unused sections and variables
@ 2018-04-09 12:00 Petr Vorel
2018-04-10 5:35 ` xuyang.jy
0 siblings, 1 reply; 5+ messages in thread
From: Petr Vorel @ 2018-04-09 12:00 UTC (permalink / raw)
To: ltp
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
-%_16.o: %.c $(COMPAT_16_H)
Is this make dependency for recompiling when header changes? It doesn't
behave like that but maybe I'm missing something.
Kind regards,
Petr
---
testcases/kernel/syscalls/setuid/Makefile | 3 ---
testcases/kernel/syscalls/utils/compat_16.mk | 22 +---------------------
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/testcases/kernel/syscalls/setuid/Makefile b/testcases/kernel/syscalls/setuid/Makefile
index 6bd943aaf..056bb9e80 100644
--- a/testcases/kernel/syscalls/setuid/Makefile
+++ b/testcases/kernel/syscalls/setuid/Makefile
@@ -19,8 +19,5 @@ top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/testcases.mk
-#for compat_16.mk uses the compat_16_tst.h
-COMPAT_TST_16_H := 1
-
include $(abs_srcdir)/../utils/compat_16.mk
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/utils/compat_16.mk b/testcases/kernel/syscalls/utils/compat_16.mk
index 0565ddefa..3dee0c230 100644
--- a/testcases/kernel/syscalls/utils/compat_16.mk
+++ b/testcases/kernel/syscalls/utils/compat_16.mk
@@ -56,28 +56,8 @@ MAKE_TARGETS := $(notdir $(patsubst %.c,%,$(SRCS)))
MAKE_TARGETS_OBJS_WO_COMPAT_16 := $(addsuffix .o,$(MAKE_TARGETS))
MAKE_TARGETS += $(addsuffix _16,$(MAKE_TARGETS))
-# XXX (garrcoop): This code should be put in question as it cannot be applied
-# (no .h file, no TST_USE_NEWER64_SYSCALL def).
DEF_16 := TST_USE_COMPAT16_SYSCALL
-
-ifneq ($(COMPAT_TST_16_H),1)
-COMPAT_16_H := $(abs_srcdir)/../utils/compat_16.h
-else
-COMPAT_16_H := $(abs_srcdir)/../utils/compat_tst_16.h
-endif
-
-ifneq ($(wildcard $(COMPAT_16_H)),)
-HAS_COMPAT_16 := 1
-
-$(MAKE_TARGETS_OBJS_WO_COMPAT_16): $(COMPAT_16_H)
-.INTERMEDIATE: $(MAKE_TARGETS_OBJS_WO_COMPAT_16)
-
-else
-HAS_COMPAT_16 := 0
-endif
-
%_16: CPPFLAGS += -D$(DEF_16)=1
-# XXX (garrcoop): End section of code in question..
-%_16.o: %.c $(COMPAT_16_H)
+%_16.o: %.c
$(COMPILE.c) $(OUTPUT_OPTION) $<
--
2.16.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [LTP] [PATCH 1/1] utils/compat_16.mk: Further cleanup of unused sections and variables
2018-04-09 12:00 [LTP] [PATCH 1/1] utils/compat_16.mk: Further cleanup of unused sections and variables Petr Vorel
@ 2018-04-10 5:35 ` xuyang.jy
2018-04-10 6:19 ` Petr Vorel
0 siblings, 1 reply; 5+ messages in thread
From: xuyang.jy @ 2018-04-10 5:35 UTC (permalink / raw)
To: ltp
于 2018/4/9 20:00, Petr Vorel 写道:
> Signed-off-by: Petr Vorel<pvorel@suse.cz>
> ---
> -%_16.o: %.c $(COMPAT_16_H)
> Is this make dependency for recompiling when header changes? It doesn't
> behave like that but maybe I'm missing something.
Hi Petr
-%_16.o: %.c $(COMPAT_16_H)
This make dependency for recompiling _16.o when header changes.
$(MAKE_TARGETS_OBJS_WO_COMPAT_16): $(COMPAT_16_H)
.INTERMEDIATE: $(MAKE_TARGETS_OBJS_WO_COMPAT_16)
This make dependency for recompiling .o when header changes.
I think you may miss something.
This patch will reappear the problem that has been fixed since commit
631d16671d(syscalls/utils/compat_16.mk: fix build dependencies).
If we touch/modify the compat_tst_16.h/compat_16.h file and excute "make"
in any of syscalls directories which includes compat_16.mk, nothing will
happen.
Best Regards
Yang Xu
> Kind regards,
> Petr
> ---
> testcases/kernel/syscalls/setuid/Makefile | 3 ---
> testcases/kernel/syscalls/utils/compat_16.mk | 22 +---------------------
> 2 files changed, 1 insertion(+), 24 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/setuid/Makefile b/testcases/kernel/syscalls/setuid/Makefile
> index 6bd943aaf..056bb9e80 100644
> --- a/testcases/kernel/syscalls/setuid/Makefile
> +++ b/testcases/kernel/syscalls/setuid/Makefile
> @@ -19,8 +19,5 @@ top_srcdir ?= ../../../..
>
> include $(top_srcdir)/include/mk/testcases.mk
>
> -#for compat_16.mk uses the compat_16_tst.h
> -COMPAT_TST_16_H := 1
> -
> include $(abs_srcdir)/../utils/compat_16.mk
> include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/kernel/syscalls/utils/compat_16.mk b/testcases/kernel/syscalls/utils/compat_16.mk
> index 0565ddefa..3dee0c230 100644
> --- a/testcases/kernel/syscalls/utils/compat_16.mk
> +++ b/testcases/kernel/syscalls/utils/compat_16.mk
> @@ -56,28 +56,8 @@ MAKE_TARGETS := $(notdir $(patsubst %.c,%,$(SRCS)))
> MAKE_TARGETS_OBJS_WO_COMPAT_16 := $(addsuffix .o,$(MAKE_TARGETS))
> MAKE_TARGETS += $(addsuffix _16,$(MAKE_TARGETS))
>
> -# XXX (garrcoop): This code should be put in question as it cannot be applied
> -# (no .h file, no TST_USE_NEWER64_SYSCALL def).
> DEF_16 := TST_USE_COMPAT16_SYSCALL
> -
> -ifneq ($(COMPAT_TST_16_H),1)
> -COMPAT_16_H := $(abs_srcdir)/../utils/compat_16.h
> -else
> -COMPAT_16_H := $(abs_srcdir)/../utils/compat_tst_16.h
> -endif
> -
> -ifneq ($(wildcard $(COMPAT_16_H)),)
> -HAS_COMPAT_16 := 1
> -
> -$(MAKE_TARGETS_OBJS_WO_COMPAT_16): $(COMPAT_16_H)
> -.INTERMEDIATE: $(MAKE_TARGETS_OBJS_WO_COMPAT_16)
> -
> -else
> -HAS_COMPAT_16 := 0
> -endif
> -
> %_16: CPPFLAGS += -D$(DEF_16)=1
> -# XXX (garrcoop): End section of code in question..
>
> -%_16.o: %.c $(COMPAT_16_H)
> +%_16.o: %.c
> $(COMPILE.c) $(OUTPUT_OPTION) $<
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] [PATCH 1/1] utils/compat_16.mk: Further cleanup of unused sections and variables
2018-04-10 5:35 ` xuyang.jy
@ 2018-04-10 6:19 ` Petr Vorel
2018-04-10 6:46 ` xuyang.jy
0 siblings, 1 reply; 5+ messages in thread
From: Petr Vorel @ 2018-04-10 6:19 UTC (permalink / raw)
To: ltp
Hi Yang,
> Hi Petr
> -%_16.o: %.c $(COMPAT_16_H)
> This make dependency for recompiling _16.o when header changes.
> $(MAKE_TARGETS_OBJS_WO_COMPAT_16): $(COMPAT_16_H)
> .INTERMEDIATE: $(MAKE_TARGETS_OBJS_WO_COMPAT_16)
> This make dependency for recompiling .o when header changes.
> I think you may miss something.
> This patch will reappear the problem that has been fixed since commit
> 631d16671d(syscalls/utils/compat_16.mk: fix build dependencies).
> If we touch/modify the compat_tst_16.h/compat_16.h file and excute "make"
> in any of syscalls directories which includes compat_16.mk, nothing will
> happen.
Thank you for explaining and sorry for wrong patch.
Before I touch wrong file, that's why it didn't work the obvious way you described.
I still thing that HAS_COMPAT_16 variable is unused and not needed.
Kind regards,
Petr
> Best Regards
> Yang Xu
^ permalink raw reply [flat|nested] 5+ messages in thread
* [LTP] [PATCH 1/1] utils/compat_16.mk: Further cleanup of unused sections and variables
2018-04-10 6:19 ` Petr Vorel
@ 2018-04-10 6:46 ` xuyang.jy
2018-04-10 7:23 ` Petr Vorel
0 siblings, 1 reply; 5+ messages in thread
From: xuyang.jy @ 2018-04-10 6:46 UTC (permalink / raw)
To: ltp
on 2018/4/10 14:19, Petr Vorel write:
> Hi Yang,
>
>> Hi Petr
>> -%_16.o: %.c $(COMPAT_16_H)
>> This make dependency for recompiling _16.o when header changes.
>> $(MAKE_TARGETS_OBJS_WO_COMPAT_16): $(COMPAT_16_H)
>> .INTERMEDIATE: $(MAKE_TARGETS_OBJS_WO_COMPAT_16)
>> This make dependency for recompiling .o when header changes.
>> I think you may miss something.
>> This patch will reappear the problem that has been fixed since commit
>> 631d16671d(syscalls/utils/compat_16.mk: fix build dependencies).
>> If we touch/modify the compat_tst_16.h/compat_16.h file and excute "make"
>> in any of syscalls directories which includes compat_16.mk, nothing will
>> happen.
> Thank you for explaining and sorry for wrong patch.
> Before I touch wrong file, that's why it didn't work the obvious way you described.
>
> I still thing that HAS_COMPAT_16 variable is unused and not needed.
Hi petr
Agreed. The HAS_COMPAT_16 variable is unused .
>
> Kind regards,
> Petr
>
>> Best Regards
>> Yang Xu
>
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-04-10 7:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-09 12:00 [LTP] [PATCH 1/1] utils/compat_16.mk: Further cleanup of unused sections and variables Petr Vorel
2018-04-10 5:35 ` xuyang.jy
2018-04-10 6:19 ` Petr Vorel
2018-04-10 6:46 ` xuyang.jy
2018-04-10 7:23 ` Petr Vorel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox