diff options
| -rwxr-xr-x | configure | 43 | ||||
| -rw-r--r-- | configure.in | 29 | ||||
| -rwxr-xr-x | sysdeps/hppa/configure | 34 | ||||
| -rw-r--r-- | sysdeps/hppa/configure.in | 22 |
4 files changed, 56 insertions, 72 deletions
diff --git a/configure b/configure index 6f9bde759d..2ce30a3265 100755 --- a/configure +++ b/configure @@ -6089,49 +6089,6 @@ _ACEOF fi -case "${host_cpu}-${host_os}" in - cris*) - libc_cv_asm_line_sep='@' - cat >>confdefs.h <<_ACEOF -#define ASM_LINE_SEP $libc_cv_asm_line_sep -_ACEOF - - ;; - hppa*linux*) - echo "$as_me:$LINENO: checking for assembler line separator" >&5 -echo $ECHO_N "checking for assembler line separator... $ECHO_C" >&6 -if test "${libc_cv_asm_line_sep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat > conftest.s <<EOF - nop ; is_old_puffin -EOF - if { ac_try='${CC-cc} -c $ASFLAGS conftest.s 1>&5' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - libc_cv_asm_line_sep='!' - else - if test -z "$enable_hacker_mode"; then - echo "*** You need a newer assembler to compile glibc" - rm -f conftest* - exit 1 - fi - libc_cv_asm_line_sep=';' - fi - rm -f conftest* -fi -echo "$as_me:$LINENO: result: $libc_cv_asm_line_sep" >&5 -echo "${ECHO_T}$libc_cv_asm_line_sep" >&6 - cat >>confdefs.h <<_ACEOF -#define ASM_LINE_SEP $libc_cv_asm_line_sep -_ACEOF - - ;; -esac - echo "$as_me:$LINENO: checking whether CFI directives are supported" >&5 echo $ECHO_N "checking whether CFI directives are supported... $ECHO_C" >&6 if test "${libc_cv_asm_cfi_directives+set}" = set; then diff --git a/configure.in b/configure.in index 829e93578b..9b8a1eb26d 100644 --- a/configure.in +++ b/configure.in @@ -1617,35 +1617,6 @@ elif test $libc_cv_asm_weakext_directive = yes; then AC_DEFINE(HAVE_ASM_WEAKEXT_DIRECTIVE) fi -dnl The standard hppa assembler uses `;' to start comments and `!' -dnl as a line separator. CRIS uses `;' to start comments and `@' for -dnl line separator. -case "${host_cpu}-${host_os}" in - cris*) - libc_cv_asm_line_sep='@' - AC_DEFINE_UNQUOTED(ASM_LINE_SEP, $libc_cv_asm_line_sep) - ;; - hppa*linux*) - AC_CACHE_CHECK(for assembler line separator, - libc_cv_asm_line_sep, [dnl - cat > conftest.s <<EOF - nop ; is_old_puffin -EOF - if AC_TRY_COMMAND(${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then - libc_cv_asm_line_sep='!' - else - if test -z "$enable_hacker_mode"; then - echo "*** You need a newer assembler to compile glibc" - rm -f conftest* - exit 1 - fi - libc_cv_asm_line_sep=';' - fi - rm -f conftest*]) - AC_DEFINE_UNQUOTED(ASM_LINE_SEP, $libc_cv_asm_line_sep) - ;; -esac - AC_CACHE_CHECK(whether CFI directives are supported, libc_cv_asm_cfi_directives, [dnl cat > conftest.s <<EOF .text diff --git a/sysdeps/hppa/configure b/sysdeps/hppa/configure new file mode 100755 index 0000000000..07bde0e0ee --- /dev/null +++ b/sysdeps/hppa/configure @@ -0,0 +1,34 @@ +# This file is generated from configure.in by Autoconf. DO NOT EDIT! + +hppa*linux*) +echo "$as_me:$LINENO: checking for assembler line separator" >&5 +echo $ECHO_N "checking for assembler line separator... $ECHO_C" >&6 +if test "${libc_cv_asm_line_sep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat > conftest.s <<EOF +nop ; is_old_puffin +EOF +if { ac_try='${CC-cc} -c $ASFLAGS conftest.s 1>&5' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + libc_cv_asm_line_sep='!' +else + if test -z "$enable_hacker_mode"; then + echo "*** You need a newer assembler to compile glibc" + rm -f conftest* + exit 1 + fi + libc_cv_asm_line_sep=';' +fi +rm -f conftest* +fi +echo "$as_me:$LINENO: result: $libc_cv_asm_line_sep" >&5 +echo "${ECHO_T}$libc_cv_asm_line_sep" >&6 +cat >>confdefs.h <<_ACEOF +#define ASM_LINE_SEP $libc_cv_asm_line_sep +_ACEOF + diff --git a/sysdeps/hppa/configure.in b/sysdeps/hppa/configure.in new file mode 100644 index 0000000000..1ec6780835 --- /dev/null +++ b/sysdeps/hppa/configure.in @@ -0,0 +1,22 @@ +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. + +dnl The standard hppa assembler uses `;' to start comments and `!' +dnl as a line separator. +hppa*linux*) +AC_CACHE_CHECK(for assembler line separator, + libc_cv_asm_line_sep, [dnl +cat > conftest.s <<EOF +nop ; is_old_puffin +EOF +if AC_TRY_COMMAND(${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then + libc_cv_asm_line_sep='!' +else + if test -z "$enable_hacker_mode"; then + echo "*** You need a newer assembler to compile glibc" + rm -f conftest* + exit 1 + fi + libc_cv_asm_line_sep=';' +fi +rm -f conftest*]) +AC_DEFINE_UNQUOTED(ASM_LINE_SEP, $libc_cv_asm_line_sep) |