Snap for 5180536 from bebbbdf84b2d642b6564aa1d1f27b39200cbae8e to pi-platform-releasepie-gsi

am: 7a124c187d

Change-Id: I52d94ee9cb2c7130a35fef29fb61c97423596d21

2 files changed, 32 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 01e452a422b1..6cf8cf1129ff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -328,7 +328,6 @@ cc_test {
         "tools/testing/selftests/x86/single_step_syscall.c",
         "tools/testing/selftests/x86/syscall_nt.c",
         "tools/testing/selftests/x86/test_mremap_vdso.c",
-        "tools/testing/selftests/x86/check_initial_reg_state.c",
         "tools/testing/selftests/x86/ldt_gdt.c"
     ],
     arch: {
@@ -353,9 +352,37 @@ cc_test {
     },
     cflags: [
         "-O2",
-        "-std=gnu99",
         "-pthread",
     ],
+    c_std: "gnu99",
+    defaults: ["kselftest_defaults"],
+}
+
+cc_test {
+    name: "kselftest_x86_check_initial_reg_state",
+    stem: "check_initial_reg_state",
+    relative_install_path: "linux-kselftest/x86",
+    srcs: [
+        "tools/testing/selftests/x86/check_initial_reg_state.c",
+    ],
+    arch: {
+        arm: {
+            enabled: false,
+        },
+        arm64: {
+            enabled: false,
+        },
+    },
+    cflags: [
+        "-O2",
+        "-pthread",
+    ],
+    c_std: "gnu99",
+    // check_initial_reg_state is special: it needs a custom entry, and it needs to be static so
+    // that its interpreter doesn't destroy its initial state.
+    ldflags: ["-Wl,-ereal_start"],
+    static_executable: true,
+    test_per_src: false,
     defaults: ["kselftest_defaults"],
 }
 
@@ -369,9 +396,9 @@ cc_test {
     ],
     cflags: [
         "-O2",
-        "-std=gnu99",
         "-pthread",
     ],
+    c_std: "gnu99",
     test_per_src: false,
     defaults: ["kselftest_defaults"],
     enabled: false,
@@ -392,9 +419,9 @@ cc_test {
     ],
     cflags: [
         "-O2",
-        "-std=gnu99",
         "-pthread",
     ],
+    c_std: "gnu99",
     test_per_src: false,
     defaults: ["kselftest_defaults"],
     enabled: false,
diff --git a/android/kselftest_test_list.mk b/android/kselftest_test_list.mk
index 9f1ec1a68e34..aa917a834253 100644
--- a/android/kselftest_test_list.mk
+++ b/android/kselftest_test_list.mk
@@ -53,7 +53,7 @@ kselftest_modules += \
   kselftest_vm_tests_on-fault-limit \
   kselftest_vm64_tests_virtual_address_range \
   kselftest_x86_ptrace_syscall \
-  kselftest_x86_tests_check_initial_reg_state \
+  kselftest_x86_check_initial_reg_state \
   kselftest_x86_tests_ldt_gdt \
   kselftest_x86_tests_single_step_syscall \
   kselftest_x86_tests_syscall_arg_fault \