lib64/msvcrt.def: include moldname contents

Remove libmoldname sources

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5808 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-crt/Makefile.am

diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 845d29c..f19ba39 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -758,12 +758,14 @@
 
 lib64_LIBRARIES += lib64/libmoldname.a
 lib64_libmoldname_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) $(AM_CPPFLAGS)
-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_libmoldname_a_SOURCES = 
 
 lib64_LIBRARIES += lib64/libmingwthrd.a
 lib64_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
 lib64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+
+processed_defs += lib64/msvcrt.def
+
 endif
 
 lib64_DATA = \
@@ -1117,6 +1119,7 @@
   $(top_srcdir)/lib64/*.mri \
   $(top_srcdir)/lib32/*.def \
   $(top_srcdir)/lib32/*.def.in \
+  $(top_srcdir)/lib64/*.def.in \
   $(top_srcdir)/def-include/*.def.in \
   $(top_srcdir)/lib32/*.mri \
   crt/binmode.c \

mingw-w64-crt/crt/isascii.c

diff --git a/mingw-w64-crt/crt/isascii.c b/mingw-w64-crt/crt/isascii.c
deleted file mode 100644
index 39d0bfa..0000000
--- a/mingw-w64-crt/crt/isascii.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#include <ctype.h>
-
-#undef isascii
-int isascii (int);
-
-int
-isascii (int c)
-{
-	return __isascii(c);
-}

mingw-w64-crt/crt/iscsym.c

diff --git a/mingw-w64-crt/crt/iscsym.c b/mingw-w64-crt/crt/iscsym.c
deleted file mode 100644
index f879cfe..0000000
--- a/mingw-w64-crt/crt/iscsym.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#include <ctype.h>
-#undef iscsym
-
-int iscsym (int);
-
-int
-iscsym (int c)
-{
-	return __iscsym(c);
-}

mingw-w64-crt/crt/iscsymf.c

diff --git a/mingw-w64-crt/crt/iscsymf.c b/mingw-w64-crt/crt/iscsymf.c
deleted file mode 100644
index 5b759c5..0000000
--- a/mingw-w64-crt/crt/iscsymf.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#include <ctype.h>
-#undef iscsymf
-
-int iscsymf (int);
-
-int
-iscsymf (int c)
-{
-	return __iscsymf(c);
-}

mingw-w64-crt/crt/strcasecmp.c

diff --git a/mingw-w64-crt/crt/strcasecmp.c b/mingw-w64-crt/crt/strcasecmp.c
deleted file mode 100644
index 02e000a..0000000
--- a/mingw-w64-crt/crt/strcasecmp.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#define __CRT__NO_INLINE
-#include <string.h>
-
-#undef strcasecmp
-int strcasecmp (const char *, const char *);
-int
-strcasecmp (const char *sz1, const char *sz2)
-{
-  return _stricmp (sz1,sz2);
-}

mingw-w64-crt/crt/strncasecmp.c

diff --git a/mingw-w64-crt/crt/strncasecmp.c b/mingw-w64-crt/crt/strncasecmp.c
deleted file mode 100644
index 39349d1..0000000
--- a/mingw-w64-crt/crt/strncasecmp.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#define __CRT__NO_INLINE
-#include <string.h>
-
-#undef strncasecmp
-int strncasecmp (const char *, const char *, size_t);
-
-int
-strncasecmp (const char *sz1,const char *sz2,size_t sizeMaxCompare)
-{
-  return _strnicmp (sz1,sz2,sizeMaxCompare);
-}

mingw-w64-crt/crt/toascii.c

diff --git a/mingw-w64-crt/crt/toascii.c b/mingw-w64-crt/crt/toascii.c
deleted file mode 100644
index 5ca5eb8..0000000
--- a/mingw-w64-crt/crt/toascii.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#include <ctype.h>
-
-#undef toascii
-
-int toascii (int);
-
-int
-toascii (int c)
-{
-	return __toascii(c);
-}

mingw-w64-crt/crt/wcscmpi.c

diff --git a/mingw-w64-crt/crt/wcscmpi.c b/mingw-w64-crt/crt/wcscmpi.c
deleted file mode 100644
index d35141c..0000000
--- a/mingw-w64-crt/crt/wcscmpi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-
-#define __CRT__NO_INLINE
-#include <string.h>
-
-#undef wcscmpi
-int wcscmpi (const wchar_t *, const wchar_t *);
-
-int
-wcscmpi (const wchar_t * ws1,const wchar_t * ws2)
-{
-  return _wcsicmp (ws1,ws2);
-}

mingw-w64-crt/lib64/msvcrt.def.in

diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def.in
similarity index 99%
rename from mingw-w64-crt/lib64/msvcrt.def
rename to mingw-w64-crt/lib64/msvcrt.def.in
index b3b2a19..d21b65a 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def.in
@@ -5,6 +5,9 @@
 ; Written by Kai Tietz, 2007
 ;
 EXPORTS
+
+#include "msvcrt-common.def.in"
+
 $I10_OUTPUT
 ; public: __cdecl __non_rtti_object::__non_rtti_object(class __non_rtti_object const & __ptr64) __ptr64
 ; GCC = __ZN17__non_rtti_objectC2ERKS_