diff options
87 files changed, 142 insertions, 7200 deletions
diff --git a/Makeconfig b/Makeconfig index 2d2f727d85..ce2d16dcc5 100644 --- a/Makeconfig +++ b/Makeconfig @@ -139,10 +139,10 @@ endif #### -# Set this to either `stdio' or `libio', to compile in either GNU stdio -# or GNU libio. +# Set this to the name of the subdirectory that implements stdio. +# The only option right now is `libio'. ifndef stdio -stdio = stdio +stdio = libio endif # Common prefix for machine-independent installation directories. @@ -762,6 +762,7 @@ $(common-objpfx)shlib-versions.v.i: \ $(add-ons) \ $(subdirs))) $(common-objpfx)soversions.i: $(common-objpfx)shlib-versions.v + default_setname='$(filter-out %_default,$(oldest-abi:%=GLIBC_%))'; \ while read conf version setname; do \ test -n "$$version" && \ test `expr '$(config-machine)-$(config-vendor)-$(config-os)' \ @@ -769,6 +770,7 @@ $(common-objpfx)soversions.i: $(common-objpfx)shlib-versions.v if test "x$$version" = xDEFAULT; then \ default_setname="$$setname"; \ else \ + $(abi-default_setname) \ lib=`echo $$version | sed 's/=.*$$//'`; \ if eval test -z "\$${versioned_$${lib}}"; then \ eval versioned_$${lib}=yes; \ diff --git a/config.make.in b/config.make.in index edd47a51bc..ae756afd58 100644 --- a/config.make.in +++ b/config.make.in @@ -75,7 +75,6 @@ build-profile = @profile@ build-omitfp = @omitfp@ build-bounded = @bounded@ build-static-nss = @static_nss@ -stdio = @stdio@ add-ons = @subdirs@ cross-compiling = @cross_compiling@ force-install = @force_install@ @@ -45,8 +45,6 @@ ac_help="$ac_help [e.g. /usr/src/linux/include] [default=compiler default]" ac_help="$ac_help - --enable-libio build in GNU libio instead of GNU stdio" -ac_help="$ac_help --disable-sanity-checks really do not use threads (should not be used except in special situations) [default=yes]" ac_help="$ac_help @@ -734,19 +732,6 @@ else fi -# Check whether --enable-libio or --disable-libio was given. -if test "${enable_libio+set}" = set; then - enableval="$enable_libio" - if test $enableval = yes; then - stdio=libio - else - stdio=stdio - fi -else - stdio=default -fi - - # Check whether --enable-sanity-checks or --disable-sanity-checks was given. if test "${enable_sanity_checks+set}" = set; then enableval="$enable_sanity_checks" @@ -922,7 +907,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:926: checking host system type" >&5 +echo "configure:911: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1070,7 +1055,7 @@ fi # This can take a while to compute. sysdep_dir=$srcdir/sysdeps echo $ac_n "checking sysdep dirs""... $ac_c" 1>&6 -echo "configure:1074: checking sysdep dirs" >&5 +echo "configure:1059: checking sysdep dirs" >&5 # Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1. os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`" @@ -1293,7 +1278,7 @@ echo "$ac_t""$default_sysnames" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1297: checking for a BSD compatible install" >&5 +echo "configure:1282: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1350,7 +1335,7 @@ if test "$INSTALL" = "${srcdir}/scripts/install-sh -c"; then INSTALL='\$(..)./scripts/ins |