diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | elf/Makefile | 22 | ||||
| -rw-r--r-- | iconvdata/Makefile | 1 | ||||
| -rw-r--r-- | manual/Makefile | 4 | ||||
| -rw-r--r-- | md5-crypt/Makefile | 2 | ||||
| -rw-r--r-- | sunrpc/Makefile | 1 | ||||
| -rw-r--r-- | sysdeps/arm/fpu/fsetexcptflag.c | 38 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 4 |
9 files changed, 21 insertions, 57 deletions
diff --git a/ChangeLog b/ChangeLog index 5077bab548..10fd749e3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1998-05-25 Andreas Jaeger <aj@arthur.rhein-neckar.de> + + * configure.in: Allow more make versions e.g 3.76.90. + 1998-05-25 Ulrich Drepper <drepper@cygnus.com> * Makeconfig (rpath-link): Find libc.so.6 in $(common-objdir). diff --git a/configure.in b/configure.in index 683f6b6a39..df82d75213 100644 --- a/configure.in +++ b/configure.in @@ -452,7 +452,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v, critic_missing=t) AC_CHECK_PROG_VER(MAKE, make gmake, --version, [version \([0-9][0-9.]*\), by], - [3.75 | 3.76.[1-9] | 3.7[789]* | 3.[89]*], critic_missing=t) + [3.75 | 3.76.[1-9]* | 3.7[789]* | 3.[89]*], critic_missing=t) AC_CHECK_PROG_VER(MSGFMT, msgfmt gmsgfmt, --version, [GNU gettext.*\([0-9][0-9]*\.[0-9]*\)], diff --git a/elf/Makefile b/elf/Makefile index b8b5b36b40..b2ea241808 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -45,7 +45,7 @@ extra-libs = libdl extra-libs-others = $(extra-libs) libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr -before-compile = $(objpfx)trusted-dirs.h $(objpfx)rtldtbl.h +before-compile = $(objpfx)trusted-dirs.h all: # Make this the default target; it will be defined in Rules. @@ -54,7 +54,7 @@ include ../Makeconfig ifeq (yes,$(build-shared)) extra-objs = $(rtld-routines:=.os) soinit.os sofini.os eval.os interp.os -generated = librtld.os dl-allobjs.os ld.so trusted-dirs.h rtldtbl.h +generated = librtld.os dl-allobjs.os ld.so trusted-dirs.h trusted-dirs.st install-others = $(inst_slibdir)/$(rtld-installed-name) install-bin = ldd generated += ldd @@ -135,17 +135,15 @@ endif # libraries when using LD_LIBRARY_PATH in a setuid program. The user can # add directories to the list by defining $(user-defined-trusted-dirs) # before starting make. -$(objpfx)trusted-dirs.h: Makefile $(..)Makeconfig +$(objpfx)trusted-dirs.h: $(objpfx)trusted-dirs.st; @: +$(objpfx)trusted-dirs.st: Makefile $(..)Makeconfig $(make-target-directory) - (for dir in `echo "$(default-rpath) $(user-defined-trusted-dirs)" | \ - sed 's/:/ /g'`; do \ - echo " \"$$dir/\","; \ - done;) > $@T - mv -f $@T $@ -$(objpfx)rtldtbl.h: Makefile $(..)Makeconfig genrtldtbl.awk - $(make-target-directory) - echo "$(default-rpath)" | $(AWK) -f genrtldtbl.awk > $@T - mv -f $@T $@ + dirs="$(subst :, ,$(default-rpath) $(user-defined-trusted-dirs))"; \ + for dir in $$dirs; do \ + echo " \"$$dir/\","; \ + done > ${@:st=T} + $(move-if-change) ${@:st=T} ${@:st=h} + touch $@ CPPFLAGS-dl-load.c = -I$(objpfx). CFLAGS-dl-load.c += -Wno-uninitialized diff --git a/iconvdata/Makefile b/iconvdata/Makefile index c13206f0a1..5de9bbfecf 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -224,7 +224,6 @@ install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \ # If we have the localedata add-on available we can build the conversion # tables for numerous charsets. -move-if-change = ./$(..)scripts/move-if-change define generate-8bit-table $(make-target-directory) diff --git a/manual/Makefile b/manual/Makefile index bc36978ebb..0a71d18c3a 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -65,7 +65,9 @@ mv -f $@.new $@ endef # scripts we use -move-if-change = $(..)scripts/move-if-change +ifndef move-if-change +move-if-change = ./move-if-change +endif mkinstalldirs = $(..)scripts/mkinstalldirs libc.dvi libc.info: $(chapters) summary.texi $(chapters-incl) diff --git a/md5-crypt/Makefile b/md5-crypt/Makefile index 28b90df9a0..27a8b0098a 100644 --- a/md5-crypt/Makefile +++ b/md5-crypt/Makefile @@ -39,7 +39,7 @@ extra-objs = $(patsubst %,onlymd5-entry%,$(object-suffixes)) include ../Makeconfig -rpath-link := $(common-objpfx)md5-crypt:$(rpath-link) +rpath-dirs += md5-crypt ifeq ($(crypt-in-libc),yes) routines += $(libcrypt-routines) diff --git a/sunrpc/Makefile b/sunrpc/Makefile index 3697e036c6..fd6c9d85ac 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -134,7 +134,6 @@ $(inst_sysconfdir)/rpc: etc.rpc $(+force) # Generate the rpcsvc headers with rpcgen. # We use a stamp file to avoid unnessary recompilation each time rpcgen is # relinked. -move-if-change = ./$(..)scripts/move-if-change $(rpcsvc:%.x=$(objpfx)rpcsvc/%.h): $(objpfx)rpcsvc/%.h: $(objpfx)rpcsvc/%.stmp @: $(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(objpfx)rpcgen diff --git a/sysdeps/arm/fpu/fsetexcptflag.c b/sysdeps/arm/fpu/fsetexcptflag.c deleted file mode 100644 index f5c06a6f6c..0000000000 --- a/sysdeps/arm/fpu/fsetexcptflag.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Set floating-point environment exception handling. - Copyright (C) 1997, 1998 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 - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <fenv.h> -#include <math.h> -#include <fpu_control.h> - -void -fesetexceptflag (const fexcept_t *flagp, int excepts) -{ - fexcept_t temp; - - /* Get the current environment. */ - _FPU_GETCW(temp); - - /* Set the desired exception mask. */ - temp &= ~((excepts & FE_ALL_EXCEPT) << FE_EXCEPT_SHIFT); - temp |= (*flagp & excepts & FE_ALL_EXCEPT) << FE_EXCEPT_SHIFT; - - /* Save state back to the FPU. */ - _FPU_SETCW(temp); -} diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index 3719d57016..7e5dee6740 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -90,7 +90,7 @@ $(common-objpfx)stamp-errnos: $(hurd)/errnos.awk $(errno.texinfo) \ $(AWK) -f $^ > $(hurd)/errnos.h-tmp # Make it unwritable so noone will edit it by mistake. -chmod a-w $(hurd)/errnos.h-tmp - ./$(..)scripts/move-if-change $(hurd)/errnos.h-tmp $(hurd)/errnos.h + $(move-if-change) $(hurd)/errnos.h-tmp $(hurd)/errnos.h ifeq ($(with-cvs),yes) test ! -d $(hurd)/CVS || \ (cd $(hurd) && cvs commit -m'Regenerated from $^' errnos.h) @@ -114,7 +114,7 @@ endif rpcuserlibs := $(common-objpfx)mach/libmachuser.so \ $(common-objpfx)hurd/libhurduser.so $(common-objpfx)libc.so: $(rpcuserlibs) -rpath-link := $(rpath-link):$(common-objpfx)mach:$(common-objpfx)hurd +rpath-dirs += mach hurd # And get them into the libc.so ldscript. $(inst_libdir)/libc.so: $(rpcuserlibs) |