diff options
| -rw-r--r-- | libgcc/ChangeLog | 6 | ||||
| -rw-r--r-- | libgcc/configure | 6 | ||||
| -rw-r--r-- | libgcc/configure.ac | 11 |
3 files changed, 19 insertions, 4 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index c6ac0b40183..f0faa8f7926 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2010-09-28 Ian Lance Taylor <iant@google.com> + + * configure.ac: Adjust CFI test to test assembler directly rather + than checking gcc preprocessor macro. + * configure: Rebuild. + 2010-09-27 Ian Lance Taylor <iant@google.com> * configure.ac: Test whether assembler supports CFI directives. diff --git a/libgcc/configure b/libgcc/configure index 56195bb106d..dad6c49746a 100644 --- a/libgcc/configure +++ b/libgcc/configure @@ -3715,7 +3715,11 @@ if test "${libgcc_cv_cfi+set}" = set; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int i = __GCC_HAVE_DWARF2_CFI_ASM; +asm("\n\ + .text\n\ + .cfi_startproc\n\ + .cfi_personality 0, symbol\n\ + .cfi_endproc"); _ACEOF if ac_fn_c_try_compile "$LINENO"; then : libgcc_cv_cfi=yes diff --git a/libgcc/configure.ac b/libgcc/configure.ac index 6bb4844b882..caade3317b3 100644 --- a/libgcc/configure.ac +++ b/libgcc/configure.ac @@ -137,9 +137,14 @@ AC_SUBST(fixed_point) # Check for assembler CFI support. AC_CACHE_CHECK([whether assembler supports CFI directives], [libgcc_cv_cfi], - [AC_COMPILE_IFELSE([int i = __GCC_HAVE_DWARF2_CFI_ASM;], - [libgcc_cv_cfi=yes], - [libgcc_cv_cfi=no])]) + [AC_COMPILE_IFELSE( +[asm("\n\ + .text\n\ + .cfi_startproc\n\ + .cfi_personality 0, symbol\n\ + .cfi_endproc");], + [libgcc_cv_cfi=yes], + [libgcc_cv_cfi=no])]) # Check 32bit or 64bit for x86. case ${host} in |