xv6

commit cf57e525c14eb2a5f3dd9a16fd78de61ed76a974
parent 2ae8392a5c203a7b1bc5b8bff5eabc8b5eab8972
Author: Frans Kaashoek <kaashoek@mit.edu>
Date:   Fri,  7 Sep 2012 17:39:04 -0400

Remove -m32 flag from native gcc compiler
But check that mkfs.c is building with LP64

Diffstat:
M
Makefile
 | 
2
+-
M
mkfs.c
 | 
4
++++

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
@@ -146,7 +146,7 @@ _forktest: forktest.o $(ULIB)
 	$(OBJDUMP) -S _forktest > forktest.asm
 
 mkfs: mkfs.c fs.h
-	gcc -m32 -Werror -Wall -o mkfs mkfs.c
+	gcc -Werror -Wall -o mkfs mkfs.c
 
 UPROGS=\
 	_cat\
diff --git a/mkfs.c b/mkfs.c
@@ -11,6 +11,10 @@
 #include "stat.h"
 #include "param.h"
 
+#ifndef _LP64
+#error "Integers are not 32 bits"
+#endif
+
 int nblocks = 985;
 int nlog = LOGSIZE;
 int ninodes = 200;