From 88db1a725a2aad0cdb525830f357d98a0645682e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?=
 =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= <ciro.santilli@gmail.com>
Date: Wed, 8 May 2019 00:00:06 +0000
Subject: [PATCH] userland assembly: build empty.S and fail.S to toplevel and
 run fail.S with path_properties exit_status

They were just duplicating stuff needlessly while we don't support non-native in-tree builds,
which leads to executable conflicts for C file anyways.
---
 path_properties.py            | 3 +--
 userland/arch/aarch64/empty.S | 1 -
 userland/arch/aarch64/fail.S  | 1 -
 userland/arch/arm/empty.S     | 1 -
 userland/arch/arm/fail.S      | 1 -
 userland/arch/fail.S          | 3 ---
 userland/arch/x86_64/empty.S  | 1 -
 userland/arch/x86_64/fail.S   | 1 -
 8 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 120000 userland/arch/aarch64/empty.S
 delete mode 120000 userland/arch/aarch64/fail.S
 delete mode 120000 userland/arch/arm/empty.S
 delete mode 120000 userland/arch/arm/fail.S
 delete mode 120000 userland/arch/x86_64/empty.S
 delete mode 120000 userland/arch/x86_64/fail.S

diff --git a/path_properties.py b/path_properties.py
index 3b626a9..5adcc66 100644
--- a/path_properties.py
+++ b/path_properties.py
@@ -320,8 +320,7 @@ path_properties_tuples = (
                                 'freestanding': freestanding_properties,
                             }
                         ),
-                        'empty.S': {'no_build': True},
-                        'fail.S': {'no_build': True},
+                        'fail.S': {'exit_status': 1},
                         'main.c': {
                             'extra_objs_userland_asm': False,
                             'no_executable': True
diff --git a/userland/arch/aarch64/empty.S b/userland/arch/aarch64/empty.S
deleted file mode 120000
index 6bdf9f9..0000000
--- a/userland/arch/aarch64/empty.S
+++ /dev/null
@@ -1 +0,0 @@
-../empty.S
\ No newline at end of file
diff --git a/userland/arch/aarch64/fail.S b/userland/arch/aarch64/fail.S
deleted file mode 120000
index d5427d8..0000000
--- a/userland/arch/aarch64/fail.S
+++ /dev/null
@@ -1 +0,0 @@
-../fail.S
\ No newline at end of file
diff --git a/userland/arch/arm/empty.S b/userland/arch/arm/empty.S
deleted file mode 120000
index 6bdf9f9..0000000
--- a/userland/arch/arm/empty.S
+++ /dev/null
@@ -1 +0,0 @@
-../empty.S
\ No newline at end of file
diff --git a/userland/arch/arm/fail.S b/userland/arch/arm/fail.S
deleted file mode 120000
index d5427d8..0000000
--- a/userland/arch/arm/fail.S
+++ /dev/null
@@ -1 +0,0 @@
-../fail.S
\ No newline at end of file
diff --git a/userland/arch/fail.S b/userland/arch/fail.S
index 34afa65..b9d8a01 100644
--- a/userland/arch/fail.S
+++ b/userland/arch/fail.S
@@ -5,8 +5,5 @@
 #include "common.h"
 
 ENTRY
-#if 0
-    /* Uncomment this to see it fail. */
     FAIL
-#endif
 EXIT
diff --git a/userland/arch/x86_64/empty.S b/userland/arch/x86_64/empty.S
deleted file mode 120000
index 6bdf9f9..0000000
--- a/userland/arch/x86_64/empty.S
+++ /dev/null
@@ -1 +0,0 @@
-../empty.S
\ No newline at end of file
diff --git a/userland/arch/x86_64/fail.S b/userland/arch/x86_64/fail.S
deleted file mode 120000
index d5427d8..0000000
--- a/userland/arch/x86_64/fail.S
+++ /dev/null
@@ -1 +0,0 @@
-../fail.S
\ No newline at end of file