@@ -74,6 +74,7 @@ TESTS_CPP_EXCEPTIONS = hello-exception exception-locale exception-reduced
7474TESTS_CPP_STATIC = hello-exception
7575TESTS_CPP_DLL = tlstest-lib throwcatch-lib
7676TESTS_CPP_LINK_DLL = throwcatch-main
77+ TESTS_TCHAR = tchar
7778TESTS_SSP = stacksmash
7879TESTS_FORTIFY = bufferoverflow crt-test
7980ifneq ($(HAVE_ASAN ) ,)
@@ -108,6 +109,8 @@ TARGETS_CPP_EXCEPTIONS_OPT = $(addsuffix -opt$(EXEEXT), $(TESTS_CPP_EXCEPTIONS))
108109TARGETS_CPP_STATIC = $(addsuffix -static$(EXEEXT ) , $(TESTS_CPP_STATIC ) )
109110TARGETS_CPP_DLL = $(addsuffix $(DLLEXT ) , $(TESTS_CPP_DLL ) )
110111TARGETS_CPP_LINK_DLL = $(addsuffix $(EXEEXT ) , $(TESTS_CPP_LINK_DLL ) )
112+ TARGETS_TCHAR_NARROW = $(addsuffix -narrow$(EXEEXT ) , $(TESTS_TCHAR ) )
113+ TARGETS_TCHAR_UNICODE = $(addsuffix -unicode$(EXEEXT ) , $(TESTS_TCHAR ) )
111114TARGETS_SSP = $(addsuffix $(EXEEXT ) , $(TESTS_SSP ) )
112115TARGETS_CFGUARD = $(addsuffix $(EXEEXT ) , $(TESTS_CFGUARD ) )
113116TARGETS_FORTIFY = $(addsuffix -fortify$(EXEEXT ) , $(TESTS_FORTIFY ) )
@@ -129,6 +132,7 @@ TARGETS_ATOMIC = $(addsuffix $(EXEEXT), $(TESTS_ATOMIC))
129132TARGETS = \
130133 $(TARGETS_C ) $(TARGETS_C_DLL ) $(TARGETS_C_LINK_DLL ) $(TARGETS_C_NO_BUILTIN ) $(TARGETS_C_ANSI_STDIO ) $(TARGETS_C_NOANSI_STDIO ) $(TARGETS_C_AS_CPP ) \
131134 $(TARGETS_CPP ) $(TARGETS_CPP_EXCEPTIONS ) $(TARGETS_CPP_EXCEPTIONS_OPT ) $(TARGETS_CPP_STATIC ) $(TARGETS_CPP_DLL ) $(TARGETS_CPP_LINK_DLL ) \
135+ $(TARGETS_TCHAR_NARROW ) $(TARGETS_TCHAR_UNICODE ) \
132136 $(TARGETS_SSP ) $(TARGETS_CFGUARD ) $(TARGETS_FORTIFY ) \
133137 $(TARGETS_IDL ) $(TARGETS_RES ) \
134138 $(TARGETS_OTHER_TARGETS ) $(TARGETS_UWP ) $(TARGETS_UWP_FAIL ) \
@@ -184,6 +188,14 @@ $(TARGETS_CPP) $(TARGETS_CPP_EXCEPTIONS): %$(EXEEXT): %.cpp
184188$(TARGETS_CPP_STATIC ) : % -static$(EXEEXT ) : % .cpp
185189 $(CXX ) $(CPPFLAGS ) $(CXXFLAGS ) -static $< -o $@
186190
191+ # Build these tests with -D__USE_MINGW_ANSI_STDIO=1 to make sure that tchar
192+ # routines behave as expected even when normally using mingw stdio functions.
193+ $(TARGETS_TCHAR_NARROW ) : % -narrow$(EXEEXT ) : % .c
194+ $(CC ) $(CPPFLAGS ) $(CFLAGS ) $< -o $@ -D__USE_MINGW_ANSI_STDIO=1
195+
196+ $(TARGETS_TCHAR_UNICODE ) : % -unicode$(EXEEXT ) : % .c
197+ $(CC ) $(CPPFLAGS ) $(CFLAGS ) $< -o $@ -D__USE_MINGW_ANSI_STDIO=1 -municode
198+
187199$(TARGETS_SSP ) : % $(EXEEXT ) : % .c
188200 $(CC ) $(CPPFLAGS ) $(CFLAGS ) $< -o $@ -fstack-protector-strong
189201
0 commit comments