From: Jan Kiszka <[email protected]>

These rules require unconditional evaluation to ensure rebuilds when
only variables change. Adding this reveals that we missing 32-bit
objects in targets so far.

Signed-off-by: Jan Kiszka <[email protected]>
---

Changes in v2:
 - fix targets

 inmates/lib/x86/Makefile   | 6 +++---
 inmates/tests/x86/Makefile | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inmates/lib/x86/Makefile b/inmates/lib/x86/Makefile
index 527436ef..eda484fe 100644
--- a/inmates/lib/x86/Makefile
+++ b/inmates/lib/x86/Makefile
@@ -56,16 +56,16 @@ cmd_link_archive32 = rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS) 
$@ $^
 $(obj)/lib32.a: $(addprefix $(obj)/,$(lib32-y))
        $(call if_changed,link_archive32)

-targets += header-32.o
+targets += $(lib32-y)

 # Code of this object is called before SSE/AVX extensions are available. Ensure
 # that the compiler won't generate unsupported instructions for this file.
 CFLAGS_cpu-features.o += -mno-sse

 $(obj)/%-32.o: c_flags += -m32
-$(obj)/%-32.o: $(src)/%.c
+$(obj)/%-32.o: $(src)/%.c FORCE
        $(call if_changed_rule,cc_o_c)

 $(obj)/%-32.o: a_flags += -m32
-$(obj)/%-32.o: $(src)/%.S
+$(obj)/%-32.o: $(src)/%.S FORCE
        $(call if_changed_rule,as_o_S)
diff --git a/inmates/tests/x86/Makefile b/inmates/tests/x86/Makefile
index 51c63917..6c8dc0e7 100644
--- a/inmates/tests/x86/Makefile
+++ b/inmates/tests/x86/Makefile
@@ -24,7 +24,7 @@ sse-demo-y := sse-demo.o
 $(eval $(call DECLARE_32_BIT,sse-demo-32))
 sse-demo-32-y := sse-demo-32.o

-$(obj)/sse-demo-32.o: $(src)/sse-demo.c
+$(obj)/sse-demo-32.o: $(src)/sse-demo.c FORCE
        $(call if_changed_rule,cc_o_c)

 $(eval $(call DECLARE_TARGETS,$(INMATES)))
--
2.16.4

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/jailhouse-dev/f5cca3e7-99ae-5f73-606c-270b29bb14e0%40web.de.
For more options, visit https://groups.google.com/d/optout.

Reply via email to