First commit after replacing nasm with clang/GAS. Updated all Makefiles to use clang

anwarmamat · anwarmamat · commit 44d84916d89e · 2026-02-02T21:27:53.000-05:00
diff --git a/abscond/Makefile b/abscond/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/blackmail/Makefile b/blackmail/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/con/Makefile b/con/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/dodger/Makefile b/dodger/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/dupe/Makefile b/dupe/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/evildoer/Makefile b/evildoer/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/extort/Makefile b/extort/Makefile
@@ -1,11 +1,10 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
-
 objs = \
 	main.o \
 	print.o \
diff --git a/fraud/Makefile b/fraud/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/hoax/Makefile b/hoax/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/hustle/Makefile b/hustle/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/info.rkt b/info.rkt
@@ -3,8 +3,11 @@
 (define collection 'multi)
 (define deps (list "base" "rackunit" "redex-lib"
   "https://github.com/cmsc430/a86.git?path=#main"))
+;;(define build-deps
+;;  (list "https://github.com/cmsc430/a86.git?path=#main"))
+
 (define build-deps
-  (list "https://github.com/cmsc430/a86.git?path=#main"))
+  (list "https://github.com/cmsc430/a86.git?branch=nasm-change"))
 
 ;; Outlaw is omitted here because it depends on libraries that are a pain
 ;; to ensure are set up properly and we don't want students to see failing
diff --git a/iniquity/Makefile b/iniquity/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/jig/Makefile b/jig/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/knock/Makefile b/knock/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/loot/Makefile b/loot/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/mountebank/Makefile b/mountebank/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/mug/Makefile b/mug/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
diff --git a/neerdowell/Makefile b/neerdowell/Makefile
@@ -1,9 +1,9 @@
 ifeq ($(shell uname), Darwin)
-  LANGS_CC ?= arch -x86_64 gcc
-  LANGS_AS ?= nasm -g -f macho64 --gprefix _
+  LANGS_CC ?= arch -x86_64 clang
+  LANGS_AS ?= arch -x86_64 clang -c
 else
-  LANGS_CC ?= gcc
-  LANGS_AS ?= nasm -g -f elf64
+  LANGS_CC ?= clang
+  LANGS_AS ?= clang -c
 endif
 
 objs = \
