diff --git a/msvc/Makefile b/msvc/Makefile index 5ab61530..46822a52 100755 --- a/msvc/Makefile +++ b/msvc/Makefile @@ -345,7 +345,7 @@ ecl-cc.bat: util\ecl-cc.bat Makefile eclmin.lib: eclgmp.lib eclgc.lib lsp/config.lsp cd c - $(MAKE) ECL_VERSION_NUMBER=$(ECL_VERSION_NUMBER) \ + $(MAKE) /nologo ECL_VERSION_NUMBER=$(ECL_VERSION_NUMBER) \ ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) \ ECL_SSE=$(ECL_SSE) ECL_WIN64=$(ECL_WIN64) \ ECL_USE_DBGHELP=$(ECL_USE_DBGHELP) \ @@ -353,7 +353,7 @@ eclmin.lib: eclgmp.lib eclgc.lib lsp/config.lsp cd .. eclgc.lib: cd gc - $(MAKE) $(GCFLAGS) ECL_THREADS=$(ECL_THREADS) "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" "MY_CPU=$(GC_CPU)" gc.lib + $(MAKE) /nologo $(GCFLAGS) ECL_THREADS=$(ECL_THREADS) "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" "MY_CPU=$(GC_CPU)" gc.lib $(CP) gc.lib ..\eclgc.lib cd .. if not exist ecl\gc $(MKDIR) ecl\gc @@ -366,7 +366,7 @@ eclgc.lib: eclgmp.lib: cd gmp - $(MAKE) "MPN_TYPE=$(GMP_TYPE)" "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" \ + $(MAKE) /nologo "MPN_TYPE=$(GMP_TYPE)" "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" \ "BITS=$(GMP_BITS)" "YASM=$(YASM)" $(CP) gmp.lib ..\eclgmp.lib $(CP) gmp.h ..\ecl\gmp.h @@ -391,7 +391,7 @@ install: IF EXIST "$(include)\ecl\atomic_ops" rmdir /S /Q "$(include)\ecl\atomic_ops" IF EXIST "ecl\atomic_ops" xcopy /S /Y "ecl\atomic_ops" "$(includedir)\atomic_ops\" cd c - $(MAKE) cut.exe + $(MAKE) /nologo cut.exe cd .. c\cut.exe < ecl\config.h > $(includedir)\ecl\config.h IF NOT EXIST "$(libdir)" $(MKDIR) "$(libdir)" @@ -408,15 +408,15 @@ install: check: package\ecl.exe cd tests - $(MAKE) + $(MAKE) /nologo recheck: package\ecl.exe cd tests - $(MAKE) clean - $(MAKE) + $(MAKE) /nologo clean + $(MAKE) /nologo package\ecl.exe: ecl2$(EXE) - $(MAKE) install ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) + $(MAKE) /nologo install ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) windows-nsi: IF EXIST "$(TAR_DIR)" $(RMDIR) "$(TAR_DIR)" @@ -432,7 +432,7 @@ clean: clean_ecl clean_lisp -$(RM) .gdbinit cinit.lib ecl_min.lib -$(RM) bdwgc\*.pdb cd gc - -$(MAKE) $(GCFLAGS) ECL_THREADS=$(ECL_THREADS) "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" "MY_CPU=$(GC_CPU)" clean + -$(MAKE) /nologo $(GCFLAGS) ECL_THREADS=$(ECL_THREADS) "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" "MY_CPU=$(GC_CPU)" clean cd .. -for %h in (gc.h gc_local_alloc.h gc_pthread_redirects.h \ gc_config_macros.h leak_detector.h gc_typed.h \ @@ -441,7 +441,7 @@ clean: clean_ecl clean_lisp -$(RMDIR) ecl\gc\private -$(RMDIR) ecl\gc cd gmp - -$(MAKE) "MPN_TYPE=$(GMP_TYPE)" "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" \ + -$(MAKE) /nologo "MPN_TYPE=$(GMP_TYPE)" "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" \ "BITS=$(GMP_BITS)" "YASM=$(YASM)" clean cd .. -$(RM) ecl\gmp.h @@ -454,7 +454,7 @@ clean_ecl: ecl-cc.bat ecl.rc ecl.res) \ do $(RM) %i cd c - -$(MAKE) ECL_VERSION_NUMBER=$(ECL_VERSION_NUMBER) \ + -$(MAKE) /nologo ECL_VERSION_NUMBER=$(ECL_VERSION_NUMBER) \ ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) \ ECL_SSE=$(ECL_SSE) ECL_WIN64=$(ECL_WIN64) \ ECL_USE_DBGHELP=$(ECL_USE_DBGHELP) \ diff --git a/msvc/c/Makefile b/msvc/c/Makefile index 15a594f1..141c18aa 100755 --- a/msvc/c/Makefile +++ b/msvc/c/Makefile @@ -43,7 +43,6 @@ ECL_USE_DBGHELP_FLAG=0 # Programs used by "make": # -TRUE_CC = cl CC = cl CFLAGS = -c $(ECL_CFLAGS) -DECL_BUILD -DECL_API="__declspec(dllexport)" -I./ -I../ -I$(srcdir) -I$(top_srcdir)/bdwgc/include -I$(top_srcdir)/bdwgc/include/private -I$(srcdir)/unicode @@ -145,7 +144,7 @@ cut.exe: $(top_srcdir)/util/cut.c ..\eclmin.lib: $(OBJS:.obj=.c) all_symbols.c $(OBJS) all_symbols.obj all_symbols2.obj -$(RM) $@ - $(LINK) -lib -out:$@ $(OBJS) + $(LINK) -lib -nologo -out:$@ $(OBJS) clean: -for %f in ($(OBJS:.obj=.c) all_symbols.c) do $(RM) %f @@ -162,7 +161,7 @@ clean: # Build rules $(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list2.h ../ecl/config.h ../ecl/config-internal.h - $(TRUE_CC) -I.. -I./ $(srcdir)/dpp.c -o $@ + $(CC) /nologo -I.. -I./ $(srcdir)/dpp.c /Fe$@ $(HFILES): ../ecl/config.h.msvc6 ../ecl/config-internal.h.msvc6 Makefile -mkdir ..\ecl\impl cut.exe "@ECL_FPE_CODE@" "$(srcdir:\=/)/arch/$(ECL_FPE_CODE)" \ diff --git a/msvc/gc/Makefile b/msvc/gc/Makefile index a5ecf524..e47ebe70 100755 --- a/msvc/gc/Makefile +++ b/msvc/gc/Makefile @@ -32,13 +32,13 @@ OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_r all: gc.lib {$(srcdir)\extra}.c{}.obj: - $(CC) -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj + $(CC) -nologo -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj {$(srcdir)}.c{}.obj: - $(CC) -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj + $(CC) -nologo -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj {$(srcdir)}.cpp{}.obj: - $(CC) -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj + $(CC) -nologo -c -DWIN32 -D_MT $(CFLAGS_CONFIG) -Iinclude -I$(AO_INCLUDE_DIR) $(THREADS_FLAGS) -I$(srcdir)\include $< /Fo$*.obj gc.lib: $(OBJS) !if "$(CPU)" == "i386" diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp index 280ae8b2..7fc777b3 100755 --- a/src/cmp/cmpmain.lsp +++ b/src/cmp/cmpmain.lsp @@ -160,9 +160,9 @@ the environment variable TMPDIR to a different value." template)) (progn (with-open-file (f "static_lib.tmp" :direction :output :if-does-not-exist :create :if-exists :supersede) - (format f "/DEBUGTYPE:CV /OUT:~A ~A ~{~&\"~A\"~}" + (format f "/OUT:~A ~A ~{~&\"~A\"~}" output-name o-name ld-flags)) - (safe-run-program "link" '("-lib" "@static_lib.tmp"))) + (safe-run-program "link" '("-lib -nologo" "@static_lib.tmp"))) (when (probe-file "static_lib.tmp") (cmp-delete-file "static_lib.tmp")))) diff --git a/src/compile.lsp.in b/src/compile.lsp.in index 650e09f4..970004a9 100755 --- a/src/compile.lsp.in +++ b/src/compile.lsp.in @@ -340,7 +340,7 @@ :if-does-not-exist :create) (write-line "id ICON \"ecl.ico\"" s)) (ext:copy-file #p"src:util;ecl.ico" "ecl.ico") - #+msvc (ext:system "rc /r ecl.rc") + #+msvc (ext:system "rc /nologo /r ecl.rc") #-msvc (ext:system "windres ecl.rc -O coff ecl.res")) (si::pathname-translations "SYS" '(("**;*.*.*" "@true_builddir@/**/*.*"))) diff --git a/src/h/ecl-cmp.h b/src/h/ecl-cmp.h index 4d17c5f1..092350e7 100755 --- a/src/h/ecl-cmp.h +++ b/src/h/ecl-cmp.h @@ -21,11 +21,15 @@ * defined */ #define _WINSOCKAPI_ #endif /* __CYGWIN__ */ +#if defined(__clang__) /* Disable a couple of clang's more annoying diagnostics */ #pragma clang diagnostic ignored "-Wreturn-type" #pragma clang diagnostic ignored "-Wunused-value" #pragma clang diagnostic ignored "-Wparentheses-equality" - +#elif defined(_MSC_VER) +#pragma warning(disable:4715) //not all control paths return a value +#pragma warning(disable:4716) //must return a value +#endif #include #include /* for inline mathematics */ #include