mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
* Makefile (distribute): Add ChangeLog.[0-9].
* configure.in: Add check for .set directive. * config.h.in: Add #undef HAVE_ASM_SET_DIRECTIVE. * Makerules [! subdir] (O%-lib): Don't prepend ../. * sysdeps/generic/expm1.c: #undef expm1 before weak_alias. See ChangeLog.4 for earlier changes.
This commit is contained in:
Roland McGrath
103
configure
vendored
103
configure
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
# From configure.in CVSid
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated automatically using autoconf version 2.2
|
||||
# Generated automatically using autoconf version 2.3
|
||||
# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
|
||||
#
|
||||
# This configure script is free software; the Free Software Foundation
|
||||
@ -14,6 +14,8 @@ ac_default_prefix=/usr/local
|
||||
# Any additions from configure.in:
|
||||
ac_help="$ac_help
|
||||
--with-gmp=DIRECTORY find GMP source code in DIRECTORY (not needed)"
|
||||
ac_help="$ac_help
|
||||
--with-fp if using floating-point hardware"
|
||||
ac_help="$ac_help
|
||||
--with-gnu-binutils if using GNU binutils (as and ld)"
|
||||
ac_help="$ac_help
|
||||
@ -235,7 +237,7 @@ EOF
|
||||
verbose=yes ;;
|
||||
|
||||
-version | --version | --versio | --versi | --vers)
|
||||
echo "configure generated by autoconf version 2.2"
|
||||
echo "configure generated by autoconf version 2.3"
|
||||
exit 0 ;;
|
||||
|
||||
-with-* | --with-*)
|
||||
@ -401,8 +403,8 @@ fi
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
|
||||
ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
|
||||
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
|
||||
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
|
||||
|
||||
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
|
||||
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
|
||||
@ -444,10 +446,18 @@ esac
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-fp or --without-fp was given.
|
||||
withval="$with_fp"
|
||||
if test -n "$withval"; then
|
||||
with_fp=$withval
|
||||
else
|
||||
with_fp=yes
|
||||
fi
|
||||
|
||||
# Check whether --with-gnu-binutils or --without-gnu-binutils was given.
|
||||
withval="$with_gnu_binutils"
|
||||
if test -n "$withval"; then
|
||||
gnu_binutils=yes
|
||||
gnu_binutils=$withval
|
||||
else
|
||||
gnu_binutils=no
|
||||
fi
|
||||
@ -455,7 +465,7 @@ fi
|
||||
# Check whether --with-gnu-ld or --without-gnu-ld was given.
|
||||
withval="$with_gnu_ld"
|
||||
if test -n "$withval"; then
|
||||
gnu_ld=yes
|
||||
gnu_ld=$withval
|
||||
else
|
||||
gnu_ld=no
|
||||
fi
|
||||
@ -463,7 +473,7 @@ fi
|
||||
# Check whether --with-gnu-as or --without-gnu-as was given.
|
||||
withval="$with_gnu_as"
|
||||
if test -n "$withval"; then
|
||||
gnu_as=yes
|
||||
gnu_as=$withval
|
||||
else
|
||||
gnu_as=no
|
||||
fi
|
||||
@ -472,7 +482,7 @@ test $gnu_binutils = yes && gnu_as=yes gnu_ld=yes
|
||||
# Check whether --with-elf or --without-elf was given.
|
||||
withval="$with_elf"
|
||||
if test -n "$withval"; then
|
||||
elf=yes
|
||||
elf=$withval
|
||||
else
|
||||
elf=no
|
||||
fi
|
||||
@ -480,7 +490,7 @@ fi
|
||||
# Check whether --with-weak-symbols or --without-weak-symbols was given.
|
||||
withval="$with_weak_symbols"
|
||||
if test -n "$withval"; then
|
||||
weak=yes
|
||||
weak=$withval
|
||||
else
|
||||
weak=no
|
||||
fi
|
||||
@ -597,7 +607,7 @@ os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`"
|
||||
case "$os" in
|
||||
gnu*)
|
||||
base_os=mach/hurd ;;
|
||||
netbsd* | 386bsd*)
|
||||
netbsd* | 386bsd* | freebsd* | bsdi*)
|
||||
base_os=unix/bsd/bsd4.4 ;;
|
||||
osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
|
||||
base_os=unix/bsd ;;
|
||||
@ -670,11 +680,24 @@ fi
|
||||
|
||||
# We have now validated the configuration.
|
||||
|
||||
# Some configurations imply other options.
|
||||
case "$host_os" in
|
||||
gnu* | linux* | bsd4.4* | netbsd* | freebsd*)
|
||||
# These systems always use GNU tools.
|
||||
gnu_ld=yes gnu_as=yes
|
||||
esac
|
||||
case "$host_os" in
|
||||
gnu*elf* | linux* | sysv4* | solaris2*)
|
||||
# These systems always use the ELF format.
|
||||
elf=yes
|
||||
esac
|
||||
|
||||
|
||||
# Remove the leading slashes.
|
||||
sysnames="`echo $sysnames | sed -e 's@^/@@' -e 's@ /@ @g'`"
|
||||
|
||||
# Prepend the machine's FPU directory unless --without-fp.
|
||||
if test "$with_fp" = no; then
|
||||
if test "$with_fp" = yes; then
|
||||
fpu_dirs=
|
||||
for m in $mach; do
|
||||
if test -d $sysdep_dir$m/fpu; then
|
||||
@ -684,6 +707,19 @@ if test "$with_fp" = no; then
|
||||
sysnames="`echo $fpu_dirs | sed -e 's,^/,,' -e 's, /,,g'` $sysnames"
|
||||
fi
|
||||
|
||||
# If using ELF, prepend the machine-specific ELF ABI directory.
|
||||
if test "$elf" = yes; then
|
||||
elf_dirs=
|
||||
for m in $mach; do
|
||||
if test -d $sysdep_dir$m/elf; then
|
||||
elf_dirs="elf_dirs $m/elf"
|
||||
fi
|
||||
done
|
||||
sysnames="`echo elf_dirs | sed -e 's,^/,,' -e 's, /,,g'` $sysnames"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Expand the list of system names into a full list of directories
|
||||
# from each element's parent name and Implies file (if present).
|
||||
set $sysnames
|
||||
@ -745,15 +781,6 @@ fi
|
||||
sysnames="$libc_cv_sysdirs"
|
||||
echo "$ac_t""${sysnames}" 1>&4
|
||||
|
||||
case "$host_os" in
|
||||
gnu* | linux* | bsd4.4* | netbsd* | freebsd*)
|
||||
gnu_ld=yes gnu_as=yes
|
||||
esac
|
||||
case "$host_os" in
|
||||
gnu*elf* | linux*elf* | sysv4* | solaris2*)
|
||||
elf=yes
|
||||
esac
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
# incompatible versions:
|
||||
@ -972,7 +999,7 @@ else
|
||||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 976 "configure"
|
||||
#line 1003 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
@ -986,7 +1013,7 @@ else
|
||||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 990 "configure"
|
||||
#line 1017 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
@ -1038,7 +1065,7 @@ if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&4
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1042 "configure"
|
||||
#line 1069 "configure"
|
||||
#include "confdefs.h"
|
||||
#define __need_size_t
|
||||
#define __need_wchar_t
|
||||
@ -1093,6 +1120,32 @@ if test $libc_cv_need_minus_P = yes; then
|
||||
asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives."
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for .set assembler directive""... $ac_c" 1>&4
|
||||
if eval "test \"`echo '$''{'libc_cv_asm_set_directive'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&4
|
||||
else
|
||||
cat > conftest.s <<\EOF
|
||||
.text
|
||||
foo: .long 0
|
||||
.set bar,foo
|
||||
EOF
|
||||
if ${CC-cc} $CFLAGS -c conftest.s 2>/dev/null; then
|
||||
libc_cv_asm_set_directive=yes
|
||||
else
|
||||
libc_cv_asm_set_directive=no
|
||||
fi
|
||||
rm -f contest*
|
||||
fi
|
||||
|
||||
echo "$ac_t""$libc_cv_asm_set_directive" 1>&4
|
||||
if test $libc_cv_asm_set_directive = yes; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_ASM_SET_DIRECTIVE 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# sysdeps configure fragments may set these with files to be linked below.
|
||||
libc_link_dests=
|
||||
libc_link_sources=
|
||||
@ -1282,7 +1335,7 @@ do
|
||||
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
|
||||
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
|
||||
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
|
||||
echo "$CONFIG_STATUS generated by autoconf version 2.2"
|
||||
echo "$CONFIG_STATUS generated by autoconf version 2.3"
|
||||
exit 0 ;;
|
||||
-help | --help | --hel | --he | --h)
|
||||
echo "\$ac_cs_usage"; exit 0 ;;
|
||||
@ -1293,7 +1346,7 @@ done
|
||||
ac_given_srcdir=$srcdir
|
||||
ac_given_INSTALL="$INSTALL"
|
||||
|
||||
trap 'rm -fr `echo config.make ${config_makefile} ${config_uname} config.h | tr : " "` conftest*; exit 1' 1 2 15
|
||||
trap 'rm -fr `echo "config.make ${config_makefile} ${config_uname} config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
|
||||
|
||||
# Protect against being on the right side of a sed subst in config.status.
|
||||
sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g;
|
||||
|
||||
Reference in New Issue
Block a user