commit 8d9e12194d9e8ae86fc6dbe82ec6e7fc8fd1ef52
author Andrew Scull <ascull@google.com> Fri Apr 05 13:52:55 2019 +0100
committer Andrew Scull <ascull@google.com> Fri Apr 05 14:09:42 2019 +0100
tree cf93305245e769a6c125fae20fcdd252d94a89f0
parent 1262ac2cdd4d94522d4678c5cac910191f73e066

Introduce intermediate build target for std.

This gives a place for common functions to be defined.

Change-Id: Ifac38e647ab1042a00d224a58e28a0e6807fa60c

test/hftest/BUILD.gn

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",
   ]
 }

test/hftest/hftest_common.c

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"
 

test/hftest/hftest_service.c

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"
 

test/hftest/inc/hftest_impl.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