diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-06-18 13:45:37 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-06-18 13:45:37 +0400 |
| commit | 943072f45ca34caf7b55db16f412bed94f7c27bc (patch) | |
| tree | e796b9b0b1179779b5388554aa81d3198206ecb5 /winsup/cygwin/gcrt0.c | |
| parent | c38196884232bb12c0c4e04d1d31f6cbe1aca446 (diff) | |
* Makefile.in (VPATH): Drop CONFIG_DIR.
(EXTRA_DLL_OFILES): Remove.
(DLL_OFILES): Remove EXTRA_DLL_OFILES.
(ASFLAGS): Define as -D_WIN64 on x86_64.
(GMON_OFILES): Add mcountFunc.o.
($(srcdir)/$(TLSOFFSETS_H)): Use target_cpu rather than CONFIG_DIR.
* configure.ac (CONFIG_DIR): Remove definition.
* configure: Regenerate.
* gcrt0.c: Use latest version from Mingw-w64 project.
* gmon.c: Ditto.
* gmon.h: Ditto.
* mcount.c: Ditto.
* mcountFunc.S: Ditto, new file.
* profil.c: Ditto.
* profil.h: Ditto.
* config: Remove entire directory.
Diffstat (limited to 'winsup/cygwin/gcrt0.c')
| -rw-r--r-- | winsup/cygwin/gcrt0.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/winsup/cygwin/gcrt0.c b/winsup/cygwin/gcrt0.c index 19a941676..87c7d36ad 100644 --- a/winsup/cygwin/gcrt0.c +++ b/winsup/cygwin/gcrt0.c @@ -1,6 +1,6 @@ /* gcrt0.c - Copyright 1998, 1999, 2000, 2001 Red Hat, Inc. + Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc. This file is part of Cygwin. @@ -8,14 +8,22 @@ This software is a copyrighted work licensed under the terms of the Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ +/* + * This file is taken from Cygwin distribution. Please keep it in sync. + * The differences should be within __MINGW32__ guard. + */ + #include <sys/types.h> #include <stdlib.h> +#ifdef __MINGW32__ +#include <_bsd_types.h> +#endif + extern u_char etext asm ("etext"); extern u_char eprol asm ("__eprol"); extern void _mcleanup (void); -extern void monstartup (u_long, u_long); - +extern void monstartup (size_t, size_t); void _monstartup (void) __attribute__((__constructor__)); /* startup initialization for -pg support */ @@ -32,7 +40,7 @@ _monstartup (void) if (called++) return; - monstartup ((u_long) &eprol, (u_long) &etext); + monstartup ((size_t) &eprol, (size_t) &etext); atexit (&_mcleanup); } |