gcc 6.3.0 internal compiler error when building mkfs.c about nanos HOT 5 CLOSED

FWIW, I have attached the changes I made to the filesystem branch to build with gcc-4.9 on Debian Stretch. Probably better to fix what's broken on 6.0 (or 7.3.0), but I was anxious to get an image... This isn't a patch for submission, just a quick hack to get a build. Also, the change to rol() is wrong for the 32 bit build. If it's a persistent issue with (whatever gcc version we choose), I'll sort it out. It didn't appear that it would break anything in the short term. The -std=gnu99 (as opposed to c99) was necessary for the asm inlines. I'm not sure what the state of this is with newer versions. I can go ahead and clean up the makefiles a bit and add a build.mk to gather defines in one place if there are no objections. Any thoughts on a gcc version to target? Will diff --git a/boot/Makefile b/boot/Makefile index 3be8535..cb26791 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -27,6 +27,8 @@ OBJ = service32.o stage2.o serial.o page.o elf.o zero_wrap.o kvm_platform.o $(TF LD = ld OD = objdump +CC = gcc-4.9 +CFLAGS = -std=gnu99 stage2.elf: $(OBJ) linker_script $(LD) -T linker_script -e _start $(OBJ) $(LIBC) -o $@ @@ -38,7 +40,7 @@ service32.o: service32.s nasm -felf $< %.o: %.c $(ROOT)/runtime/closure_templates.h - cc -m32 -O -fno-stack-protector -include def32.h $(INCLUDES) -I. -I../runtime $< -c + $(CC) $(CFLAGS) -m32 -O -fno-stack-protector -include def32.h $(INCLUDES) -I. -I../runtime $< -c clean: rm -f *.o *~ stage2.elf stage2 bottom.list stage1 stage2.pad boot diff --git a/examples/Makefile b/examples/Makefile index 867c4c3..5e6938c 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,13 +1,16 @@ -all: hw web hwg webg +all: hw web hwg webg fst + +CC=gcc-4.9 +CFLAGS=-std=gnu99 hwg: hwg.go go build hwg.go hw: hw.c - cc hw.c -o hw + $(CC) $(CFLAGS) hw.c -o hw web: web.c - cc web.c -g -o web + $(CC) $(CFLAGS) web.c -g -o web webg: webg.go go build webg.go diff --git a/mkfs/Makefile b/mkfs/Makefile index e8384f5..0bc1d95 100644 --- a/mkfs/Makefile +++ b/mkfs/Makefile @@ -1,7 +1,8 @@ - all:mkfs dump ROOT=$(PWD)/.. +CC=gcc-4.9 +CFLAGS=-std=gnu99 -g INCLUDES = -include def64.h include $(ROOT)/runtime/Makefile @@ -9,13 +10,13 @@ INCLUDES += -I$(ROOT)/x86_64 include $(ROOT)/tfs/Makefile %.o: %.c $(ROOT)/runtime/closure_templates.h - cc -g -c $(INCLUDES) $< + $(CC) $(CFLAGS) -c $(INCLUDES) $< mkfs: mkfs.o $(UNIXRUNTIME) $(TFS) - cc $^ -g -o mkfs + $(CC) $(CFLAGS) $^ -o mkfs dump: dump.o $(UNIXRUNTIME) $(TFS) - cc $^ -g -o dump + $(CC) $(CFLAGS) $^ -o dump clean: rm -f *.o mkfs diff --git a/stage3/Makefile b/stage3/Makefile index 6d5fe29..9e391ad 100644 --- a/stage3/Makefile +++ b/stage3/Makefile @@ -2,6 +2,8 @@ ROOT = .. all:stage3 INCLUDES = -include def64.h +CC = gcc-4.9 +CFLAGS = -std=gnu99 include $(ROOT)/runtime/Makefile include $(ROOT)/x86_64/Makefile @@ -19,7 +21,7 @@ stage3: $(NETOBJ) stage3.o $(RUNTIME) $(RUNTIME_EXTRA) $(VIRTIO) $(VIRTIO_NET) $ ld -n -e_start -T linker_script -nostdlib $^ -o stage3 .c.o: - cc $(INCLUDES) -O -nostdinc -fno-stack-protector $< -c + $(CC) $(CFLAGS) $(INCLUDES) -O -nostdinc -fno-stack-protector $< -c # fix the frame nasm clean clean: diff --git a/x86_64/x86_64.h b/x86_64/x86_64.h index 0e0fdab..220ad1b 100644 --- a/x86_64/x86_64.h +++ b/x86_64/x86_64.h @@ -61,11 +61,20 @@ static inline void write_barrier() asm ("sfence"); } +#ifndef BITS32 #define rol(__x, __b)\ ({\ - __asm__("rol %1, %0": "=g"(__x): "i" (__b));\ + __asm__("rolq %1, %0": "=g"(__x): "i" (__b));\ __x;\ - })\ + }) +#else +/* XXX not right, just trying to get -m32 boot to compile */ +#define rol(__x, __b)\ + ({\ + __asm__("roll %1, %0": "=g"(__x): "i" (__b));\ + __x;\ + }) +#endif /*static inline u64 msb(u64 x) {