AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-02 01:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
93ae1ebaa6
glibc/sysdeps/unix/sysv/linux/mips
History
Joseph Myers 93ae1ebaa6 Clean up gnu/lib-names.h generation (bug 14171). 
This patch eliminates the mixture of SONAME information in
shlib-versions files and SONAME information used to generate
gnu/lib-names.h in makefiles, with the information in the makefiles
being removed so all this information comes from the shlib-versions
files.

So that gnu/lib-names.h supports multiple ABIs, it is changed to be
generated on the same basis as gnu/stubs.h: when there are multiple
ABIs, gnu/lib-names.h is a wrapper header (the same header installed
whatever ABI is being built) and separate headers such as
gnu/lib-names-64.h contain the substantive contents (only one such
header being installed by any glibc build).

The rules for building gnu/lib-names.h were moved from Makeconfig to
Makerules because they need to come after sysdeps makefiles are
included (now that "ifndef abi-variants" is a toplevel conditional on
the rules rather than $(abi-variants) being evaluated later inside the
commands for a rule).

Tested for x86_64 and x86 that the installed shared libraries are
unchanged by this patch, and examined the installed gnu/lib-names*.h
headers by hand.  Also tested the case of a single ABI (where there is
just a single header installed, again like stubs.h) by hacking
abi-variants to empty for x86_64.

	[BZ #14171]
	* Makeconfig [$(build-shared) = yes]
	($(common-objpfx)soversions.mk): Don't handle SONAMEs specified in
	makefiles.
	[$(build-shared) = yes && $(soversions.mk-done) = t]
	($(common-objpfx)gnu/lib-names.h): Remove rule.
	[$(build-shared) = yes && $(soversions.mk-done) = t]
	($(common-objpfx)gnu/lib-names.stmp): Likewise.  Split and moved
	to Makerules.
	[$(build-shared) = yes && $(soversions.mk-done) = t]
	(before-compile): Don't append $(common-objpfx)gnu/lib-names.h
	here.
	[$(build-shared) = yes && $(soversions.mk-done) = t]
	(common-generated): Don't append gnu/lib-names.h and
	gnu/lib-names.stmp here.
	* Makerules [$(build-shared) = yes && $(soversions.mk-done) = t]
	(lib-names-h-abi): New variable.
	[$(build-shared) = yes && $(soversions.mk-done) = t]
	(lib-names-stmp-abi): Likewise.
	[$(build-shared) = yes && $(soversions.mk-done) = t &&
	abi-variants] (before-compile): Append
	$(common-objpfx)$(lib-names-h-abi).
	[$(build-shared) = yes && $(soversions.mk-done) = t &&
	abi-variants] (common-generated): Append gnu/lib-names.h.
	[$(build-shared) = yes && $(soversions.mk-done) = t &&
	abi-variants] (install-others-nosubdir): Depend on
	$(inst_includedir)/$(lib-names-h-abi).
	[$(build-shared) = yes && $(soversions.mk-done) = t &&
	abi-variants] ($(common-objpfx)gnu/lib-names.h): New rule.
	[$(build-shared) = yes && $(soversions.mk-done) = t]
	($(common-objpfx)$(lib-names-h-abi)): New rule.
	[$(build-shared) = yes && $(soversions.mk-done) = t]
	($(common-objpfx)$(lib-names-stmp-abi)): Likewise.
	[$(build-shared) = yes && $(soversions.mk-done) = t]
	(common-generated): Append $(lib-names-h-abi) and
	$(lib-names-stmp-abi).
	* scripts/lib-names.awk: Do not handle multi being set.
	* sysdeps/unix/sysv/linux/aarch64/Makefile (abi-lp64-ld-soname):
	Remove variable.
	(abi-lp64_be-ld-soname): Likewise.
	* sysdeps/unix/sysv/linux/arm/Makefile (abi-soft-ld-soname):
	Likewise.
	(abi-hard-ld-soname): Likewise.
	* sysdeps/unix/sysv/linux/i386/shlib-versions: New file.
	* sysdeps/unix/sysv/linux/mips/Makefile (abi-o32_soft-ld-soname):
	Remove variable.
	(abi-o32_hard-ld-soname): Likewise.
	(abi-o32_soft_2008-ld-soname): Likewise.
	(abi-o32_hard_2008-ld-soname): Likewise.
	(abi-n32_soft-ld-soname): Likewise.
	(abi-n32_hard-ld-soname): Likewise.
	(abi-n32_soft_2008-ld-soname): Likewise.
	(abi-n32_hard_2008-ld-soname): Likewise.
	(abi-n64_soft-ld-soname): Likewise.
	(abi-n64_hard-ld-soname): Likewise.
	(abi-n64_soft_2008-ld-soname): Likewise.
	(abi-n64_hard_2008-ld-soname): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/Makefile (abi-64-v1-ld-soname):
	Likewise.
	(abi-64-v2-ld-soname): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions: Add
	ld.so entries.
	* sysdeps/unix/sysv/linux/s390/Makefile (abi-64-ld-soname): Remove
	variable.
	* sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions: Add ld.so
	entry.
	* sysdeps/unix/sysv/linux/x86/Makefile (abi-32-ld-soname): Remove
	variable.
	(abi-64-ld-soname): Likewise.
	(abi-x32-ld-soname): Likewise.
	* sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: Add ld.so
	entry.
	* sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: Likewise.
2014-09-26 17:33:04 +00:00
..
bits MIPS: Move NPTL public headers to sysdeps/mips/nptl/. 2014-06-23 09:25:41 -07:00
mips32 MIPS: Consolidate nptl/ subdirectories under linux/... 2014-06-27 11:41:04 -07:00
mips64 MIPS: Consolidate nptl/ subdirectories under linux/... 2014-06-27 11:41:04 -07:00
sys Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
____longjmp_chk.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
_test_and_set.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
arch-fork.h Split arch-fork.h from fork.h 2014-05-16 11:17:41 -07:00
brk.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
clone.S MIPS: Consolidate NPTL/non versions of clone 2014-06-25 14:50:58 -07:00
configure Refactor handling of /lib64 etc. cases, move out of sysdeps/gnu/configure.ac. 2014-07-17 14:35:48 +00:00
configure.ac Refactor handling of /lib64 etc. cases, move out of sysdeps/gnu/configure.ac. 2014-07-17 14:35:48 +00:00
dl-cache.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
dl-static.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
getcontext.S Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
getmsg.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
getrlimit64.c Fix -Wundef warnings for _ABI* on MIPS. 2014-03-21 18:21:13 +00:00
getsysstats.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
Implies NPTL is no longer an add-on! 2014-07-07 09:29:06 -07:00
ipc_priv.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
kernel_rt_sigframe.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
kernel_sigaction.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
kernel_stat.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
kernel_termios.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
kernel-features.h Reduce kernel-features.h duplication. 2014-05-14 00:45:19 +00:00
ldsodefs.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
libc-abis Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
makecontext.S Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
Makefile Clean up gnu/lib-names.h generation (bug 14171). 2014-09-26 17:33:04 +00:00
pipe.S Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
pread64.c Remove stray includes of kernel-features.h. 2014-06-25 18:09:01 +00:00
pread.c Remove stray includes of kernel-features.h. 2014-06-25 18:09:01 +00:00
profil-counter.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
pt-vfork.S MIPS: Consolidate NPTL/non versions of vfork 2014-06-27 11:18:10 -07:00
putmsg.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
pwrite64.c Remove stray includes of kernel-features.h. 2014-06-25 18:09:01 +00:00
pwrite.c Remove stray includes of kernel-features.h. 2014-06-25 18:09:01 +00:00
readelflib.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
register-dump.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
setcontext.S Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
setrlimit64.c Fix -Wundef warnings for _ABI* on MIPS. 2014-03-21 18:21:13 +00:00
shlib-versions Remove configuration name patterns from shlib-versions. 2014-09-12 12:28:47 +00:00
sigaction.c Get rid of nptl/sysdeps/ entirely! 2014-07-07 09:28:38 -07:00
sigcontextinfo.h Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
swapcontext.S Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
syscalls.list Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
sysdep-cancel.h MIPS: Consolidate nptl/ subdirectories under linux/... 2014-06-27 11:41:04 -07:00
ucontext_i.sym Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
ustat.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
Versions Move mips from ports to libc. 2014-02-10 23:30:21 +00:00
vfork.S MIPS: Consolidate NPTL/non versions of vfork 2014-06-27 11:18:10 -07:00
xstatconv.c Move mips from ports to libc. 2014-02-10 23:30:21 +00:00