From dd9423a67a7650a9b0f50d8151e4f3797c5a14f8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 11 Jun 2003 21:57:23 +0000 Subject: Update. 2003-06-11 Ulrich Drepper * allocatestack.c (queue_stack): Always inline. * ptreadhP.h (__do_cancel): Likewise. --- elf/dl-load.c | 5 ++--- elf/dl-version.c | 3 ++- elf/do-lookup.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'elf') diff --git a/elf/dl-load.c b/elf/dl-load.c index 8b0c82bb52..9198427edd 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -361,7 +361,7 @@ static struct r_search_path_struct rtld_search_dirs; static size_t max_dirnamelen; -static inline struct r_search_path_elem ** +static struct r_search_path_elem ** fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep, int check_trusted, const char *what, const char *where) { @@ -1935,8 +1935,7 @@ _dl_rtld_di_serinfo (struct link_map *loader, Dl_serinfo *si, bool counting) unsigned int idx = 0; char *allocptr = (char *) &si->dls_serpath[si->dls_cnt]; - inline void add_path (const struct r_search_path_struct *sps, - unsigned int flags) + void add_path (const struct r_search_path_struct *sps, unsigned int flags) # define add_path(sps, flags) add_path(sps, 0) /* XXX */ { if (sps->dirs != (void *) -1) diff --git a/elf/dl-version.c b/elf/dl-version.c index e9553e4744..3daea87848 100644 --- a/elf/dl-version.c +++ b/elf/dl-version.c @@ -1,5 +1,5 @@ /* Handle symbol and library versioning. - Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc. + Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -53,6 +53,7 @@ static inline struct link_map * +__attribute ((always_inline)) find_needed (const char *name, struct link_map *map) { struct link_map *tmap; diff --git a/elf/do-lookup.h b/elf/do-lookup.h index be75fb7b00..8ba07253e3 100644 --- a/elf/do-lookup.h +++ b/elf/do-lookup.h @@ -1,5 +1,5 @@ /* Look up a symbol in the loaded objects. - Copyright (C) 1995,96,97,98,99,2000,2001,2002 Free Software Foundation, Inc. + Copyright (C) 1995-2002, 2003 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,7 +28,7 @@ /* Inner part of the lookup functions. We return a value > 0 if we found the symbol, the value 0 if nothing is found and < 0 if something bad happened. */ -static inline int +static int FCT (const char *undef_name, unsigned long int hash, const ElfW(Sym) *ref, struct sym_val *result, struct r_scope_elem *scope, size_t i, ARG, struct link_map *skip, int type_class) -- cgit 1.4.1