Windows CI fdlibm | Here is a way to actually use Microsoft LIB to package the .o files for a libm.lib, not a libm.a

Author: marceltaeumel

.github/workflows/win-arm.yml

@@ -91,7 +91,7 @@ jobs:
           release: true # no MSYS2 installed in ARM64 runners
           update: false # faster?
           cache: true
-          install: git base make mingw-w64-clang-aarch64-llvm-tools
+          install: git base make
 
       - name: Build VM
         shell: msys2 {0} #bash

.github/workflows/win.yml

@@ -92,7 +92,7 @@ jobs:
           release: false # use existing MSYS2 installation
           update: false # faster?
           cache: true
-          install: git base make binutils
+          install: git base make
 
       - name: Build VM
         shell: msys2 {0} #bash

building/win32x86/common/Makefile

@@ -118,7 +118,9 @@ LIBS:= $(addprefix $(OBJDIR)/, $(addsuffix .lib, $(INTERNAL_PLUGINS)))
 DLLS:= $(addprefix $(OBJDIR)/, $(addsuffix .dll, $(EXTERNAL_PLUGINS)))
 
 ifdef BIT_IDENTICAL_FLOATING_POINT
-LIBS:=$(BUILD)/fdlibm/libm.a $(LIBS)
+LIBM_LIB?=libm.a
+export LIBM_LIB
+LIBS:=$(BUILD)/fdlibm/$(LIBM_LIB) $(LIBS)
 export BIT_IDENTICAL_FLOATING_POINT
 endif
 
@@ -300,10 +302,12 @@ $(OBJDIR)/%.dll: always
 		JMPOBJ=$(JMPOBJ) VMLIB=$(OBJDIR)/$(VMLIB) \
 		COGDEFS="$(COGDEFS) -DSQUEAK_EXTERNAL_PLUGIN=$(*F)" $(OBJDIR)/$(*F).dll
 
+# Build fdlibm with GNU ar and GNU ranlib. Override $(LIBM_LIB) and add
+# custom rule to choose, e.g., different librarian method.
 $(BUILD)/fdlibm/libm.a:
 	@-$(MKDIR) $(@D)
 	$(MAKE) CC='$(CC)' CFLAGS="$(CFLAGS) -D_IEEE_LIBM" -C $(@D) \
-		TP=../../$(TPDIR) -f ../../$(TPDIR)/fdlibm/Makefile.remote
+		TP=../../$(TPDIR) -f ../../$(TPDIR)/fdlibm/Makefile.remote libm.a
 
 
 #############################################################################

building/win32x86/common/Makefile.WinSDK

@@ -22,4 +22,12 @@
 #############################################################################
 
 SDKPREFIX:=.WinSDK
+LIBM_LIB:=libm.lib
+
 include ../common/Makefile
+
+$(BUILD)/fdlibm/$(LIBM_LIB):
+	@-$(MKDIR) $(@D)
+	$(MAKE) CC='$(CC)' CFLAGS="$(CFLAGS) -D_IEEE_LIBM" -C $(@D) \
+		LIBRARIAN='$(LIBRARIAN)' \
+		TP=../../$(TPDIR) -f ../../$(TPDIR)/fdlibm/Makefile.remote $(LIBM_LIB)

building/win32x86/common/Makefile.WinSDK.plugin

@@ -72,7 +72,7 @@ LIBOBJ?=    $(LIBSRC:.c=.o)
 LIBOBJ:=    $(LIBOBJ:.cpp=.o)
 LIBOBJ:=    $(addprefix $(OBJDIR)/,$(LIBOBJ))
 ifdef BIT_IDENTICAL_FLOATING_POINT
-LIBOBJ+=$(BUILD)/fdlibm/libm.a $(LIBS)
+LIBOBJ+=$(BUILD)/fdlibm/$(LIBM_LIB) $(LIBS)
 endif
 
 #############################################################################

building/win32x86/common/Makefile.plugin

@@ -71,7 +71,7 @@ PLUGINDLL:= $(VMDIR)/$(LIBNAME).dll
 LIBOBJ ?= 	$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(LIBSRC)))		 
 LIBOBJ:=    $(addprefix $(OBJDIR)/,$(LIBOBJ))
 ifdef BIT_IDENTICAL_FLOATING_POINT
