mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
5aa8ff620e
1998-04-21 18:00 Ulrich Drepper <drepper@cygnus.com> * iconv/gconv.c (__gconv): Remove bogus input buffer size computation. * iconv/gconv_open.c (__gconv_open): Initialize outbufend element. * iconv/gconv_simple.c (__gconv_transform_internal_ascii): Don't use character in comparison with uint32_t. (__gconv_transform_internal_utf8): Specify MAX_NEEDED_TO. (__gconv_transform_utf8_internal): Specify MAX_NEEDED_FROM. Optimize BODY a bit. * iconv/loop.c: Require MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT to be defined. * iconv/skeleton.c: Also reset converted counter in case of an error. Call reset function using correct value for output buffer start. * iconvdata/Makefile: Re-enable tests. * iconvdata/iso8859-1.c: Swap MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT value for to-conversion. * iconvdata/TESTS: Add new third column. * iconvdata/run-iconv-test.sh: Add support for charsets which are not ASCII based. * iconvdata/testdata/suntzus: New file. * elf/dl-minimal.c (__strtol_internal): Increment pointer to string while reading. Correctly used base. Little optimization. (__strtoul_internal): Likewise. * elf/rtld.c (dl_main): Test to avoid duplicate call of _dl_init_paths was wrong. Use explicit variable. 1998-04-20 23:49 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Check for awk. * config.make.in: Add AWK to be substituted. * manual/xtract-typefun.awk: Rewrite to eliminate gawk extensions. * manual/users.texi: Fix typo exposed by above rewrite. * Makefile: Invoke awk using AWK variable. * csu/Makefile: Likewise. * elf/Makefile: Likewise. * mach/Makefile: Likewise. * manual/Makefile: Likewise. * sysdeps/gnu/Makefile: Likewise. * sysdeps/mach/hurd/Makefile: Likewise. * sysdeps/unix/Makefile: Likewise. * timezone/Makefile: Likewise. 1998-04-10 Gordon Matzigkeit <gord@profitpress.com> * sysdeps/gnu/errlist.awk (ERR_REMAP): Implement error code to array index translation. (SYS_ERRLIST_ALIAS, SYS_NERR_ALIAS): Make weak aliases only if these are defined. * sysdeps/mach/hurd/Dist: Add errlist.c to distribution. * sysdeps/mach/hurd/errlist.c: New file. (ERR_TRANSLATE): Map Hurd error codes into errlist indices. (_hurd_errlist): The Hurd error list doesn't have Unix sys_errlist semantics, so rename it. 1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * iconvdata/run-iconv-test.sh: Make portable. Always test all conversions. 1998-04-21 12:30 H.J. Lu <hjl@gnu.org> * wcsmbs/wcsrtombs.c (__wcsrtombs): Initialize result to 0. * wcsmbs/wcsnrtombs.c: Likewise. 1998-04-21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/dl-sysdep.c: Handle _dl_hwcap correctly. * wcsmbs/btowc.c (__btowc): Declare inptr as const char *. * time/strftime.c (my_strftime): Initialize pad variable in declaration. * iconvdata/big5.c: Don't use character constants in comparisons with unsigned value. * sysdeps/generic/setutxent.c: New file. * sysdeps/generic/getutxent.c: New file. * sysdeps/generic/endutxent.c: New file. * sysdeps/generic/getutxid.c: New file. * sysdeps/generic/getutxline.c: New file. * sysdeps/generic/pututxline.c: New file. * sysdeps/generic/utmpxname.c: New file. * sysdeps/generic/updwtmpx.c: New file.
208 lines
6.6 KiB
Makefile
208 lines
6.6 KiB
Makefile
# Copyright (C) 1995, 1996, 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.
|
||
|
||
# Makefile for elf subdirectory of GNU C Library.
|
||
|
||
subdir := elf
|
||
|
||
headers = elf.h bits/elfclass.h bits/dlfcn.h link.h dlfcn.h
|
||
routines = $(dl-routines) dl-open dl-close dl-symbol dl-support \
|
||
dl-addr enbl-secure
|
||
|
||
# The core dynamic linking functions are in libc for the static and
|
||
# profiled libraries.
|
||
dl-routines = $(addprefix dl-,load cache lookup object reloc deps \
|
||
runtime error init fini debug misc \
|
||
version profile)
|
||
# But they are absent from the shared libc, because that code is in ld.so.
|
||
elide-routines.os = $(dl-routines) dl-support enbl-secure
|
||
|
||
# ld.so uses those routines, plus some special stuff for being the program
|
||
# interpreter and operating independent of libc.
|
||
rtld-routines := rtld $(dl-routines) dl-sysdep dl-minimal
|
||
ld-map = $(libc-map)
|
||
distribute = $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
|
||
dl-hash.h soinit.c sofini.c ldd.sh.in ldd.bash.in eval.c \
|
||
genrtldtbl.awk atomicity.h dl-procinfo.h ldsodefs.h \
|
||
dl-librecon.h
|
||
|
||
extra-libs = libdl
|
||
extra-libs-others = $(extra-libs)
|
||
libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr
|
||
libdl-map := libdl.map
|
||
|
||
before-compile = $(objpfx)trusted-dirs.h $(objpfx)rtldtbl.h
|
||
|
||
|
||
all: # Make this the default target; it will be defined in Rules.
|
||
|
||
include ../Makeconfig
|
||
|
||
ifeq (yes,$(build-shared))
|
||
extra-objs = $(rtld-routines:=.os) soinit.os sofini.os eval.os
|
||
generated = librtld.os dl-allobjs.os ld.so trusted-dirs.h rtldtbl.h
|
||
install-others = $(inst_slibdir)/$(rtld-installed-name)
|
||
install-bin = ldd
|
||
generated += ldd
|
||
endif
|
||
|
||
others = sprof
|
||
install-bin += sprof
|
||
|
||
ifeq (yes,$(has-ldconfig))
|
||
others-static += ldconfig
|
||
others += ldconfig
|
||
install-rootsbin = ldconfig
|
||
endif
|
||
|
||
include ../Rules
|
||
|
||
|
||
ifeq (yes,$(build-shared))
|
||
# Make sure these things are built in the `make lib' pass so they can be used
|
||
# to run programs during the `make others' pass.
|
||
lib-noranlib: $(objpfx)$(rtld-installed-name) \
|
||
$(addprefix $(objpfx),$(extra-objs))
|
||
endif
|
||
|
||
# Command to link into a larger single relocatable object.
|
||
reloc-link = $(LINK.o) -nostdlib -nostartfiles -r -o $@
|
||
|
||
$(objpfx)dl-allobjs.os: $(rtld-routines:%=$(objpfx)%.os)
|
||
$(reloc-link) $^
|
||
|
||
# Link together the dynamic linker into a single relocatable object.
|
||
$(objpfx)librtld.os: $(objpfx)dl-allobjs.os $(common-objpfx)libc_pic.a
|
||
$(reloc-link) '-Wl,-(' $^ -lgcc '-Wl,-)'
|
||
|
||
# Do we need a linker script?
|
||
rtld-ldscript-in := $(firstword $(wildcard $(+sysdep_dirs:%=%/rtld-ldscript.in)))
|
||
|
||
ifneq (,$(rtld-ldscript-in))
|
||
rtld-ldscript = $(objpfx)rtld-ldscript
|
||
generated += rtld-ldscript
|
||
|
||
LDFLAGS-rtld = -T $(rtld-ldscript)
|
||
before-compile += $(rtld-ldscript)
|
||
|
||
rtld-parms = $(wildcard $(+sysdep_dirs:%=%/rtld-parms))
|
||
include $(rtld-parms)
|
||
|
||
$(rtld-ldscript): $(rtld-ldscript-in) $(rtld-parms)
|
||
sed -e 's#@@rtld-oformat@@#$(rtld-oformat)#' \
|
||
-e 's#@@rtld-arch@@#$(rtld-arch)#' \
|
||
-e 's#@@rtld-entry@@#$(rtld-entry)#' \
|
||
-e 's#@@rtld-base@@#$(rtld-base)#' $< >$@
|
||
endif
|
||
|
||
$(objpfx)ld.so: $(objpfx)librtld.os $(addprefix $(objpfx),$(rtld-ldscript)) \
|
||
$(ld-map)
|
||
$(rtld-link) -Wl,-soname=$(rtld-installed-name)
|
||
|
||
define rtld-link
|
||
$(LINK.o) -nostdlib -nostartfiles -shared -o $@ \
|
||
-Wl,-rpath=$(default-rpath) $(LDFLAGS-rtld) \
|
||
$(filter-out $(rtld-ldscript) $($(@F:.so=)-map),$^) \
|
||
$(load-map-file:%=-Wl,--version-script=%)
|
||
endef
|
||
|
||
# The dl code in the static libc needs a default library path.
|
||
CFLAGS-dl-support.c = -D'DEFAULT_RPATH="$(default-rpath)"'
|
||
|
||
ifneq (ld.so,$(rtld-installed-name))
|
||
# Make sure ld.so.1 exists in the build directory so we can link
|
||
# against it.
|
||
$(objpfx)$(rtld-installed-name): $(objpfx)ld.so
|
||
rm -f $@
|
||
ln -s $(<F) $@
|
||
generated += $(rtld-installed-name)
|
||
endif
|
||
|
||
# Build a file mentioning all trustworthy directories to look for shared
|
||
# 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
|
||
$(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 $@
|
||
CPPFLAGS-dl-load.c = -I$(objpfx).
|
||
CFLAGS-dl-load.c += -Wno-uninitialized
|
||
|
||
# Specify the dependencies of libdl.so; its commands come from the generic
|
||
# rule to build a shared library.
|
||
$(objpfx)libdl.so: $(objpfx)libdl_pic.a $(common-objpfx)libc.so $(objpfx)ld.so
|
||
|
||
$(inst_slibdir)/$(rtld-version-installed-name): $(objpfx)ld.so $(+force)
|
||
$(do-install-program)
|
||
|
||
$(inst_slibdir)/$(rtld-installed-name): \
|
||
$(inst_slibdir)/$(rtld-version-installed-name)
|
||
$(make-shlib-link)
|
||
|
||
# Special target called by parent to install just the dynamic linker.
|
||
.PHONY: ldso_install
|
||
ldso_install: $(inst_slibdir)/$(rtld-installed-name)
|
||
|
||
|
||
sh-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \
|
||
-e 's%@VERSION@%$(version)%g'
|
||
bash-ldd-rewrite = $(sh-ldd-rewrite) -e 's%@BASH@%$(BASH)%g' \
|
||
-e 's%@TEXTDOMAINDIR@%$(localedir)%g'
|
||
|
||
ifneq ($(have-bash2),yes)
|
||
ldd-shell = sh
|
||
else
|
||
ldd-shell = bash
|
||
endif
|
||
|
||
ifeq ($(ldd-rewrite-script),no)
|
||
define gen-ldd
|
||
sed $($(ldd-shell)-ldd-rewrite) < $< > $@.new
|
||
endef
|
||
else
|
||
define gen-ldd
|
||
sed $($(ldd-shell)-ldd-rewrite) < $< | sed -f $(ldd-rewrite-script) > $@.new
|
||
endef
|
||
endif
|
||
|
||
$(objpfx)ldd: ldd.$(ldd-shell).in $(common-objpfx)version.mk \
|
||
$(common-objpfx)soversions.mk $(common-objpfx)config.make
|
||
$(gen-ldd)
|
||
chmod 555 $@.new
|
||
mv -f $@.new $@
|
||
|
||
|
||
ifeq ($(build-shared),yes)
|
||
$(objpfx)sprof: $(objpfx)libdl.so$(libdl.so-version)
|
||
else
|
||
$(objpfx)sprof: $(objpfx)libdl.a
|
||
endif
|
||
|
||
# muwahaha
|
||
|
||
LDFLAGS-dl.so = -Wl,-dynamic-linker,$(slibdir)/$(rtld-installed-name)
|
||
$(objpfx)libdl.so: $(objpfx)eval.os
|