summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2012-09-07 17:39:04 -0400
committerFrans Kaashoek <[email protected]>2012-09-07 17:39:04 -0400
commitcf57e525c14eb2a5f3dd9a16fd78de61ed76a974 (patch)
tree8163bff2e8e75f06ae18073b6005e985e41b843b
parent2ae8392a5c203a7b1bc5b8bff5eabc8b5eab8972 (diff)
downloadxv6-labs-cf57e525c14eb2a5f3dd9a16fd78de61ed76a974.tar.gz
xv6-labs-cf57e525c14eb2a5f3dd9a16fd78de61ed76a974.tar.bz2
xv6-labs-cf57e525c14eb2a5f3dd9a16fd78de61ed76a974.zip
Remove -m32 flag from native gcc compiler
But check that mkfs.c is building with LP64
-rw-r--r--Makefile2
-rw-r--r--mkfs.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ffb085f..33bfb0a 100644
--- 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
index f015edd..b50b503 100644
--- 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;