Introduce intermediate build target for std.
This gives a place for common functions to be defined.
Change-Id: Ifac38e647ab1042a00d224a58e28a0e6807fa60c
diff --git a/test/hftest/BUILD.gn b/test/hftest/BUILD.gn
index 787a77d..a18a252 100644
--- a/test/hftest/BUILD.gn
+++ b/test/hftest/BUILD.gn
@@ -45,8 +45,8 @@
"//src:dlog",
"//src:memiter",
"//src:panic",
+ "//src:std",
"//src/arch/${plat_arch}:entry",
- "//src/arch/${plat_arch}:std",
"//src/arch/${plat_arch}/hftest:entry",
"//src/arch/${plat_arch}/hftest:hf_call",
"//src/arch/${plat_arch}/hftest:power_mgmt",
@@ -112,6 +112,6 @@
deps = [
"//src:memiter",
"//src:panic",
- "//src/arch/${plat_arch}:std",
+ "//src:std",
]
}
diff --git a/test/hftest/hftest_common.c b/test/hftest/hftest_common.c
index 5a3b348..e1b4602 100644
--- a/test/hftest/hftest_common.c
+++ b/test/hftest/hftest_common.c
@@ -16,10 +16,10 @@
#include "hftest_common.h"
-#include "hf/arch/std.h"
#include "hf/arch/vm/power_mgmt.h"
#include "hf/memiter.h"
+#include "hf/std.h"
#include "hftest.h"
diff --git a/test/hftest/hftest_service.c b/test/hftest/hftest_service.c
index 743e087..b110cb5 100644
--- a/test/hftest/hftest_service.c
+++ b/test/hftest/hftest_service.c
@@ -17,10 +17,9 @@
#include <stdalign.h>
#include <stdint.h>
-#include "hf/arch/std.h"
-
#include "hf/memiter.h"
#include "hf/spci.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/hftest/inc/hftest_impl.h b/test/hftest/inc/hftest_impl.h
index 328f664..a86069c 100644
--- a/test/hftest/inc/hftest_impl.h
+++ b/test/hftest/inc/hftest_impl.h
@@ -18,9 +18,8 @@
#include <stdnoreturn.h>
-#include "hf/arch/std.h"
-
#include "hf/spci.h"
+#include "hf/std.h"
#define HFTEST_MAX_TESTS 50
diff --git a/test/vmapi/gicv3/busy_secondary.c b/test/vmapi/gicv3/busy_secondary.c
index f694031..1a3cf52 100644
--- a/test/vmapi/gicv3/busy_secondary.c
+++ b/test/vmapi/gicv3/busy_secondary.c
@@ -15,11 +15,11 @@
*/
#include "hf/arch/cpu.h"
-#include "hf/arch/std.h"
#include "hf/arch/vm/interrupts_gicv3.h"
#include "hf/dlog.h"
#include "hf/spci.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/gicv3/gicv3.c b/test/vmapi/gicv3/gicv3.c
index dc0a081..7e90790 100644
--- a/test/vmapi/gicv3/gicv3.c
+++ b/test/vmapi/gicv3/gicv3.c
@@ -17,11 +17,11 @@
#include "gicv3.h"
#include "hf/arch/cpu.h"
-#include "hf/arch/std.h"
#include "hf/arch/vm/interrupts_gicv3.h"
#include "hf/dlog.h"
#include "hf/mm.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/gicv3/interrupts.c b/test/vmapi/gicv3/interrupts.c
index b174010..1b8d532 100644
--- a/test/vmapi/gicv3/interrupts.c
+++ b/test/vmapi/gicv3/interrupts.c
@@ -15,10 +15,10 @@
*/
#include "hf/arch/cpu.h"
-#include "hf/arch/std.h"
#include "hf/arch/vm/interrupts_gicv3.h"
#include "hf/dlog.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/gicv3/services/timer.c b/test/vmapi/gicv3/services/timer.c
index 2daf2b9..871603d 100644
--- a/test/vmapi/gicv3/services/timer.c
+++ b/test/vmapi/gicv3/services/timer.c
@@ -17,11 +17,11 @@
#include "hf/arch/vm/timer.h"
#include "hf/arch/cpu.h"
-#include "hf/arch/std.h"
#include "hf/arch/vm/events.h"
#include "hf/arch/vm/interrupts_gicv3.h"
#include "hf/dlog.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/interrupts.c b/test/vmapi/primary_with_secondaries/interrupts.c
index eaee542..187304e 100644
--- a/test/vmapi/primary_with_secondaries/interrupts.c
+++ b/test/vmapi/primary_with_secondaries/interrupts.c
@@ -16,7 +16,7 @@
#include <stdint.h>
-#include "hf/arch/std.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/mailbox.c b/test/vmapi/primary_with_secondaries/mailbox.c
index 287767e..7a45dfa 100644
--- a/test/vmapi/primary_with_secondaries/mailbox.c
+++ b/test/vmapi/primary_with_secondaries/mailbox.c
@@ -16,9 +16,8 @@
#include <stdint.h>
-#include "hf/arch/std.h"
-
#include "hf/spci.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/memory_sharing.c b/test/vmapi/primary_with_secondaries/memory_sharing.c
index 8d8bb47..c74d6f3 100644
--- a/test/vmapi/primary_with_secondaries/memory_sharing.c
+++ b/test/vmapi/primary_with_secondaries/memory_sharing.c
@@ -16,9 +16,8 @@
#include <stdint.h>
-#include "hf/arch/std.h"
-
#include "hf/mm.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/no_services.c b/test/vmapi/primary_with_secondaries/no_services.c
index 39ed12f..b6e27be 100644
--- a/test/vmapi/primary_with_secondaries/no_services.c
+++ b/test/vmapi/primary_with_secondaries/no_services.c
@@ -17,10 +17,9 @@
#include <stdalign.h>
#include <stdint.h>
-#include "hf/arch/std.h"
-
#include "hf/assert.h"
#include "hf/mm.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/run_race.c b/test/vmapi/primary_with_secondaries/run_race.c
index efb33e8..c41387d 100644
--- a/test/vmapi/primary_with_secondaries/run_race.c
+++ b/test/vmapi/primary_with_secondaries/run_race.c
@@ -17,11 +17,11 @@
#include <stdalign.h>
#include <stdint.h>
-#include "hf/arch/std.h"
#include "hf/arch/vm/power_mgmt.h"
#include "hf/assert.h"
#include "hf/mm.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/services/abort.c b/test/vmapi/primary_with_secondaries/services/abort.c
index 9e6b14c..e37d7e9 100644
--- a/test/vmapi/primary_with_secondaries/services/abort.c
+++ b/test/vmapi/primary_with_secondaries/services/abort.c
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-#include "hf/arch/std.h"
-
#include "hf/mm.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/services/check_state.c b/test/vmapi/primary_with_secondaries/services/check_state.c
index e467f52..2379d9f 100644
--- a/test/vmapi/primary_with_secondaries/services/check_state.c
+++ b/test/vmapi/primary_with_secondaries/services/check_state.c
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#include "hf/arch/std.h"
#include "hf/arch/vm/state.h"
+#include "hf/std.h"
+
#include "vmapi/hf/call.h"
#include "hftest.h"
diff --git a/test/vmapi/primary_with_secondaries/services/echo.c b/test/vmapi/primary_with_secondaries/services/echo.c
index bc33a25..e72622c 100644
--- a/test/vmapi/primary_with_secondaries/services/echo.c
+++ b/test/vmapi/primary_with_secondaries/services/echo.c
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-#include "hf/arch/std.h"
-
#include "hf/spci.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/services/echo_with_notification.c b/test/vmapi/primary_with_secondaries/services/echo_with_notification.c
index 424e3ab..f278851 100644
--- a/test/vmapi/primary_with_secondaries/services/echo_with_notification.c
+++ b/test/vmapi/primary_with_secondaries/services/echo_with_notification.c
@@ -15,10 +15,10 @@
*/
#include "hf/arch/cpu.h"
-#include "hf/arch/std.h"
#include "hf/arch/vm/interrupts_gicv3.h"
#include "hf/spci.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/services/interruptible.c b/test/vmapi/primary_with_secondaries/services/interruptible.c
index 523eaca..2053088 100644
--- a/test/vmapi/primary_with_secondaries/services/interruptible.c
+++ b/test/vmapi/primary_with_secondaries/services/interruptible.c
@@ -15,10 +15,10 @@
*/
#include "hf/arch/cpu.h"
-#include "hf/arch/std.h"
#include "hf/arch/vm/interrupts_gicv3.h"
#include "hf/dlog.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
#include "vmapi/hf/spci.h"
diff --git a/test/vmapi/primary_with_secondaries/services/interruptible_echo.c b/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
index 036566c..5f79433 100644
--- a/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
+++ b/test/vmapi/primary_with_secondaries/services/interruptible_echo.c
@@ -15,10 +15,10 @@
*/
#include "hf/arch/cpu.h"
-#include "hf/arch/std.h"
#include "hf/arch/vm/interrupts_gicv3.h"
#include "hf/dlog.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/services/memory.c b/test/vmapi/primary_with_secondaries/services/memory.c
index babb911..5802429 100644
--- a/test/vmapi/primary_with_secondaries/services/memory.c
+++ b/test/vmapi/primary_with_secondaries/services/memory.c
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-#include "hf/arch/std.h"
-
#include "hf/mm.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/services/relay.c b/test/vmapi/primary_with_secondaries/services/relay.c
index 7ac7ade..30ce25e 100644
--- a/test/vmapi/primary_with_secondaries/services/relay.c
+++ b/test/vmapi/primary_with_secondaries/services/relay.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "hf/arch/std.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/services/spci_check.c b/test/vmapi/primary_with_secondaries/services/spci_check.c
index 2550a45..4f4ce6e 100644
--- a/test/vmapi/primary_with_secondaries/services/spci_check.c
+++ b/test/vmapi/primary_with_secondaries/services/spci_check.c
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-#include "hf/arch/std.h"
-
#include "hf/spci.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"
diff --git a/test/vmapi/primary_with_secondaries/spci.c b/test/vmapi/primary_with_secondaries/spci.c
index 5c7a5b4..1e0c8a1 100644
--- a/test/vmapi/primary_with_secondaries/spci.c
+++ b/test/vmapi/primary_with_secondaries/spci.c
@@ -18,7 +18,7 @@
#include <stdint.h>
-#include "hf/arch/std.h"
+#include "hf/std.h"
#include "vmapi/hf/call.h"