Merge pull request DOCGroup#211 from jwillemsen/jwi-bcc64xlinker

Use bcc64x as linker instead of ld.lld.exe

Author: jwillemsen

templates/bmake.mpd

@@ -24,11 +24,10 @@ COMMON_FLAGS = <%foreach(common_flags)%><%common_flag%><%endfor%>
 PLATFORM_LIBS_PREFIX = <%platform_libs_prefix%>
 OBJ_EXT = <%obj_ext%>
 LINKER_PATHS = <%linker_paths%>
+LINKER_PASSTHROUGH = <%linker_passthrough%>
 STARTUP_BITS = <%startup_bits%>
 LINK = <%link%>
 COMMON_LIBS = <%common_libs%>
-DLLLIBS = <%dll_libs%>
-EXELIBS = <%exe_libs%>
 TLIB = <%tlib%>
 DLLFLAGS = <%dllflags%>
 <%if(pch)%>PCH = 1<%endif%>
@@ -157,10 +156,10 @@ LFLAGS   = \
 
 LIBFILES = \
 <%foreach(reverse(libs))%>
-           <%libname_prefix%><%lib%>$(LIBMODIFIER)$(ULIBMODIFIER)$(LIB_EXT) \
+           $(LINKER_PASSTHROUGH) <%libname_prefix%><%lib%>$(LIBMODIFIER)$(ULIBMODIFIER)$(LIB_EXT) \
 <%endfor%>
 <%foreach(reverse(lit_libs))%>
-           <%lit_lib%>$(LIB_EXT) \
+           $(LINKER_PASSTHROUGH) <%lit_lib%>$(LIB_EXT) \
 <%endfor%>
 <%foreach(reverse(platform_libs))%>
            $(PLATFORM_LIBS_PREFIX)<%platform_libs%> \

templates/bmakecommon.mpt

@@ -1,6 +1,10 @@
 // -*- MPC -*-
 
-// The *32 settings are for bcc32, *32c are for bcc32c (the clang based bcc32), and *64 are for bcc64 (also clang based)
+// These settings are for:
+// bcc32 are for bcc32, the old Embarcadero C++ compiler
+// bcc32c are for the clang5 based bcc32c
+// bcc64 are for the clang5 based bcc64
+// bcc64x are for the clang15 based bcc64x
 
 conditional_include "common"
 
@@ -29,6 +33,7 @@ common_defines = WIN32 _WINDOWS
 common_flags = -a8
 obj_ext = .obj
 linker_paths = -L\"$(BDS)\lib\win32\release\" -L\"$(BDS)\lib\win32\debug\"
+linker_passthrough =
 startup_bits = 32
 link = ilink32
 common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT) $(CG_LIB)
@@ -58,6 +63,7 @@ common_defines = WIN32 _WINDOWS
 common_flags = -a8
 obj_ext = .obj
 linker_paths = -L\"$(BDS)\lib\win32c\debug\" -L\"$(BDS)\lib\win32c\release\"
+linker_passthrough =
 startup_bits = 32
 link = ilink32
 common_libs = ws2_32$(LIB_EXT) import32$(LIB_EXT) cw32mti$(LIB_EXT)
@@ -86,6 +92,7 @@ common_defines = WIN32 _WINDOWS WIN64
 common_flags =
 obj_ext = .o
 linker_paths = -L\"$(BDS)\lib\win64\debug\" -L\"$(BDS)\lib\win64\release\" -GE:HIGHENTROPYVA=off
+linker_passthrough =
 startup_bits = 64
 link = ilink64
 common_libs = ws2_32$(LIB_EXT) import64$(LIB_EXT) cw64mti$(LIB_EXT)
@@ -103,28 +110,27 @@ bcc64x {
 debug_flags = -g -O0
 release_flags = -Wno-ignored-attributes
 optimize_flags = -O3
-pdb_flags = -pdb $(OUTPUTDIR)$(NAME).pdb
+pdb_flags = -Xlinker -pdb -Xlinker $(OUTPUTDIR:\=/)$(NAME).pdb
 warn_flags =
-stack_flag = --stack=
+stack_flag = -Xlinker --stack=
 cc = bcc64x
 binary_flags = -tR -tD
 thr_flags = -tM
 lib_ext = .lib
 common_defines = WIN32 _WINDOWS WIN64
 common_flags = -Qunused-arguments
 obj_ext = .o
-linker_paths = -L\"$(BDS)\lib\win64x\debug\" -L\"$(BDS)\lib\win64x\release\" -L\"$(BDS)\x86_64-w64-mingw32\lib\" -L\"$(BDS)\lib\clang\15.0.7\lib\windows\"
+linker_paths = 
+linker_passthrough = -Xlinker
 startup_bits = 64
 ccflags = -q
-link = ld.lld
-common_libs = crtbegin.o -lws2_32 -lmoldname -lucrt -lmingw32 -lmingwex -l\"c++\" -lunwind -lmingwthrd -l:import64$(LIB_EXT) -lclang_rt.builtins-x86_64
+link = bcc64x
+common_libs = -lws2_32 -lucrt -lmingwthrd 
 platform_libs_prefix = -l
-dll_libs = dllcrt2.o
-exe_libs = crt2.o
 tlib = tlib64
-dllflags = -m i386pep -shared --Bdynamic --enable-auto-image-base
-exeflags = -m i386pep --Bdynamic
+dllflags = -tD -Xlinker --Bdynamic
+exeflags = -Xlinker --Bdynamic
 object_search_path = 0
-linker_dll_arguments = $(DLLFLAGS) $(LFLAGS) $(OBJFILES) -o $(OUTPUTDIR)$(NAME)$(DLL_EXT) --out-implib $(OUTPUTDIR)$(NAME).lib $(DLLLIBS) $(LIBFILES) $(RESOURCE)
-linker_exe_arguments = $(EXEFLAGS) $(LFLAGS) $(OBJFILES) -o $(OUTPUTDIR)$(NAME)$(EXE_EXT) $(EXELIBS) $(LIBFILES) $(RESOURCE)
+linker_dll_arguments = --driver-mode=g++ $(DLLFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(DLL_EXT) -Xlinker --out-implib -Xlinker $(OUTPUTDIR:\=/)$(NAME).lib $(LIBFILES:\=/) $(RESOURCE:\=/)
+linker_exe_arguments = --driver-mode=g++ $(EXEFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(EXE_EXT) $(LIBFILES:\=/) $(RESOURCE:\=/)
 }