diff --git a/cc.c b/cc.c
index a49290b..53a1018 100644
--- a/cc.c
+++ b/cc.c
@@ -104,11 +104,37 @@ int main(int argc, char** argv)
 			arch = argv[i + 1];
 			if(match("knight-native", arch)) Architecture = KNIGHT_NATIVE;
 			else if(match("knight-posix", arch)) Architecture = KNIGHT_POSIX;
-			else if(match("x86", arch)) Architecture = X86;
-			else if(match("amd64", arch)) Architecture = AMD64;
-			else if(match("armv7l", arch)) Architecture = ARMV7L;
-			else if(match("aarch64", arch)) Architecture = AARCH64;
-			else if(match("riscv64", arch)) Architecture = RISCV64;
+			else if(match("x86", arch))
+			{
+				Architecture = X86;
+				init_macro_env("__i386__", "1", "--architecture", env);
+				env = env + 1;
+			}
+			else if(match("amd64", arch))
+			{
+				Architecture = AMD64;
+				init_macro_env("__x86_64__", "1", "--architecture", env);
+				env = env + 1;
+			}
+			else if(match("armv7l", arch))
+			{
+				Architecture = ARMV7L;
+				init_macro_env("__arm__", "1", "--architecture", env);
+				env = env + 1;
+			}
+			else if(match("aarch64", arch))
+			{
+				Architecture = AARCH64;
+				init_macro_env("__aarch64__", "1", "--architecture", env);
+				env = env + 1;
+			}
+			else if(match("riscv64", arch))
+			{
+				Architecture = RISCV64;
+				init_macro_env("__riscv", "1", "--architecture", env);
+				init_macro_env("__riscv_xlen", "64", "--architecture", env + 1);
+				env = env + 2;
+			}
 			else
 			{
 				fputs("Unknown architecture: ", stderr);
diff --git a/test/test.answers b/test/test.answers
index 857cf93..f2705f6 100644
--- a/test/test.answers
+++ b/test/test.answers
@@ -212,9 +212,9 @@ eb1f6aab09a1a4966f9f49a518d8aa03ca97aa7c46e443871d758a306671a85e  test/results/t
 a2cbfd5f76d3be8049c6737e3fa02f191caf29b6885db006fa23f86e6eacc186  test/results/test0106-knight-posix-binary
 d75e450e2fcdf19df63f9d6a3fe5e032933e57b33f6f06b39a8ed2f3dc759f17  test/results/test0106-riscv64-binary
 473cc504d6cba9eaf648abcf15c83a317ff3f4a7f08f5e8936e3b35b2cc4fbc6  test/results/test0106-x86-binary
-c45658bd9fce2b9ac426f8c6db89b2a959540db39eb650769bb996bf9f6259fc  test/results/test1000-aarch64-binary
-6cd43d4bab9d7edffcc72c19ab74906eca2735883368006cd87eda130d25f3dd  test/results/test1000-amd64-binary
-843c311f4bea408b6ab5d8821aefdb23b640af4595cfca095a247de33a8525f1  test/results/test1000-armv7l-binary
-d86d219122c3b2ee8ca0419170a4b32c17f608eee33fdc0ce313d31e2d18808b  test/results/test1000-knight-posix-binary
-5ed9826f6b52aaba9e04ab1c730eea76e0c4ee6cbb47a13ddd2d2bb4510c171d  test/results/test1000-riscv64-binary
-60d7e640f52e6763a8ab03c54eac05b55be57aa431f57b6313385815551a9c3c  test/results/test1000-x86-binary
+bf1d23078b04a88ad8eeb615a3208f76cf1c2bd4c7070452f887c569ad94b684  test/results/test1000-aarch64-binary
+aeb6d1cbb3616b8e6fc20b195dcc164cc77c835810c1a3c90504c3749f662385  test/results/test1000-amd64-binary
+bb88a105f120d8dc1d34de87114b371363801fbcf4341e510bcb5bcc08e76037  test/results/test1000-armv7l-binary
+85318559fd43f582cefbaf60e4300a59e9589745782b4a9083601152d231fcb6  test/results/test1000-knight-posix-binary
+de7107777e9008b8467c52c5fab7ca91580b4216cf0f6c6737ee538cfb0f2ab3  test/results/test1000-riscv64-binary
+bd66e02f6bfa34187d36116c147f32977c4e3bc34f46df66da4fe828984727e8  test/results/test1000-x86-binary
diff --git a/test/test1000/proof.answer b/test/test1000/proof.answer
index 55c64d1..be43fc5 100644
--- a/test/test1000/proof.answer
+++ b/test/test1000/proof.answer
@@ -1 +1 @@
-d5e949a19604b256bf3a0797a1cf1549f79790ba560db0cf8937795151645762  test/test1000/proof
+e018a50ea8e2547020473cfdc60066a41cd3793b9d7c164bba5ce7e80a06dd8b  test/test1000/proof