Remove -m32 flag from native gcc compiler

But check that mkfs.c is building with LP64

diff --git a/Makefile b/Makefile
index ffb085f7135fcd46bbaabc409870fc31ed477d91..33bfb0aef0abdb35e10edf5a921550fbc772820e 100644 (file)
--- 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 f015edd628cf50d10649c3a93e3cb511067efbe2..b50b503a5c86bdec1b2a0fedb707861973b6e14c 100644 (file)
--- 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;