mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 03:33:33 +08:00
* sunrpc/key_call.c: Remove doors support.
* sunrpc/Makefile: Remove CPPFLAGS-key_call.c definition. * configure.in: Remove test for doors support which never existed. * config.make.in: Remove have_doors entry. * configure.in: Make sure at least gcc 3.4 is used. Undo last change. * config.make.in: Undo last change. * sysdeps/i386/Makefile ((CFLAGS-initfini.s): Unconditionally use -mtune. * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define unconditionally to (defined RTLD_BOOTSTRAP). * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise. 2005-03-05 Jakub Jelinek <jakub@redhat.com>
This commit is contained in:
Ulrich Drepper
parent
171129215c
commit
93aed66714
21
ChangeLog
21
ChangeLog
@ -1,3 +1,16 @@
|
||||
2005-03-05 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sunrpc/key_call.c: Remove doors support.
|
||||
* sunrpc/Makefile: Remove CPPFLAGS-key_call.c definition.
|
||||
* configure.in: Remove test for doors support which never existed.
|
||||
* config.make.in: Remove have_doors entry.
|
||||
|
||||
* configure.in: Make sure at least gcc 3.4 is used. Undo last change.
|
||||
* config.make.in: Undo last change.
|
||||
|
||||
* sysdeps/i386/Makefile ((CFLAGS-initfini.s): Unconditionally use
|
||||
-mtune.
|
||||
|
||||
2005-03-05 Roland McGrath <roland@redhat.com>
|
||||
|
||||
* sysdeps/generic/ldsodefs.h (_dl_out_of_memory_internal): Remove decl.
|
||||
@ -22,11 +35,15 @@
|
||||
* config.make.in (cc-mtune): New substituted variable.
|
||||
* configure.in (libc_cv_cc_mtune): New test for -mtune= switch,
|
||||
done only if libc_mtune_example is defined.
|
||||
* configure: Regenerated.
|
||||
* sysdeps/i386/configure.in (libc_mtune_example): Set it.
|
||||
* sysdeps/i386/configure: Regenerated.
|
||||
* sysdeps/i386/Makefile (CFLAGS-initfini.s): Use $(cc-mtune).
|
||||
|
||||
2005-03-05 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define
|
||||
unconditionally to (defined RTLD_BOOTSTRAP).
|
||||
* sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise.
|
||||
|
||||
2005-03-05 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* Makerules ($(inst_libdir)/libc.so): Use $(slibdir) instead of
|
||||
|
||||
@ -62,7 +62,6 @@ have-selinux = @have_selinux@
|
||||
have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
|
||||
fno-unit-at-a-time = @fno_unit_at_a_time@
|
||||
bind-now = @bindnow@
|
||||
cc-mtune = @cc_mtune@
|
||||
|
||||
static-libgcc = @libc_cv_gcc_static_libgcc@
|
||||
|
||||
@ -70,7 +69,6 @@ versioning = @VERSIONING@
|
||||
oldest-abi = @oldest_abi@
|
||||
no-whole-archive = @no_whole_archive@
|
||||
exceptions = @exceptions@
|
||||
have_doors = @linux_doors@
|
||||
|
||||
mach-interface-list = @mach_interface_list@
|
||||
|
||||
|
||||
24
configure.in
24
configure.in
@ -760,7 +760,7 @@ fi
|
||||
# These programs are version sensitive.
|
||||
AC_CHECK_TOOL_PREFIX
|
||||
AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
|
||||
[version \([egcygnustpi-]*[0-9.]*\)], [3.[2-9]* | 4.[0-9]* ],
|
||||
[version \([egcygnustpi-]*[0-9.]*\)], [3.4* | 4.[0-9]* ],
|
||||
critic_missing="$critic_missing gcc")
|
||||
AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
|
||||
[GNU Make[^0-9]*\([0-9][0-9.]*\)],
|
||||
@ -2116,22 +2116,6 @@ fi
|
||||
rm -f conftest.*])
|
||||
AC_SUBST(pic_default)
|
||||
|
||||
# This test comes after sysdeps configure fragments, so that they can
|
||||
# define the variable libc_mtune_example to tell us a valid -mtune=value
|
||||
# argument that we can test with.
|
||||
AC_SUBST(cc_mtune)cc_mtune=-mcpu
|
||||
if test "x$libc_mtune_example" != x; then
|
||||
AC_CACHE_CHECK(if compiler supports -mtune option, libc_cv_cc_mtune, [dnl
|
||||
libc_cv_cc_mtune=no
|
||||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -mtune=$libc_mtune_example"
|
||||
AC_TRY_COMPILE(,,[libc_cv_cc_mtune=yes])
|
||||
])
|
||||
if test "x$libc_cv_cc_mtune" = xyes; then
|
||||
cc_mtune=-mtune
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(profile)
|
||||
AC_SUBST(omitfp)
|
||||
AC_SUBST(bounded)
|
||||
@ -2140,12 +2124,6 @@ AC_SUBST(nopic_initfini)
|
||||
|
||||
AC_SUBST(DEFINES)
|
||||
|
||||
case "$add_ons" in
|
||||
*door*) linux_doors=yes ;;
|
||||
*) linux_doors=no ;;
|
||||
esac
|
||||
AC_SUBST(linux_doors)
|
||||
|
||||
dnl See sysdeps/mach/configure.in for this variable.
|
||||
AC_SUBST(mach_interface_list)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
ifeq ($(subdir),linuxthreads)
|
||||
# On i686 we must avoid generating the trampoline functions generated
|
||||
# to get the GOT pointer.
|
||||
CFLAGS-pt-initfini.s += -march=i386 $(cc-mtune)=i386
|
||||
CFLAGS-pt-initfini.s += -march=i386 -mtune=i386
|
||||
|
||||
# Most files must not be compiled without frame pointer since we need
|
||||
# the frame base address which is stored in %ebp unless the frame pointer
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 1994-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2004, 2005 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
|
||||
@ -126,9 +126,6 @@ CFLAGS-pmap_rmt.c = -fexceptions
|
||||
CFLAGS-clnt_perr.c = -fexceptions
|
||||
CFLAGS-openchild.c = -fexceptions
|
||||
|
||||
ifeq (yes,$(have_doors))
|
||||
CPPFLAGS-key_call.c += -DHAVE_DOORS=1
|
||||
endif
|
||||
CPPFLAGS += -D_RPC_THREAD_SAFE_
|
||||
|
||||
include ../Rules
|
||||
|
||||
@ -51,10 +51,6 @@
|
||||
#include <rpc/key_prot.h>
|
||||
#include <bits/libc-lock.h>
|
||||
|
||||
#ifdef HAVE_DOORS
|
||||
# include "door/door.h"
|
||||
#endif
|
||||
|
||||
#define KEY_TIMEOUT 5 /* per-try timeout in seconds */
|
||||
#define KEY_NRETRY 12 /* number of retries */
|
||||
|
||||
@ -503,73 +499,6 @@ key_call_socket (u_long proc, xdrproc_t xdr_arg, char *arg,
|
||||
return result;
|
||||
}
|
||||
|
||||
#ifdef HAVE_DOORS
|
||||
/* returns 0 on failure, 1 on success */
|
||||
static int
|
||||
internal_function
|
||||
key_call_door (u_long proc, xdrproc_t xdr_arg, char *arg,
|
||||
xdrproc_t xdr_rslt, char *rslt)
|
||||
{
|
||||
XDR xdrs;
|
||||
int fd, ret;
|
||||
door_arg_t args;
|
||||
char *data_ptr;
|
||||
u_long data_len = 0;
|
||||
char res[255];
|
||||
|
||||
if ((fd = open("/var/run/keyservdoor", O_RDONLY)) < 0)
|
||||
return 0;
|
||||
res[0] = 0;
|
||||
|
||||
data_len = xdr_sizeof (xdr_arg, arg);
|
||||
data_ptr = calloc (1, data_len + 2 * sizeof (u_long));
|
||||
if (data_ptr == NULL)
|
||||
return 0;
|
||||
|
||||
INTUSE(xdrmem_create) (&xdrs, &data_ptr[2 * sizeof (u_long)], data_len,
|
||||
XDR_ENCODE);
|
||||
if (!xdr_arg (&xdrs, arg))
|
||||
{
|
||||
xdr_destroy (&xdrs);
|
||||
free (data_ptr);
|
||||
return 0;
|
||||
}
|
||||
xdr_destroy (&xdrs);
|
||||
|
||||
memcpy (data_ptr, &proc, sizeof (u_long));
|
||||
memcpy (&data_ptr[sizeof (proc)], &data_len, sizeof (u_long));
|
||||
|
||||
args.data_ptr = data_ptr;
|
||||
args.data_size = data_len + 2 * sizeof (u_long);
|
||||
args.desc_ptr = NULL;
|
||||
args.desc_num = 0;
|
||||
args.rbuf = res;
|
||||
args.rsize = sizeof (res);
|
||||
|
||||
ret = __door_call (fd, &args);
|
||||
free (data_ptr);
|
||||
close (fd);
|
||||
|
||||
if (ret < 0)
|
||||
return 0;
|
||||
|
||||
memcpy (&data_len, args.data_ptr, sizeof (u_long));
|
||||
if (data_len != 0)
|
||||
return 0;
|
||||
|
||||
memcpy (&data_len, &args.data_ptr[sizeof (u_long)], sizeof (u_long));
|
||||
INTUSE(xdrmem_create) (&xdrs, &args.data_ptr[2 * sizeof (u_long)],
|
||||
data_len, XDR_DECODE);
|
||||
if (!xdr_rslt (&xdrs, rslt))
|
||||
{
|
||||
xdr_destroy (&xdrs);
|
||||
return 0;
|
||||
}
|
||||
xdr_destroy (&xdrs);
|
||||
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* returns 0 on failure, 1 on success */
|
||||
static int
|
||||
@ -580,9 +509,6 @@ key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
|
||||
#ifndef SO_PASSCRED
|
||||
static int use_keyenvoy;
|
||||
#endif
|
||||
#ifdef HAVE_DOORS
|
||||
static int not_use_doors;
|
||||
#endif
|
||||
|
||||
if (proc == KEY_ENCRYPT_PK && __key_encryptsession_pk_LOCAL)
|
||||
{
|
||||
@ -606,15 +532,6 @@ key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifdef HAVE_DOORS
|
||||
if (!not_use_doors)
|
||||
{
|
||||
if (key_call_door (proc, xdr_arg, arg, xdr_rslt, rslt))
|
||||
return 1;
|
||||
not_use_doors = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef SO_PASSCRED
|
||||
return key_call_socket (proc, xdr_arg, arg, xdr_rslt, rslt);
|
||||
#else
|
||||
|
||||
@ -8,7 +8,7 @@ long-double-fcts = yes
|
||||
ifeq ($(subdir),csu)
|
||||
# On i686 we must avoid generating the trampoline functions generated
|
||||
# to get the GOT pointer.
|
||||
CFLAGS-initfini.s += -march=i386 $(cc-mtune)=i386
|
||||
CFLAGS-initfini.s += -march=i386 -mtune=i386
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),gmon)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user