diff options
| -rw-r--r-- | sys/amd64/amd64/prof_machdep.c | 13 | ||||
| -rw-r--r-- | sys/amd64/include/asmacros.h | 4 | ||||
| -rw-r--r-- | sys/i386/include/asmacros.h | 4 | ||||
| -rw-r--r-- | sys/i386/isa/prof_machdep.c | 11 |
4 files changed, 8 insertions, 24 deletions
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c index d78365f..4c57f34 100644 --- a/sys/amd64/amd64/prof_machdep.c +++ b/sys/amd64/amd64/prof_machdep.c @@ -375,17 +375,4 @@ stopguprof(gp) } #endif } - -#else /* !GUPROF */ -#ifdef __GNUCLIKE_ASM -__asm(" \n\ - .text \n\ - .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mexitcount)) " \n\ -" __XSTRING(HIDENAME(mexitcount)) ": \n\ - ret \n\ -"); -#else /* !__GNUCLIKE_ASM */ -#error this file needs to be ported to your compiler -#endif /* __GNUCLIKE_ASM */ #endif /* GUPROF */ diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h index 9c0f655..81fed27 100644 --- a/sys/amd64/include/asmacros.h +++ b/sys/amd64/include/asmacros.h @@ -108,8 +108,12 @@ #define FAKE_MCOUNT(caller) pushq caller ; call __mcount ; popq %rcx #define MCOUNT call __mcount #define MCOUNT_LABEL(name) GEN_ENTRY(name) ; nop ; ALIGN_TEXT +#ifdef GUPROF #define MEXITCOUNT call HIDENAME(mexitcount) #define ret MEXITCOUNT ; NON_GPROF_RET +#else +#define MEXITCOUNT +#endif #else /* !GPROF */ /* diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h index b9f027e..a95eff0 100644 --- a/sys/i386/include/asmacros.h +++ b/sys/i386/include/asmacros.h @@ -108,8 +108,12 @@ #define FAKE_MCOUNT(caller) pushl caller ; call __mcount ; popl %ecx #define MCOUNT call __mcount #define MCOUNT_LABEL(name) GEN_ENTRY(name) ; nop ; ALIGN_TEXT +#ifdef GUPROF #define MEXITCOUNT call HIDENAME(mexitcount) #define ret MEXITCOUNT ; NON_GPROF_RET +#else +#define MEXITCOUNT +#endif #else /* !GPROF */ /* diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c index b286d7b..0f399a3 100644 --- a/sys/i386/isa/prof_machdep.c +++ b/sys/i386/isa/prof_machdep.c @@ -349,15 +349,4 @@ stopguprof(gp) } #endif } - -#else /* !GUPROF */ -#ifdef __GNUCLIKE_ASM -__asm(" \n\ - .text \n\ - .p2align 4,0x90 \n\ - .globl " __XSTRING(HIDENAME(mexitcount)) " \n\ -" __XSTRING(HIDENAME(mexitcount)) ": \n\ - ret \n\ -"); -#endif /* __GNUCLIKE_ASM */ #endif /* GUPROF */ |