-LIBOBJ+=$(BUILD)/fdlibm/libm.a $(LIBS)
+LIBOBJ+=$(BUILD)/fdlibm/$(LIBM_LIB) $(LIBS)
 endif
 
 #############################################################################

building/win64ARMv8/common/Makefile

@@ -1,5 +1,5 @@
 #############################################################################
-# Common Makefile for Win64 VM using LLVM/Clang compiler, MSYS2 toolchain,
+# Common Makefile for Win64ARMv8 VM using LLVM/Clang compiler, MSYS2 toolchain,
 # and mingw-w64 for building a native Windows application.
 #
 # Visit: https://www.msys2.org/
@@ -118,7 +118,9 @@ LIBS:= $(addprefix $(OBJDIR)/, $(addsuffix .lib, $(INTERNAL_PLUGINS)))
 DLLS:= $(addprefix $(OBJDIR)/, $(addsuffix .dll, $(EXTERNAL_PLUGINS)))
 
 ifdef BIT_IDENTICAL_FLOATING_POINT
-LIBS:=$(BUILD)/fdlibm/libm.a $(LIBS)
+LIBM_LIB?=libm.a
+export LIBM_LIB
+LIBS:=$(BUILD)/fdlibm/$(LIBM_LIB) $(LIBS)
 export BIT_IDENTICAL_FLOATING_POINT
 endif
 
@@ -300,10 +302,12 @@ $(OBJDIR)/%.dll: always
 		JMPOBJ=$(JMPOBJ) VMLIB=$(OBJDIR)/$(VMLIB) \
 		COGDEFS="$(COGDEFS) -DSQUEAK_EXTERNAL_PLUGIN=$(*F)" $(OBJDIR)/$(*F).dll
 
+# Build fdlibm with GNU ar and GNU ranlib. Override $(LIBM_LIB) and add
+# custom rule to choose, e.g., different librarian method.
 $(BUILD)/fdlibm/libm.a:
 	@-$(MKDIR) $(@D)
 	$(MAKE) CC='$(CC)' CFLAGS="$(CFLAGS) -D_IEEE_LIBM" -C $(@D) \
-		TP=../../$(TPDIR) -f ../../$(TPDIR)/fdlibm/Makefile.remote
+		TP=../../$(TPDIR) -f ../../$(TPDIR)/fdlibm/Makefile.remote libm.a
 
 
 #############################################################################

building/win64ARMv8/common/Makefile.WinSDK

@@ -22,4 +22,12 @@
 #############################################################################
 
 SDKPREFIX:=.WinSDK
+LIBM_LIB:=libm.lib
+
 include ../common/Makefile
+
+$(BUILD)/fdlibm/$(LIBM_LIB):
+	@-$(MKDIR) $(@D)
+	$(MAKE) CC='$(CC)' CFLAGS="$(CFLAGS) -D_IEEE_LIBM" -C $(@D) \
+		LIBRARIAN='$(LIBRARIAN)' \
+		TP=../../$(TPDIR) -f ../../$(TPDIR)/fdlibm/Makefile.remote $(LIBM_LIB)

building/win64ARMv8/common/Makefile.WinSDK.plugin

@@ -72,7 +72,7 @@ LIBOBJ?=    $(LIBSRC:.c=.o)
 LIBOBJ:=    $(LIBOBJ:.cpp=.o)
 LIBOBJ:=    $(addprefix $(OBJDIR)/,$(LIBOBJ))
 ifdef BIT_IDENTICAL_FLOATING_POINT
-LIBOBJ+=$(BUILD)/fdlibm/libm.a $(LIBS)
+LIBOBJ+=$(BUILD)/fdlibm/$(LIBM_LIB) $(LIBS)
 endif
 
 #############################################################################

building/win64ARMv8/common/Makefile.WinSDK.tools.paths

@@ -19,12 +19,6 @@ else
 	override MSYS2_BIN:=$(subst \,/,$(MSYS2_BIN))
 endif
 
-# For llvm-tools ar and ranlib, make both available in the MSYS environment.
-# Do not install binutils but the package mingw-w64-clang-aarch64-llvm-tools.
-$(shell ln -f -s ${MSYS2_BIN}../../clangarm64/bin/ar ${MSYS2_BIN}ar)
-$(shell ln -f -s ${MSYS2_BIN}../../clangarm64/bin/ranlib ${MSYS2_BIN}ranlib)
-
-
 #############################################################################
 # Set paths to the Windows SDK (and tools) and Visual Studio (and tools)
 #