Preprocess assembly files with the C preprocessor.

kernel/Makefile

@@ -188,8 +188,8 @@ endif
 %.o: %.cpp
 	$(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS)
 
-%.o: %.s
-	$(HOSTAS) $< -o $@ $(ASFLAGS)
+%.o: %.S
+	$(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS)
 
 clean:
 	rm -f $(ALLOBJS) sortix.bin

kernel/x64/base.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/base.s
+    x64/base.S
     Bootstraps the kernel and passes over control from the boot-loader to the
     kernel main function.
 

kernel/x64/boot.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/boot.s
+    x64/boot.S
     Bootstraps the kernel and passes over control from the boot-loader to the
     kernel main function. It also jumps into long mode!
 

kernel/x64/calltrace.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/calltrace.s
+    x64/calltrace.S
     Attempts to unwind the stack and prints the code locations where functions
     were called. This greatly aids debugging.
 

kernel/x64/crti.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/crti.s
+    x64/crti.S
     Provides the header of the _init and _fini functions.
 
 *******************************************************************************/

kernel/x64/crtn.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/crtn.s
+    x64/crtn.S
     Provides the tail of the _init and _fini functions.
 
 *******************************************************************************/

kernel/x64/interrupt.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/interrupt.s
+    x64/interrupt.S
     Transfers control to interrupt handlers when interrupts happen.
 
 *******************************************************************************/

kernel/x64/kthread.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/kthread.s
+    x64/kthread.S
     Utilities and synchronization mechanisms for x64 kernel threads.
 
 *******************************************************************************/

kernel/x64/syscall.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/syscall.s
+    x64/syscall.S
     An assembly stub that acts as glue for system calls.
 
 *******************************************************************************/

kernel/x86/base.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/base.s
+    x86/base.S
     Bootstraps the kernel and passes over control from the boot-loader to the
     kernel main function.
 

kernel/x86/boot.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/boot.s
+    x86/boot.S
     Bootstraps the kernel and passes over control from the boot-loader to the
     kernel main function.
 

kernel/x86/calltrace.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/calltrace.s
+    x86/calltrace.S
     Attempts to unwind the stack and prints the code locations where functions
     were called. This greatly aids debugging.
 

kernel/x86/crti.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/crti.s
+    x86/crti.S
     Provides the header of the _init and _fini functions.
 
 *******************************************************************************/

kernel/x86/crtn.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/crtn.s
+    x86/crtn.S
     Provides the tail of the _init and _fini functions.
 
 *******************************************************************************/

kernel/x86/interrupt.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/interrupt.s
+    x86/interrupt.S
     Transfers control to interrupt handlers when interrupts happen.
 
 *******************************************************************************/

kernel/x86/kthread.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/kthread.s
+    x86/kthread.S
     Utilities and synchronization mechanisms for x86 kernel threads.
 
 *******************************************************************************/

kernel/x86/syscall.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/syscall.s
+    x86/syscall.S
     An assembly stub that acts as glue for system calls.
 
 *******************************************************************************/

libc/Makefile

@@ -575,8 +575,8 @@ headers:
 %.o: %.cpp
 	$(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(FLAGS) $(CXXFLAGS)
 
-%.o: %.s
-	$(HOSTAS) $(ASFLAGS) $< -o $@
+%.o: %.S
+	$(HOSTCXX) -c $< -o $@ $(CPPFLAGS) $(FLAGS) $(CFLAGS)
 
 # libc-sortix
 sortix/%.o: %.c

libc/x64/calltrace.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/calltrace.s
+    x64/calltrace.S
     Attempts to unwind the stack and prints the code locations where functions
     were called. This greatly aids debugging.
 

libc/x64/crt1.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/crt1.s
+    x64/crt1.S
     Implement the _start symbol at which execution begins which performs the
     task of initializing the standard library and executing the main function.
 

libc/x64/crti.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/crti.s
+    x64/crti.S
     Provides the header of the _init and _fini functions.
 
 *******************************************************************************/

libc/x64/crtn.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/crtn.s
+    x64/crtn.S
     Provides the tail of the _init and _fini functions.
 
 *******************************************************************************/

libc/x64/fork.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/fork.s
+    x64/fork.S
     Assembly functions related to forking x64 processes.
 
 *******************************************************************************/

libc/x64/setjmp.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/setjmp.s
+    x64/setjmp.S
     Implement the assembly part of setjmp.
 
 *******************************************************************************/

libc/x64/signal.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/signal.s
+    x64/signal.S
     An assembly stub that for handling unix signals.
 
 *******************************************************************************/

libc/x64/syscall.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x64/syscall.s
+    x64/syscall.S
     Function for performing system calls.
 
 *******************************************************************************/

libc/x86/calltrace.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/calltrace.s
+    x86/calltrace.S
     Attempts to unwind the stack and prints the code locations where functions
     were called. This greatly aids debugging.
 

libc/x86/crt1.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/crt1.s
+    x86/crt1.S
     Implement the _start symbol at which execution begins which performs the
     task of initializing the standard library and executing the main function.
 

libc/x86/crti.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/crti.s
+    x86/crti.S
     Provides the header of the _init and _fini functions.
 
 *******************************************************************************/

libc/x86/crtn.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/crtn.s
+    x86/crtn.S
     Provides the tail of the _init and _fini functions.
 
 *******************************************************************************/

libc/x86/fork.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/fork.s
+    x86/fork.S
     Assembly functions related to forking x86 processes.
 
 *******************************************************************************/

libc/x86/setjmp.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/setjmp.s
+    x86/setjmp.S
     Implement the assembly part of setjmp.
 
 *******************************************************************************/

libc/x86/signal.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/signal.s
+    x86/signal.S
     An assembly stub that for handling unix signals.
 
 *******************************************************************************/

libc/x86/syscall.S

@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    x86/syscall.s
+    x86/syscall.S
     Function for performing system calls.
 
 *******************************************************************************/