Menu
▾
▴
[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. 66fd95c73404ecd59e84ac01a7b772e33e5e1fff
|
From: Earnie B. <no...@so...> - 2012-09-19 18:39:47
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Repository: mingw.org-wsl". The branch, redo-filters has been updated via 66fd95c73404ecd59e84ac01a7b772e33e5e1fff (commit) via f1c055a57560d3ddd06b765e1f958d39550dc64f (commit) via 9e9d065666e3e21edb1d04ff08d499049cc5a831 (commit) from 73f6ac0c5a3c485b0bcea20e05f06dc9f705bf6c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h= commit fd0c88828fac399eb5b703354584b6fdc03b8e93 Author: Earnie Boyd <ea...@us...> Date: Fri Sep 7 10:36:34 2012 -0400 Remove filters for CRTDLL and __MSVCRT__. * Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__. * crt1.o: Remove CRTDLL specific target. * dllcrt1.o: Ditto. * gcrt1.o: Ditto. * include/assert.h: Modify documentation to remove the use of CRTDLL. * include/setjmp.h: Ditto. * src/libcrt/crt/ofmt_stub.s: Ditto. * include/ctype.h: Ditto. Remove filters for __MSVCRT__ and unneeded #else coding. * include/dirent.h: Ditto. * include/dos.h: Ditto. * include/io.h: Ditto. * include/math.h: Ditto. * include/process.h: Ditto. * include/stdio.h: Ditto. * include/stdlib.h: Ditto. * include/string.h: Ditto. * include/sys/stat.h: Ditto. * include/sys/types.h: Ditto. * include/sys/utime.h: Ditto. * include/tchar.h: Ditto. * include/time.h: Ditto. * include/wchar.h: Ditto. * include/wctype.h: Ditto. * src/libcrt/crt/crt1.c: Ditto. * src/libcrt/crt/init.c: Ditto. * lib/lib32/moldname.def.in: Remove filters for __CRTDLL__. * src/libcrt/tlssup.c: Remove filter for CRTDLL. diff --git a/ChangeLog b/ChangeLog index 456f89f..7f5dc47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,38 @@ 2012-09-07 Earnie Boyd <ea...@us...> + Remove filters for CRTDLL and __MSVCRT__. + + * Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__. + * crt1.o: Remove CRTDLL specific target. + * dllcrt1.o: Ditto. + * gcrt1.o: Ditto. + * include/assert.h: Modify documentation to remove the use of CRTDLL. + * include/setjmp.h: Ditto. + * src/libcrt/crt/ofmt_stub.s: Ditto. + * include/ctype.h: Ditto. + Remove filters for __MSVCRT__ and unneeded #else coding. + * include/dirent.h: Ditto. + * include/dos.h: Ditto. + * include/io.h: Ditto. + * include/math.h: Ditto. + * include/process.h: Ditto. + * include/stdio.h: Ditto. + * include/stdlib.h: Ditto. + * include/string.h: Ditto. + * include/sys/stat.h: Ditto. + * include/sys/types.h: Ditto. + * include/sys/utime.h: Ditto. + * include/tchar.h: Ditto. + * include/time.h: Ditto. + * include/wchar.h: Ditto. + * include/wctype.h: Ditto. + * src/libcrt/crt/crt1.c: Ditto. + * src/libcrt/crt/init.c: Ditto. + * lib/lib32/moldname.def.in: Remove filters for __CRTDLL__. + * src/libcrt/tlssup.c: Remove filter for CRTDLL. + +2012-09-07 Earnie Boyd <ea...@us...> + Apply LICENSE to all files as appropriate. * tests/Makefile.in: Add file preamble. diff --git a/Makefile.in b/Makefile.in index 9a8d6e8..d32a229 100644 --- a/Makefile.in +++ b/Makefile.in @@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in $(CC) -DRUNTIME=$(basename $(notdir $@)) \ -D__FILENAME__=$@ \ -D__$(basename $(notdir $@))__=1 \ - -D__MSVCRT__ -C -E -P -xc-header \ + -C -E -P -xc-header \ $? > $@ @@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in $(CC) -DRUNTIME=$(basename $(notdir $@)) \ -D__FILENAME__=$$F \ -D__$(basename $(notdir $@))__=1 \ - -D__MSVCRT__ -C -E -P -xc-header \ + -C -E -P -xc-header \ $? > $@ SRCDIR := lib/lib32 @@ -693,13 +693,9 @@ lib%.a: %.o $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< SRCDIR := src/libcrt/crt -$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o: - $(MKDIR_P) $(@D) - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $< - $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o: $(MKDIR_P) $(@D) - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $< + $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c @@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES) $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $< SRCDIR := misc/gpl/profile -$(SRCDIR)/gcrt1.o: - mkdir -p $(@D) - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $< - $(SRCDIR)/gcrt2.o: mkdir -p $(@D) - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $< + $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c diff --git a/include/assert.h b/include/assert.h index 1eddeed..6f9cdd0 100644 --- a/include/assert.h +++ b/include/assert.h @@ -53,7 +53,7 @@ extern "C" { #else /* debugging enabled */ /* - * CRTDLL nicely supplies a function which does the actual output and + * The runtime nicely supplies a function which does the actual output and * call to abort. */ _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN; diff --git a/include/ctype.h b/include/ctype.h index 28ca1a9..e744a09 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int); /* * NOTE: The above are not old name type wrappers, but functions exported - * explicitly by MSVCRT/CRTDLL. However, underscored versions are also + * explicitly by MSVCRT.DLL. However, underscored versions are also * exported. */ #ifndef __STRICT_ANSI__ @@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int); /* Also defined in stdlib.h */ #ifndef MB_CUR_MAX #ifdef __DECLSPEC_SUPPORTED -# ifdef __MSVCRT__ -# define MB_CUR_MAX __mb_cur_max __MINGW_IMPORT int __mb_cur_max; -# else /* not __MSVCRT */ -# define MB_CUR_MAX __mb_cur_max_dll - __MINGW_IMPORT int __mb_cur_max_dll; -# endif /* not __MSVCRT */ - +# define MB_CUR_MAX __mb_cur_max #else /* ! __DECLSPEC_SUPPORTED */ -# ifdef __MSVCRT__ extern int* _imp____mb_cur_max; # define MB_CUR_MAX (*_imp____mb_cur_max) -# else /* not __MSVCRT */ - extern int* _imp____mb_cur_max_dll; -# define MB_CUR_MAX (*_imp____mb_cur_max_dll) -# endif /* not __MSVCRT */ #endif /* __DECLSPEC_SUPPORTED */ #endif /* MB_CUR_MAX */ @@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int); # if __MSVCRT_VERSION__ <= 0x0700 __MINGW_IMPORT unsigned short _ctype[]; # endif -# ifdef __MSVCRT__ __MINGW_IMPORT unsigned short* _pctype; -# else /* CRTDLL */ - __MINGW_IMPORT unsigned short* _pctype_dll; -# define _pctype _pctype_dll -# endif #else /* __DECLSPEC_SUPPORTED */ # if __MSVCRT_VERSION__ <= 0x0700 extern unsigned short** _imp___ctype; # define _ctype (*_imp___ctype) # endif -# ifdef __MSVCRT__ extern unsigned short** _imp___pctype; # define _pctype (*_imp___pctype) -# else /* CRTDLL */ - extern unsigned short** _imp___pctype_dll; -# define _pctype (*_imp___pctype_dll) -# endif /* CRTDLL */ #endif /* __DECLSPEC_SUPPORTED */ /* diff --git a/include/direct.h b/include/direct.h index 149b8ed..5c576f5 100644 --- a/include/direct.h +++ b/include/direct.h @@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre #ifndef _WDIRECT_DEFINED /* wide character versions. Also in wchar.h */ -#ifdef __MSVCRT__ _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*); _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int); _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int); _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*); _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*); -#endif /* __MSVCRT__ */ #define _WDIRECT_DEFINED #endif diff --git a/include/dos.h b/include/dos.h index 25d06d4..e2c629f 100644 --- a/include/dos.h +++ b/include/dos.h @@ -46,41 +46,6 @@ extern "C" { #endif -#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */ -#ifndef __DECLSPEC_SUPPORTED -extern unsigned int *_imp___basemajor_dll; -extern unsigned int *_imp___baseminor_dll; -extern unsigned int *_imp___baseversion_dll; -extern unsigned int *_imp___osmajor_dll; -extern unsigned int *_imp___osminor_dll; -extern unsigned int *_imp___osmode_dll; - -#define _basemajor (*_imp___basemajor_dll) -#define _baseminor (*_imp___baseminor_dll) -#define _baseversion (*_imp___baseversion_dll) -#define _osmajor (*_imp___osmajor_dll) -#define _osminor (*_imp___osminor_dll) -#define _osmode (*_imp___osmode_dll) - -#else /* __DECLSPEC_SUPPORTED */ - -__MINGW_IMPORT unsi |