diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-06-18 09:45:37 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-06-18 09:45:37 +0000 |
| commit | 943072f45ca34caf7b55db16f412bed94f7c27bc (patch) | |
| tree | e796b9b0b1179779b5388554aa81d3198206ecb5 /winsup/cygwin/mcount.c | |
| parent | c38196884232bb12c0c4e04d1d31f6cbe1aca446 (diff) | |
| download | cygnal-943072f45ca34caf7b55db16f412bed94f7c27bc.tar.gz cygnal-943072f45ca34caf7b55db16f412bed94f7c27bc.tar.bz2 cygnal-943072f45ca34caf7b55db16f412bed94f7c27bc.zip | |
* 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/mcount.c')
| -rw-r--r-- | winsup/cygwin/mcount.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/winsup/cygwin/mcount.c b/winsup/cygwin/mcount.c index 4f69864b3..fad672881 100644 --- a/winsup/cygwin/mcount.c +++ b/winsup/cygwin/mcount.c @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,8 +31,16 @@ static char rcsid[] = "$OpenBSD: mcount.c,v 1.6 1997/07/23 21:11:27 kstailey Exp $"; #endif +/* + * This file is taken from Cygwin distribution. Please keep it in sync. + * The differences should be within __MINGW32__ guard. + */ + +#ifndef __MINGW32__ +#include <sys/param.h> +#endif #include <sys/types.h> -#include <gmon.h> +#include "gmon.h" /* * mcount is called on entry to each function compiled with the profiling @@ -53,9 +57,10 @@ static char rcsid[] = "$OpenBSD: mcount.c,v 1.6 1997/07/23 21:11:27 kstailey Exp * both frompcindex and frompc. Any reasonable, modern compiler will * perform this optimization. */ -//_MCOUNT_DECL __P((u_long frompc, u_long selfpc)); -_MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */ - register u_long frompc, selfpc; +/* _mcount; may be static, inline, etc */ +_MCOUNT_DECL (size_t, size_t); + +_MCOUNT_DECL (size_t frompc, size_t selfpc) { register u_short *frompcindex; register struct tostruct *top, *prevtop; |