From a67af2368ebaa7cb4fc5fdbee9caebc1025384cf Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 1 May 2023 02:42:47 +0200 Subject: [PATCH] Rename softfloat's poly.cc to softfloat_poly.cc, fixes the clobbering of Munt's poly.cpp when compiling with Makefile.mingw. --- src/cpu/softfloat/CMakeLists.txt | 2 +- src/cpu/softfloat/{poly.cc => softfloat_poly.cc} | 0 src/win/Makefile.mingw | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/cpu/softfloat/{poly.cc => softfloat_poly.cc} (100%) diff --git a/src/cpu/softfloat/CMakeLists.txt b/src/cpu/softfloat/CMakeLists.txt index 62458aada..936157185 100644 --- a/src/cpu/softfloat/CMakeLists.txt +++ b/src/cpu/softfloat/CMakeLists.txt @@ -13,5 +13,5 @@ # Copyright 2020-2021 David Hrdlička. # -add_library(softfloat OBJECT f2xm1.cc fpatan.cc fprem.cc fsincos.cc fyl2x.cc poly.cc softfloat.cc softfloat16.cc +add_library(softfloat OBJECT f2xm1.cc fpatan.cc fprem.cc fsincos.cc fyl2x.cc softfloat_poly.cc softfloat.cc softfloat16.cc softfloat-muladd.cc softfloat-round-pack.cc softfloat-specialize.cc softfloatx80.cc) diff --git a/src/cpu/softfloat/poly.cc b/src/cpu/softfloat/softfloat_poly.cc similarity index 100% rename from src/cpu/softfloat/poly.cc rename to src/cpu/softfloat/softfloat_poly.cc diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index b2e2ddf0b..c0077abc2 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -552,7 +552,7 @@ CPUOBJ := $(DYNARECOBJ) \ cpu.o cpu_table.o fpu.o x86.o \ 8080.o 808x.o 386.o 386_common.o 386_dynarec.o 386_dynarec_ops.o \ x86seg.o x87.o x87_timings.o \ - f2xm1.o fpatan.o fprem.o fsincos.o fyl2x.o poly.o softfloat.o softfloat16.o \ + f2xm1.o fpatan.o fprem.o fsincos.o fyl2x.o softfloat_poly.o softfloat.o softfloat16.o \ softfloat-muladd.o softfloat-round-pack.o softfloat-specialize.o softfloatx80.o CHIPSETOBJ := 82c100.o acc2168.o \