35 files changed, 51 insertions, 18 deletions
diff --git a/src/CommandLine/cppdrv.cc b/src/CommandLine/cppdrv.cpp
index 6977923..6977923 100644
--- a/src/CommandLine/cppdrv.cc
+++ b/src/CommandLine/cppdrv.cpp
diff --git a/src/CommandLine/cppdrv.json b/src/CommandLine/cppdrv.json
index 3fa222e..7c8cbe2 100644
--- a/src/CommandLine/cppdrv.json
+++ b/src/CommandLine/cppdrv.json
@@ -2,7 +2,7 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": ["../../include/CompilerKit", "../../include/", "../../include/CompilerKit/src/Detail"],
-  "sources_path": ["cppdrv.cc"],
+  "sources_path": ["cppdrv.cpp"],
   "output_name": "cppdrv",
   "compiler_flags": ["-L/usr/local/lib", "-lCompilerKit"],
   "cpp_macros": [
diff --git a/src/CommandLine/dbg.cc b/src/CommandLine/dbg.cpp
index 5b08a69..5b08a69 100644
--- a/src/CommandLine/dbg.cc
+++ b/src/CommandLine/dbg.cpp
diff --git a/src/CommandLine/dbg.json b/src/CommandLine/dbg.json
index 16fe3e2..ecc63e8 100644
--- a/src/CommandLine/dbg.json
+++ b/src/CommandLine/dbg.json
@@ -2,7 +2,7 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": ["../../include/CompilerKit", "../../include", "../../include/CompilerKit/src/Detail"],
-  "sources_path": ["dbg.cc"],
+  "sources_path": ["dbg.cpp"],
   "output_name": "dbg",
   "compiler_flags": ["-L/usr/lib", "-lDebuggerKit"],
   "cpp_macros": [
diff --git a/src/CommandLine/kdbg.cc b/src/CommandLine/kdbg.cpp
index 148efb3..148efb3 100644
--- a/src/CommandLine/kdbg.cc
+++ b/src/CommandLine/kdbg.cpp
diff --git a/src/CommandLine/kdbg.json b/src/CommandLine/kdbg.json
index 8c36932..6099f04 100644
--- a/src/CommandLine/kdbg.json
+++ b/src/CommandLine/kdbg.json
@@ -2,7 +2,7 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": ["../../include/CompilerKit", "../../include/", "../../include/CompilerKit/src/Detail"],
-  "sources_path": ["kdbg.cc"],
+  "sources_path": ["kdbg.cpp"],
   "output_name": "kdbg",
   "compiler_flags": ["-L/usr/lib", "-lDebuggerKit"],
   "cpp_macros": [
diff --git a/src/CommandLine/ld64-osx.json b/src/CommandLine/ld64-osx.json
index 1a78748..ddd233b 100644
--- a/src/CommandLine/ld64-osx.json
+++ b/src/CommandLine/ld64-osx.json
@@ -2,7 +2,7 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": ["../../include/CompilerKit", "../../include/", "../../include/CompilerKit/src/Detail"],
-  "sources_path": ["ld64.cc"],
+  "sources_path": ["ld64.cpp"],
   "output_name": "ld64",
   "compiler_flags": ["-L/usr/local/lib", "-lCompilerKit"],
   "cpp_macros": [
diff --git a/src/CommandLine/ld64-posix.json b/src/CommandLine/ld64-posix.json
index d2e626b..0847b41 100644
--- a/src/CommandLine/ld64-posix.json
+++ b/src/CommandLine/ld64-posix.json
@@ -2,7 +2,7 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": ["../../include/CompilerKit", "../../include/", "../../include/CompilerKit/src/Detail"],
-  "sources_path": ["ld64.cc"],
+  "sources_path": ["ld64.cpp"],
   "output_name": "ld64",
   "compiler_flags": ["-L/usr/lib", "-lCompilerKit"],
   "cpp_macros": [
diff --git a/src/CommandLine/ld64.cc b/src/CommandLine/ld64.cpp
index 6d8a247..6d8a247 100644
--- a/src/CommandLine/ld64.cc
+++ b/src/CommandLine/ld64.cpp
diff --git a/src/CommandLine/mld64-osx.json b/src/CommandLine/mld64-osx.json
index 78b7d3a..57f08f0 100644
--- a/src/CommandLine/mld64-osx.json
+++ b/src/CommandLine/mld64-osx.json
@@ -2,7 +2,7 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": ["../../include/CompilerKit", "../../include/", "../../include/CompilerKit/src/Detail"],
-  "sources_path": ["mld64.cc"],
+  "sources_path": ["mld64.cpp"],
   "output_name": "mld64",
   "compiler_flags": ["-L/usr/local/lib", "-lCompilerKit"],
   "cpp_macros": [
diff --git a/src/CommandLine/mld64-posix.json b/src/CommandLine/mld64-posix.json
index 0b8deab..e408cec 100644
--- a/src/CommandLine/mld64-posix.json
+++ b/src/CommandLine/mld64-posix.json
@@ -2,7 +2,7 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": ["../../include/CompilerKit", "../../include/", "../../include/CompilerKit/src/Detail"],
-  "sources_path": ["mld64.cc"],
+  "sources_path": ["mld64.cpp"],
   "output_name": "mld64",
   "compiler_flags": ["-L/usr/lib", "-lCompilerKit"],
   "cpp_macros": [
diff --git a/src/CommandLine/mld64.cc b/src/CommandLine/mld64.cpp
index f19712b..f19712b 100644
--- a/src/CommandLine/mld64.cc
+++ b/src/CommandLine/mld64.cpp
diff --git a/src/CommandLine/pef-amd64-asm.cc b/src/CommandLine/pef-amd64-asm.cpp
index 3ca4639..3ca4639 100644
--- a/src/CommandLine/pef-amd64-asm.cc
+++ b/src/CommandLine/pef-amd64-asm.cpp
diff --git a/src/CommandLine/pef-amd64-asm.json b/src/CommandLine/pef-amd64-asm.json
index 060fbf3..a1b1e1f 100644
--- a/src/CommandLine/pef-amd64-asm.json
+++ b/src/CommandLine/pef-amd64-asm.json
@@ -2,11 +2,12 @@
   "compiler_path": "g++",
   "compiler_std": "c++20",
   "headers_path": ["../../include/CompilerKit", "../../include", "../../include/CompilerKit/src/Detail"],
-  "sources_path": ["pef-amd64-asm.cc"],
+  "sources_path": ["pef-amd64-asm.cpp"],
   "output_name": "pef-amd64-asm",
   "compiler_flags": ["-L/usr/lib"],
   "cpp_macros": [
     "__DRV_ASM__=202601",
+    "CK_POSIX",
     "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
   ]
 }
diff --git a/src/CommandLine/pef-amd64-necdrv.cc b/src/CommandLine/pef-amd64-drv.cpp
index c8d8dbe..c8d8dbe 100644
--- a/src/CommandLine/pef-amd64-necdrv.cc
+++ b/src/CommandLine/pef-amd64-drv.cpp
diff --git a/src/CommandLine/pef-amd64-necdrv.json b/src/CommandLine/pef-amd64-drv.json
index ea2209d..69609ff 100644
--- a/src/CommandLine/pef-amd64-necdrv.json
+++ b/src/CommandLine/pef-amd64-drv.json
@@ -7,13 +7,14 @@
     "../include/CompilerKit/src/Detail"
   ],
   "sources_path": [
-    "pef-amd64-necdrv.cc"
+    "pef-amd64-drv.cpp"
   ],
   "output_name": "pef-amd64-necdrv",
   "compiler_flags": [
   ],
   "cpp_macros": [
     "__NECDRV__=202504",
+    "CK_POSIX",
     "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
   ]
 }
diff --git a/src/CompilerKit/ck-osx-san.json b/src/CompilerKit/ck-osx-san.json
index e133ebf..5fe2ee6 100644
--- a/src/CompilerKit/ck-osx-san.json
+++ b/src/CompilerKit/ck-osx-san.json
@@ -9,10 +9,10 @@
     "/opt/homebrew/Cellar/boost/1.90.0/include"
   ],
   "sources_path": [
-    "src/*.cc",
-    "src/*/*.cc"
+    "src/*.cpp",
+    "src/*/*.cpp"
   ],
-  "output_name": "/usr/local/lib/libCompilerKit.dylib",
+  "output_name": "/usr/local/lib/libCompilerKit.san.dylib",
   "compiler_flags": [
     "-fPIC",
     "-shared",
diff --git a/src/CompilerKit/ck-osx.json b/src/CompilerKit/ck-osx.json
index a4f711d..3aabdcd 100644
--- a/src/CompilerKit/ck-osx.json
+++ b/src/CompilerKit/ck-osx.json
@@ -9,8 +9,8 @@
     "/opt/homebrew/Cellar/boost/1.90.0/include"
   ],
   "sources_path": [
-    "src/*.cc",
-    "src/*/*.cc"
+    "src/*.cpp",
+    "src/*/*.cpp"
   ],
   "output_name": "/usr/local/lib/libCompilerKit.dylib",
   "compiler_flags": [
diff --git a/src/CompilerKit/ck-posix-san.json b/src/CompilerKit/ck-posix-san.json
new file mode 100644
index 0000000..b974fb9
--- /dev/null
+++ b/src/CompilerKit/ck-posix-san.json
@@ -0,0 +1,31 @@
+{
+  "compiler_path": "clang++",
+  "compiler_std": "c++20",
+  "headers_path": [
+    "../../include/CompilerKit",
+    "../../include/",
+    "../../include/CompilerKit/src/",
+    "../../include/CompilerKit/src/impl",
+    "/opt/homebrew/Cellar/boost/1.90.0/include"
+  ],
+  "sources_path": [
+    "src/*.cpp",
+    "src/*/*.cpp"
+  ],
+  "output_name": "/usr/lib/libCompilerKit.san.so",
+  "compiler_flags": [
+    "-fPIC",
+    "-shared",
+    "-fstack-protector-all",
+    "-fno-omit-frame-pointer",
+    "-g",
+    "-fsanitize=address",
+    "-fsanitize=undefined"
+  ],
+  "cpp_macros": [
+    "__NECTAR__=202505",
+    "CK_USE_STRUCTS=1",
+    "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
+  ],
+  "description": "CompilerKit for OSX, with Asan/Ubsan. CK is the framework behind Nectar."
+}
diff --git a/src/CompilerKit/ck-posix.json b/src/CompilerKit/ck-posix.json
index 9694662..553b22b 100644
--- a/src/CompilerKit/ck-posix.json
+++ b/src/CompilerKit/ck-posix.json
@@ -8,8 +8,8 @@
     "../../include/CompilerKit/src/impl"
   ],
   "sources_path": [
-    "src/*.cc",
-    "src/*/*.cc"
+    "src/*.cpp",
+    "src/*/*.cpp"
   ],
   "output_name": "/usr/lib/libCompilerKit.so",
   "compiler_flags": [
diff --git a/src/CompilerKit/src/Assemblers/Assembler+32x0.cc b/src/CompilerKit/src/Assemblers/Assembler+32x0.cpp
index 787c685..787c685 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+32x0.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+32x0.cpp
diff --git a/src/CompilerKit/src/Assemblers/Assembler+64x0.cc b/src/CompilerKit/src/Assemblers/Assembler+64x0.cpp
index bbb8447..bbb8447 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+64x0.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+64x0.cpp
diff --git a/src/CompilerKit/src/Assemblers/Assembler+AMD64.cc b/src/CompilerKit/src/Assemblers/Assembler+AMD64.cpp
index fcd8c3e..fcd8c3e 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+AMD64.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+AMD64.cpp
diff --git a/src/CompilerKit/src/Assemblers/Assembler+ARM64.cc b/src/CompilerKit/src/Assemblers/Assembler+ARM64.cpp
index bf567b7..bf567b7 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+ARM64.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+ARM64.cpp
diff --git a/src/CompilerKit/src/Assemblers/Assembler+PowerPC.cc b/src/CompilerKit/src/Assemblers/Assembler+PowerPC.cpp
index 05ca0d7..05ca0d7 100644
--- a/src/CompilerKit/src/Assemblers/Assembler+PowerPC.cc
+++ b/src/CompilerKit/src/Assemblers/Assembler+PowerPC.cpp
diff --git a/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cc b/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp
index 9a54142..9a54142 100644
--- a/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cc
+++ b/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp
diff --git a/src/CompilerKit/src/Compilers/NectarCompiler+AMD64.cc b/src/CompilerKit/src/Compilers/NectarCompiler+AMD64.cpp
index 5b246f2..5b246f2 100644
--- a/src/CompilerKit/src/Compilers/NectarCompiler+AMD64.cc
+++ b/src/CompilerKit/src/Compilers/NectarCompiler+AMD64.cpp
diff --git a/src/CompilerKit/src/Linkers/DynamicLinker64+MachO.cc b/src/CompilerKit/src/Linkers/DynamicLinker64+MachO.cpp
index dcbd7e7..dcbd7e7 100644
--- a/src/CompilerKit/src/Linkers/DynamicLinker64+MachO.cc
+++ b/src/CompilerKit/src/Linkers/DynamicLinker64+MachO.cpp
diff --git a/src/CompilerKit/src/Linkers/DynamicLinker64+PEF.cc b/src/CompilerKit/src/Linkers/DynamicLinker64+PEF.cpp
index 6be6c58..6be6c58 100644
--- a/src/CompilerKit/src/Linkers/DynamicLinker64+PEF.cc
+++ b/src/CompilerKit/src/Linkers/DynamicLinker64+PEF.cpp
diff --git a/src/CompilerKit/src/Preprocessors/Preprocessor+Generic.cc b/src/CompilerKit/src/Preprocessors/Preprocessor+Generic.cpp
index c2c17a8..c2c17a8 100644
--- a/src/CompilerKit/src/Preprocessors/Preprocessor+Generic.cc
+++ b/src/CompilerKit/src/Preprocessors/Preprocessor+Generic.cpp
diff --git a/src/DebuggerKit/dk-nekernel.json b/src/DebuggerKit/dk-nekernel.json
index ca09081..4ada191 100644
--- a/src/DebuggerKit/dk-nekernel.json
+++ b/src/DebuggerKit/dk-nekernel.json
@@ -5,7 +5,7 @@
     "../../include/DebuggerKit",
     "../../include"
   ],
-  "sources_path": ["src/*.cc"],
+  "sources_path": ["src/*.cpp"],
   "output_name": "/usr/local/lib/libDebuggerKit.dylib",
   "compiler_flags": ["-fPIC", "-shared"],
   "cpp_macros": [
diff --git a/src/DebuggerKit/dk-osx.json b/src/DebuggerKit/dk-osx.json
index 6f619b7..f97f758 100644
--- a/src/DebuggerKit/dk-osx.json
+++ b/src/DebuggerKit/dk-osx.json
@@ -5,7 +5,7 @@
     "../../include/DebuggerKit",
     "../../include"
   ],
-  "sources_path": ["src/*.cc"],
+  "sources_path": ["src/*.cpp"],
   "output_name": "/usr/local/lib/libDebuggerKit.dylib",
   "compiler_flags": ["-fPIC", "-shared"],
   "cpp_macros": [
diff --git a/src/DebuggerKit/src/NeKernelContract.cc b/src/DebuggerKit/src/NeKernelContract.cpp
index f39ba0d..f39ba0d 100644
--- a/src/DebuggerKit/src/NeKernelContract.cc
+++ b/src/DebuggerKit/src/NeKernelContract.cpp
diff --git a/src/DebuggerKit/src/NeKernelContractCLI.cc b/src/DebuggerKit/src/NeKernelContractCLI.cpp
index e1b6a27..e1b6a27 100644
--- a/src/DebuggerKit/src/NeKernelContractCLI.cc
+++ b/src/DebuggerKit/src/NeKernelContractCLI.cpp
diff --git a/src/DebuggerKit/src/POSIXMachContractCLI.cc b/src/DebuggerKit/src/POSIXMachContractCLI.cpp
index dd1411c..dd1411c 100644
--- a/src/DebuggerKit/src/POSIXMachContractCLI.cc
+++ b/src/DebuggerKit/src/POSIXMachContractCLI.cpp