> Manual commit: Change C to CXX. Warning: Using rlib

U201614531
recolic
Linux RECOLICPC 5.4.2-arch1-1 #1 SMP PREEMPT Thu, 05 Dec 2019 12:29:40 +0000 x86_64 GNU/Linux
 02:39:29 up 2 days,  9:57,  1 user,  load average: 1.01, 1.36, 1.07
3af6e7865b1e22e67c9ef593c9a7531882d956c9

nemu/.gitignore

-*.*
-*
-!*/
-!Makefile*
-!*.[cSh]
-!.gitignore
-!README.md
-!runall.sh

nemu/Makefile

@@ -16,21 +16,21 @@ include Makefile.git
 .DEFAULT_GOAL = app
 
 # Compilation flags
-CC ?= gcc
-LD = $(CC)
+CXX ?= g++
+LD = $(CXX)
 INCLUDES  = $(addprefix -I, $(INC_DIR))
 CFLAGS   += -O2 -MMD -Wall -ggdb3 $(INCLUDES) -fomit-frame-pointer
 CFLAGS   += -DDIFF_TEST_QEMU
 
 # Files to be compiled
-SRCS = $(shell find src/ -name "*.c")
-OBJS = $(SRCS:src/%.c=$(OBJ_DIR)/%.o)
+SRCS = $(shell find src/ -name "*.cc")
+OBJS = $(SRCS:src/%.cc=$(OBJ_DIR)/%.o)
 
 # Compilation patterns
-$(OBJ_DIR)/%.o: src/%.c
-	@echo + CC $<
+$(OBJ_DIR)/%.o: src/%.cc
+	@echo + CXX $<
 	@mkdir -p $(dir $@)
-	$(CC) $(CFLAGS) $(SO_CFLAGS) -c -o $@ $<
+	$(CXX) $(CFLAGS) $(SO_CFLAGS) -c -o $@ $<
 
 
 # Depencies
@@ -50,7 +50,7 @@ NEMU_EXEC := $(BINARY) $(ARGS)
 $(BINARY): $(OBJS)
 	$(call git_commit, "compile")
 	@echo + LD $@
-	@$(LD) -O2 -rdynamic $(SO_LDLAGS) -o $@ $^ -lSDL2 -lreadline -ldl
+	@$(LD) -O2 -rdynamic $(SO_LDLAGS) -o $@ $^ -lSDL2 -lreadline -ldl -lr
 
 run: $(BINARY)
 	$(call git_commit, "run")

nemu/build/obj/cpu/decode/decode.d

+build/obj/cpu/decode/decode.o: src/cpu/decode/decode.cc \
+ include/cpu/exec.h include/nemu.h include/common.h include/debug.h \
+ include/macro.h include/memory/memory.h include/common.h \
+ include/cpu/reg.h include/cpu/decode.h include/cpu/rtl.h \
+ include/util/c_op.h include/cpu/relop.h include/cpu/rtl-wrapper.h \
+ include/macro.h include/cpu/rtl.h

nemu/build/obj/cpu/decode/modrm.d

+build/obj/cpu/decode/modrm.o: src/cpu/decode/modrm.cc include/cpu/exec.h \
+ include/nemu.h include/common.h include/debug.h include/macro.h \
+ include/memory/memory.h include/common.h include/cpu/reg.h \
+ include/cpu/decode.h include/cpu/rtl.h include/util/c_op.h \
+ include/cpu/relop.h include/cpu/rtl-wrapper.h include/macro.h \
+ include/cpu/rtl.h

nemu/build/obj/cpu/exec/arith.d

+build/obj/cpu/exec/arith.o: src/cpu/exec/arith.cc include/cpu/exec.h \
+ include/nemu.h include/common.h include/debug.h include/macro.h \
+ include/memory/memory.h include/common.h include/cpu/reg.h \
+ include/cpu/decode.h include/cpu/rtl.h include/util/c_op.h \
+ include/cpu/relop.h include/cpu/rtl-wrapper.h include/macro.h

nemu/build/obj/cpu/exec/cc.d

+build/obj/cpu/exec/cc.o: src/cpu/exec/cc.cc include/cpu/rtl.h \
+ include/nemu.h include/common.h include/debug.h include/macro.h \
+ include/memory/memory.h include/common.h include/cpu/reg.h \
+ include/util/c_op.h include/cpu/relop.h include/cpu/rtl-wrapper.h \
+ include/macro.h

nemu/build/obj/cpu/exec/control.d

+build/obj/cpu/exec/control.o: src/cpu/exec/control.cc include/cpu/exec.h \
+ include/nemu.h include/common.h include/debug.h include/macro.h \
+ include/memory/memory.h include/common.h include/cpu/reg.h \
+ include/cpu/decode.h include/cpu/rtl.h include/util/c_op.h \
+ include/cpu/relop.h include/cpu/rtl-wrapper.h include/macro.h \
+ include/cpu/cc.h

nemu/build/obj/cpu/exec/data-mov.d

+build/obj/cpu/exec/data-mov.o: src/cpu/exec/data-mov.cc \
+ include/cpu/exec.h include/nemu.h include/common.h include/debug.h \
+ include/macro.h include/memory/memory.h include/common.h \
+ include/cpu/reg.h include/cpu/decode.h include/cpu/rtl.h \
+ include/util/c_op.h include/cpu/relop.h include/cpu/rtl-wrapper.h \
+ include/macro.h

nemu/build/obj/cpu/exec/exec.d

+build/obj/cpu/exec/exec.o: src/cpu/exec/exec.cc include/cpu/exec.h \
+ include/nemu.h include/common.h include/debug.h include/macro.h \
+ include/memory/memory.h include/common.h include/cpu/reg.h \
+ include/cpu/decode.h include/cpu/rtl.h include/util/c_op.h \
+ include/cpu/relop.h include/cpu/rtl-wrapper.h include/macro.h \
+ src/cpu/exec/all-instr.h

nemu/build/obj/cpu/exec/logic.d

+build/obj/cpu/exec/logic.o: src/cpu/exec/logic.cc include/cpu/exec.h \
+ include/nemu.h include/common.h include/debug.h include/macro.h \
+ include/memory/memory.h include/common.h include/cpu/reg.h \
+ include/cpu/decode.h include/cpu/rtl.h include/util/c_op.h \
+ include/cpu/relop.h include/cpu/rtl-wrapper.h include/macro.h \
+ include/cpu/cc.h

nemu/build/obj/cpu/exec/prefix.d

+build/obj/cpu/exec/prefix.o: src/cpu/exec/prefix.cc include/cpu/exec.h \
+ include/nemu.h include/common.h include/debug.h include/macro.h \
+ include/memory/memory.h include/common.h include/cpu/reg.h \
+ include/cpu/decode.h include/cpu/rtl.h include/util/c_op.h \
+ include/cpu/relop.h include/cpu/rtl-wrapper.h include/macro.h