Include moldname contents in msvcrt.def Add .def alias for isascii, iscsym, iscsymf, toascii, strcasecmp, strncasecmp and wcscmpi Make libmoldname.a be an empty library git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5807 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index e8e3821..845d29c 100644 --- a/mingw-w64-crt/Makefile.am +++ b/mingw-w64-crt/Makefile.am
@@ -84,7 +84,6 @@ crt/xtxtmode.c crt/crt_handler.c \ crt/tlsthrd.c crt/tlsmthread.c crt/tlsmcrt.c -src_libmoldname=crt/isascii.c crt/iscsym.c crt/iscsymf.c crt/toascii.c crt/strcasecmp.c crt/strncasecmp.c crt/wcscmpi.c src_libscrnsave=libsrc/scrnsave.c src_libscrnsavw=libsrc/scrnsave.c src_libstrmiids=libsrc/strmiids.c @@ -440,8 +439,7 @@ lib32_LIBRARIES += lib32/libmoldname.a lib32_libmoldname_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) $(AM_CPPFLAGS) -lib32_libmoldname_a_SOURCES = $(src_libmoldname) -lib32_libmoldname_a_AR = $(DTDEF32) $(top_srcdir)/lib32/moldname-msvcrt.def -U --dllname msvcrt.dll && $(AR) $(ARFLAGS) +lib32_libmoldname_a_SOURCES = lib32_LIBRARIES += lib32/libmingwthrd.a lib32_libmingwthrd_a_SOURCES = $(src_libmingwthrd) @@ -760,7 +758,7 @@ lib64_LIBRARIES += lib64/libmoldname.a lib64_libmoldname_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) $(AM_CPPFLAGS) -lib64_libmoldname_a_SOURCES = $(src_libmoldname) +lib64_libmoldname_a_SOURCES = crt/isascii.c crt/iscsym.c crt/iscsymf.c crt/toascii.c crt/strcasecmp.c crt/strncasecmp.c crt/wcscmpi.c lib64_libmoldname_a_AR = $(DTDEF64) $(top_srcdir)/lib64/moldname-msvcrt.def -U --dllname msvcrt.dll && $(AR) $(ARFLAGS) lib64_LIBRARIES += lib64/libmingwthrd.a
diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in b/mingw-w64-crt/def-include/msvcrt-common.def.in index 5f74835..1be9be7 100644 --- a/mingw-w64-crt/def-include/msvcrt-common.def.in +++ b/mingw-w64-crt/def-include/msvcrt-common.def.in
@@ -1,2 +1,130 @@ -memcpy +#define ADD_UNDERSCORE(symbol) symbol == _ ## symbol +#define ADD_DOUBLE_UNDERSCORE(symbol) symbol == __ ## symbol +ADD_DOUBLE_UNDERSCORE(iscsymf) +ADD_DOUBLE_UNDERSCORE(iscsym) +ADD_DOUBLE_UNDERSCORE(isascii) +ADD_DOUBLE_UNDERSCORE(toascii) + +wcscmpi == _wcsicmp +strcasecmp == _stricmp +strncasecmp == _strnicmp + +ADD_UNDERSCORE(access) +ADD_UNDERSCORE(chdir) +ADD_UNDERSCORE(chmod) +ADD_UNDERSCORE(chsize) +ADD_UNDERSCORE(close) +ADD_UNDERSCORE(creat) +ADD_UNDERSCORE(cwait) +ADD_UNDERSCORE(dup) +ADD_UNDERSCORE(dup2) +ADD_UNDERSCORE(ecvt) +ADD_UNDERSCORE(eof) +ADD_UNDERSCORE(execl) +ADD_UNDERSCORE(execle) +ADD_UNDERSCORE(execlp) +ADD_UNDERSCORE(execlpe) +ADD_UNDERSCORE(execv) +ADD_UNDERSCORE(execve) +ADD_UNDERSCORE(execvp) +ADD_UNDERSCORE(execvpe) +ADD_UNDERSCORE(fcvt) +ADD_UNDERSCORE(fdopen) +ADD_UNDERSCORE(fgetchar) +ADD_UNDERSCORE(fgetwchar) +ADD_UNDERSCORE(filelength) +ADD_UNDERSCORE(fileno) +; fpreset) +ADD_UNDERSCORE(fputchar) +ADD_UNDERSCORE(fputwchar) +;fstat) +;ftime) +ADD_UNDERSCORE(gcvt) +ADD_UNDERSCORE(getch) +ADD_UNDERSCORE(getche) +ADD_UNDERSCORE(getcwd) +ADD_UNDERSCORE(getpid) +ADD_UNDERSCORE(getw) +ADD_UNDERSCORE(heapwalk) +ADD_UNDERSCORE(isatty) +ADD_UNDERSCORE(itoa) +ADD_UNDERSCORE(kbhit) +ADD_UNDERSCORE(lfind) +ADD_UNDERSCORE(lsearch) +ADD_UNDERSCORE(lseek) +ADD_UNDERSCORE(ltoa) +ADD_UNDERSCORE(memccpy) +ADD_UNDERSCORE(memicmp) +ADD_UNDERSCORE(mkdir) +ADD_UNDERSCORE(mktemp) +ADD_UNDERSCORE(open) +ADD_UNDERSCORE(pclose) +ADD_UNDERSCORE(popen) +ADD_UNDERSCORE(putch) +ADD_UNDERSCORE(putenv) +ADD_UNDERSCORE(putw) +ADD_UNDERSCORE(read) +ADD_UNDERSCORE(rmdir) +ADD_UNDERSCORE(rmtmp) +ADD_UNDERSCORE(searchenv) +ADD_UNDERSCORE(setmode) +ADD_UNDERSCORE(sopen) +ADD_UNDERSCORE(spawnl) +ADD_UNDERSCORE(spawnle) +ADD_UNDERSCORE(spawnlp) +ADD_UNDERSCORE(spawnlpe) +ADD_UNDERSCORE(spawnv) +ADD_UNDERSCORE(spawnve) +ADD_UNDERSCORE(spawnvp) +ADD_UNDERSCORE(spawnvpe) +;stat) +ADD_UNDERSCORE(strcmpi) +ADD_UNDERSCORE(strdup) +ADD_UNDERSCORE(stricmp) +ADD_UNDERSCORE(stricoll) +ADD_UNDERSCORE(strlwr) +ADD_UNDERSCORE(strnicmp) +ADD_UNDERSCORE(strnset) +ADD_UNDERSCORE(strrev) +ADD_UNDERSCORE(strset) +ADD_UNDERSCORE(strupr) +ADD_UNDERSCORE(swab) +ADD_UNDERSCORE(tell) +ADD_UNDERSCORE(tempnam) +ADD_UNDERSCORE(tzset) +ADD_UNDERSCORE(umask) +ADD_UNDERSCORE(ungetch) +ADD_UNDERSCORE(unlink) +ADD_UNDERSCORE(utime) +ADD_UNDERSCORE(wcsdup) +ADD_UNDERSCORE(wcsicmp) +ADD_UNDERSCORE(wcsicoll) +ADD_UNDERSCORE(wcslwr) +ADD_UNDERSCORE(wcsnicmp) +ADD_UNDERSCORE(wcsnset) +ADD_UNDERSCORE(wcsrev) +ADD_UNDERSCORE(wcsset) +ADD_UNDERSCORE(wcsupr) +ADD_UNDERSCORE(wpopen) +ADD_UNDERSCORE(write) +; non-ANSI functions declared in math.h +ADD_UNDERSCORE(j0) +ADD_UNDERSCORE(j1) +ADD_UNDERSCORE(jn) +ADD_UNDERSCORE(y0) +ADD_UNDERSCORE(y1) +ADD_UNDERSCORE(yn) +ADD_UNDERSCORE(chgsign) +;scalb +ADD_UNDERSCORE(finite) +ADD_UNDERSCORE(fpclass) +; C99 functions +;cabs +ADD_UNDERSCORE(hypot) +;logb +ADD_UNDERSCORE(nextafter) + +daylight DATA +timezone DATA +tzname DATA
diff --git a/mingw-w64-crt/lib32/moldname-msvcrt.def b/mingw-w64-crt/lib32/moldname-msvcrt.def deleted file mode 100644 index cbb9433..0000000 --- a/mingw-w64-crt/lib32/moldname-msvcrt.def +++ /dev/null
@@ -1,118 +0,0 @@ -EXPORTS -access -chdir -chmod -chsize -close -creat -cwait -daylight DATA -dup -dup2 -ecvt -eof -execl -execle -execlp -execlpe -execv -execve -execvp -execvpe -fcvt -fdopen -fgetchar -fgetwchar -filelength -fileno -; fpreset -fputchar -fputwchar -;fstat -;ftime -gcvt -getch -getche -getcwd -getpid -getw -heapwalk -isatty -itoa -kbhit -lfind -lsearch -lseek -ltoa -memccpy -memicmp -mkdir -mktemp -open -pclose -popen -putch -putenv -putw -read -rmdir -rmtmp -searchenv -setmode -sopen -spawnl -spawnle -spawnlp -spawnlpe -spawnv -spawnve -spawnvp -spawnvpe -;stat -strcmpi -strdup -stricmp -stricoll -strlwr -strnicmp -strnset -strrev -strset -strupr -swab -tell -tempnam -timezone DATA -tzname DATA -tzset -umask -ungetch -unlink -utime -wcsdup -wcsicmp -wcsicoll -wcslwr -wcsnicmp -wcsnset -wcsrev -wcsset -wcsupr -wpopen -write -; non-ANSI functions declared in math.h -j0 -j1 -jn -y0 -y1 -yn -chgsign -;scalb -finite -fpclass -; C99 functions -;cabs -hypot -;logb -nextafter
diff --git a/mingw-w64-crt/lib32/msvcrt.def.in b/mingw-w64-crt/lib32/msvcrt.def.in index c808598..701f721 100644 --- a/mingw-w64-crt/lib32/msvcrt.def.in +++ b/mingw-w64-crt/lib32/msvcrt.def.in
@@ -634,6 +634,7 @@ mbtowc memchr memcmp +memcpy memmove memset mktime