diff options
| author | Kevin Ryde <user42@zip.com.au> | 2001-11-15 23:03:51 +0100 |
|---|---|---|
| committer | Kevin Ryde <user42@zip.com.au> | 2001-11-15 23:03:51 +0100 |
| commit | 39afc22107404102e672a5bd541165513eead033 (patch) | |
| tree | 7b27074c681df6062f5534824357455e71acfb23 /aclocal.m4 | |
| parent | ee3a55b152d8bd0a21a818ba54a57f70df7fe47b (diff) | |
| download | gmp-39afc22107404102e672a5bd541165513eead033.tar.gz | |
Regenerate for:
* acinclude.m4 (GMP_ASM_X86_MCOUNT): Update to $lt_prog_compiler_pic
for current libtool, recognise non-PIC style mcount in windows DLLs.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 5dc62c48d..ca24e228b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -998,7 +998,7 @@ dnl dnl The compiler output is grepped for the right directive. It's not dnl considered wise to just probe for ".section .rodata" or whatever works, dnl since arbitrary section names might be accepted, but not necessarily do -dnl the right thing when the get to the linker. +dnl the right thing when they get to the linker. dnl dnl Only a few asm files use RODATA, so this code is perhaps a bit dnl excessive right now, but should find more uses in the future. @@ -1386,7 +1386,7 @@ dnl _mcount_ptr, and for PIC it can be called through a GOT entry, or via dnl the PLT. If a pointer to a counter is required it's passed in %eax or dnl %edx. dnl -dnl Flags to specify PIC are taken from $ac_cv_prog_cc_pic set by +dnl Flags to specify PIC are taken from $lt_prog_compiler_pic set by dnl AC_PROG_LIBTOOL. dnl dnl Enhancement: Cache the values determined here. But what's the right way @@ -1419,10 +1419,18 @@ if test "$enable_static" = yes; then fi if test "$enable_shared" = yes; then - gmp_asmout_compile="$CC $CFLAGS $CPPFLAGS $ac_cv_prog_cc_pic -S conftest.c 1>&AC_FD_CC" + gmp_asmout_compile="$CC $CFLAGS $CPPFLAGS $lt_prog_compiler_pic -S conftest.c 1>&AC_FD_CC" if AC_TRY_EVAL(gmp_asmout_compile); then if grep '\.data' conftest.s >/dev/null; then - mcount_pic_reg=`sed -n ['s/.*GOTOFF.*,\(%[a-z]*\).*$/\1/p'] conftest.s` + case $lt_prog_compiler_pic in + *-DDLL_EXPORT*) + # Windows DLLs have non-PIC style mcount + mcount_pic_reg=`sed -n ['/esp/!s/.*movl.*,\(%[a-z]*\).*$/\1/p'] conftest.s` + ;; + *) + mcount_pic_reg=`sed -n ['s/.*GOTOFF.*,\(%[a-z]*\).*$/\1/p'] conftest.s` + ;; + esac else mcount_pic_reg= fi |