From dc9972317e6fe44e503fbfe83446272743c76fb3 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 22 May 1996 18:02:38 +0000 Subject: [PATCH] Regenerated: autoconf configure.in --- Makefile | 1 - Makerules | 10 ++--- config.make.in | 3 -- configure | 107 +++----------------------------------------- configure.in | 3 -- extract-dynsym | 23 ---------- misc/sys/syslog.h | 2 +- posix/regex.c | 13 +++++- termios/cfmakeraw.c | 6 +-- 9 files changed, 26 insertions(+), 142 deletions(-) delete mode 100755 extract-dynsym diff --git a/Makefile b/Makefile index ae32c77001..24203a2aa0 100644 --- a/Makefile +++ b/Makefile @@ -225,7 +225,6 @@ distribute := README INSTALL FAQ NOTES COPYING.LIB COPYING NEWS \ Makefile Makeconfig Makerules Rules Make-dist MakeTAGS \ extra-lib.mk o-iterator.mk \ ansidecl.h mkinstalldirs move-if-change install-sh \ - extract-dynsym \ configure configure.in aclocal.m4 config.sub config.guess\ config.make.in config-name.in Makefile.in \ munch-tmpl.c munch.awk sysdep.h set-hooks.h libc-symbols.h diff --git a/Makerules b/Makerules index 2ccfeae3fb..f2c7a7d66d 100644 --- a/Makerules +++ b/Makerules @@ -302,7 +302,7 @@ override objects := $(addprefix $(objpfx),$(sources:.c=.o)) # $(o-iterator-doit) to produce some desired rule using $o for the object # suffix, and setting $(object-suffixes-left) to $(object-suffixes); a copy # is produced for each object suffix in use. -o-iterator = $(patsubst %,$(..)o-iterator.mk,$(object-suffixes)) +o-iterator = $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left)) # The makefile may define $(extra-libs) with `libfoo libbar' # to build libfoo.a et al from the modules listed in $(libfoo-routines). @@ -599,7 +599,7 @@ define o-iterator-doit $(libdir)/$o: $(libdir)/$o$($o-version); $$(make-link) endef object-suffixes-left := $(versioned) -include $(..)o-iterator.mk +include $(o-iterator) # Make symlinks in the build directory, because the versioned names might # be referenced by a DT_NEEDED in another library. @@ -607,20 +607,20 @@ define o-iterator-doit $(objpfx)$o$($o-version): $(objpfx)$o; $$(make-link) endef object-suffixes-left := $(versioned) -include $(..)o-iterator.mk +include $(o-iterator) define o-iterator-doit $(libdir)/$o$($o-version): $(libdir)/$(o:.so=)-$(version).so; $$(make-link) endef object-suffixes-left := $(versioned) -include $(..)o-iterator.mk +include $(o-iterator) define o-iterator-doit $(libdir)/$(o:.so=)-$(version).so: $(objpfx)$o; $$(do-install-program) endef object-suffixes-left := $(versioned) -include $(..)o-iterator.mk +include $(o-iterator) endif define do-install-so diff --git a/config.make.in b/config.make.in index a443050902..644e5edde5 100644 --- a/config.make.in +++ b/config.make.in @@ -33,9 +33,6 @@ CC = @CC@ AR = @AR@ RANLIB = @RANLIB@ AS = $(CC) -c -OBJDUMP = @OBJDUMP@ -OBJCOPY = @OBJCOPY@ -AWK = @AWK@ # Installation tools. INSTALL = @INSTALL@ diff --git a/configure b/configure index 6d2c64b47d..1758d037b0 100755 --- a/configure +++ b/configure @@ -1238,98 +1238,6 @@ else fi fi -# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="objdump" -fi -fi -OBJDUMP="$ac_cv_prog_OBJDUMP" -if test -n "$OBJDUMP"; then - echo "$ac_t""$OBJDUMP" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - - -# Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args. -set dummy ${ac_tool_prefix}objcopy; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$OBJCOPY"; then - ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_OBJCOPY" && ac_cv_prog_OBJCOPY="objcopy" -fi -fi -OBJCOPY="$ac_cv_prog_OBJCOPY" -if test -n "$OBJCOPY"; then - echo "$ac_t""$OBJCOPY" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - - -for ac_prog in mawk gawk nawk awk -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AWK="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AWK="$ac_cv_prog_AWK" -if test -n "$AWK"; then - echo "$ac_t""$AWK" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$AWK" && break -done - echo $ac_n "checking for signed size_t type""... $ac_c" 1>&6 if eval "test \"`echo '$''{'libc_cv_signed_size_t'+set}'`\" = set"; then @@ -1359,7 +1267,7 @@ if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_friendly_stddef=yes else @@ -1482,7 +1390,7 @@ if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_have_initfini=yes else @@ -1519,7 +1427,7 @@ if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* libc_cv_asm_underscores=yes else @@ -1890,9 +1798,6 @@ s%@CC@%$CC%g s%@CPP@%$CPP%g s%@AR@%$AR%g s%@RANLIB@%$RANLIB%g -s%@OBJDUMP@%$OBJDUMP%g -s%@OBJCOPY@%$OBJCOPY%g -s%@AWK@%$AWK%g s%@libc_cv_have_initfini@%$libc_cv_have_initfini%g s%@libc_cv_ld_no_whole_archive@%$libc_cv_ld_no_whole_archive%g s%@uname_sysname@%$uname_sysname%g diff --git a/configure.in b/configure.in index a96a7246ec..1f7a8ae6f9 100644 --- a/configure.in +++ b/configure.in @@ -304,9 +304,6 @@ AC_CHECK_TOOL(CC, gcc) AC_PROG_CPP AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(OBJDUMP, objdump) -AC_CHECK_TOOL(OBJCOPY, objcopy) -AC_PROG_AWK AC_CACHE_CHECK(for signed size_t type, libc_cv_signed_size_t, [dnl echo '#include diff --git a/extract-dynsym b/extract-dynsym deleted file mode 100755 index 421dbd6fd0..0000000000 --- a/extract-dynsym +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# Extract from an ELF shared object file just the dynamic symbols necessary -# to link against it and the (GNU extension) warning sections that linking -# against it may use to produce warning messages. - -infile=$1 -outfile=$2 - -# Handle both objdump -h output formats. -osechdr='^SECTION [0-9]+ \[' -nsechdr='^ +[0-9]+ ' - -$OBJCOPY -S `$OBJDUMP -h $infile | $AWK " -/($osechdr|$nsechdr)"'\.(hash|dyn[a-z]+|gnu\.warning[a-zA-Z_.]*) / { next; } -/'"$osechdr"'/ { printf "--remove-section=%s ", $3 } -/'"$nsechdr"'/ { printf "--remove-section=%s ", $2 } -' | -# The old format puts brackets around section names. The new format fails -# to delimit long section names from the following hex digits. -sed -e 's/[][]//g' -e 's/0[0-9a-f]* / /g'` $infile $outfile.new - -mv -f $outfile.new $outfile diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h index 87bfd2ec6f..241a74d52c 100644 --- a/misc/sys/syslog.h +++ b/misc/sys/syslog.h @@ -178,7 +178,7 @@ CODE facilitynames[] = { #elif !defined (_BSD_VA_LIST_) /* In GNU we don't have a and it would be too painful to emulate one. */ -#define __need_va_list +#define __need___va_list #include #define _BSD_VA_LIST_ __gnuc_va_list #endif diff --git a/posix/regex.c b/posix/regex.c index 65f9599b8d..8b66cd6c5a 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -3,7 +3,7 @@ (Implements POSIX draft P10003.2/D11.2, except for internationalization features.) - Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. Its master source is NOT part of the C library, however. The master source lives in /gd/gnu/lib. @@ -5183,7 +5183,7 @@ re_compile_pattern (pattern, length, bufp) /* Entry points compatible with 4.2 BSD regex library. We don't define them unless specifically requested. */ -#ifdef _REGEX_RE_COMP +#if defined (_REGEX_RE_COMP) || defined (_LIBC) /* BSD has one and only one pattern buffer. */ static struct re_pattern_buffer re_comp_buf; @@ -5237,6 +5237,15 @@ re_exec (s) return 0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0); } + +#ifdef _LIBC +/* Make these definitions weak in libc, so POSIX programs can redefine + these names if they don't use our functions, and still use + regcomp/regexec below without link errors. */ +weak_symbol (re_comp) +weak_symbol (re_exec) +#endif + #endif /* _REGEX_RE_COMP */ /* POSIX.2 functions. Don't define these for Emacs. */ diff --git a/termios/cfmakeraw.c b/termios/cfmakeraw.c index 09f630b906..a1f2eb2c74 100644 --- a/termios/cfmakeraw.c +++ b/termios/cfmakeraw.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -28,6 +28,6 @@ DEFUN(cfmakeraw, (termios_p), struct termios *t) t->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); t->c_cflag &= ~(CSIZE|PARENB); t->c_cflag |= CS8; - t->c_cc[VMIN] = 0; - /* t->c_cc[VTIME] = ?; */ + t->c_cc[VMIN] = 1; /* read returns when one char is available. */ + t->c_cc[VTIME] = 0; }