mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-06 12:00:24 +08:00
93ae1ebaa6
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. |
||
|---|---|---|
| .. | ||
| aarch64 | ||
| alpha | ||
| arm | ||
| bits | ||
| generic | ||
| hppa | ||
| i386 | ||
| ia64 | ||
| m68k | ||
| microblaze | ||
| mips | ||
| net | ||
| netash | ||
| netatalk | ||
| netax25 | ||
| neteconet | ||
| netinet | ||
| netipx | ||
| netiucv | ||
| netpacket | ||
| netrom | ||
| netrose | ||
| nfs | ||
| powerpc | ||
| s390 | ||
| scsi | ||
| sh | ||
| sparc | ||
| sys | ||
| tile | ||
| wordsize-64 | ||
| x86 | ||
| x86_64 | ||
| _exit.c | ||
| _G_config.h | ||
| a.out.h | ||
| accept4.c | ||
| accept.S | ||
| adjtime.c | ||
| aio_misc.h | ||
| aio_sigqueue.c | ||
| allocrtsig.c | ||
| arch-fork.h | ||
| bind.S | ||
| check_native.c | ||
| check_pf.c | ||
| clock_getcpuclockid.c | ||
| clock_getres.c | ||
| clock_gettime.c | ||
| clock_nanosleep.c | ||
| clock_settime.c | ||
| clock.c | ||
| cmsg_nxthdr.c | ||
| configure | ||
| configure.ac | ||
| connect.S | ||
| device-nrs.h | ||
| dl-brk.c | ||
| dl-execstack.c | ||
| dl-fxstatat64.c | ||
| dl-getcwd.c | ||
| dl-librecon.h | ||
| dl-openat64.c | ||
| dl-opendir.c | ||
| dl-origin.c | ||
| dl-osinfo.h | ||
| dl-sbrk.c | ||
| dl-sysdep.c | ||
| dl-sysdep.h | ||
| dl-vdso.c | ||
| dl-vdso.h | ||
| dl-writev.h | ||
| epoll_pwait.c | ||
| errqueue.h | ||
| eventfd_read.c | ||
| eventfd_write.c | ||
| eventfd.c | ||
| execve.c | ||
| exit-thread.h | ||
| faccessat.c | ||
| fallocate64.c | ||
| fallocate.c | ||
| fatal-prepare.h | ||
| fchmodat.c | ||
| fchownat.c | ||
| fcntl.c | ||
| fd_to_filename.h | ||
| fexecve.c | ||
| fips-private.h | ||
| fpathconf.c | ||
| fstatfs64.c | ||
| fstatvfs64.c | ||
| fstatvfs.c | ||
| ftime.c | ||
| ftruncate64.c | ||
| futimens.c | ||
| futimes.c | ||
| futimesat.c | ||
| fxstat64.c | ||
| fxstat.c | ||
| fxstatat64.c | ||
| fxstatat.c | ||
| gai_sigqueue.c | ||
| getclktck.c | ||
| getcwd.c | ||
| getdents64.c | ||
| getdents.c | ||
| getdirentries64.c | ||
| getdirentries.c | ||
| getdtsz.c | ||
| gethostid.c | ||
| getipv4sourcefilter.c | ||
| getloadavg.c | ||
| getlogin_r.c | ||
| getlogin.c | ||
| getpagesize.c | ||
| getpeername.S | ||
| getpid.c | ||
| getpriority.c | ||
| getpt.c | ||
| getrlimit64.c | ||
| getsockname.S | ||
| getsockopt.S | ||
| getsourcefilter.c | ||
| getsysstats.c | ||
| grantpt.c | ||
| if_index.c | ||
| ifaddrs.c | ||
| ifreq.c | ||
| Implies | ||
| internal_accept4.S | ||
| internal_recvmmsg.S | ||
| internal_sendmmsg.S | ||
| internal_statvfs64.c | ||
| internal_statvfs.c | ||
| ipc_priv.h | ||
| kernel_sigaction.h | ||
| kernel_stat.h | ||
| kernel_termios.h | ||
| kernel-features.h | ||
| kernel-posix-cpu-timers.h | ||
| kernel-posix-timers.h | ||
| ldd-rewrite.sed | ||
| lddlibc4.c | ||
| ldsodefs.h | ||
| libc_fatal.c | ||
| linkat.c | ||
| linux_fsinfo.h | ||
| listen.S | ||
| llseek.c | ||
| local-setxid.h | ||
| lowlevellock-futex.h | ||
| lseek64.c | ||
| lutimes.c | ||
| lxstat64.c | ||
| lxstat.c | ||
| makedev.c | ||
| Makefile | ||
| malloc-sysdep.h | ||
| mkdirat.c | ||
| mmap64.c | ||
| mq_close.c | ||
| mq_getattr.c | ||
| mq_notify.c | ||
| mq_open.c | ||
| mq_receive.c | ||
| mq_send.c | ||
| mq_unlink.c | ||
| msgctl.c | ||
| msgget.c | ||
| msgrcv.c | ||
| msgsnd.c | ||
| netlinkaccess.h | ||
| nice.c | ||
| not-cancel.h | ||
| nptl-signals.h | ||
| nscd_setup_thread.c | ||
| ntp_gettime.c | ||
| ntp_gettimex.c | ||
| open64.c | ||
| openat64.c | ||
| openat.c | ||
| opendir.c | ||
| opensock.c | ||
| pathconf.c | ||
| pathconf.h | ||
| paths.h | ||
| posix_fadvise64.c | ||
| posix_fadvise.c | ||
| posix_fallocate64.c | ||
| posix_fallocate.c | ||
| posix_madvise.c | ||
| ppoll.c | ||
| pread64.c | ||
| pread.c | ||
| preadv64.c | ||
| preadv.c | ||
| prlimit.c | ||
| prof-freq.c | ||
| profil.c | ||
| pselect.c | ||
| pt-raise.c | ||
| pthread_getaffinity.c | ||
| pthread_getcpuclockid.c | ||
| pthread_getname.c | ||
| pthread_kill.c | ||
| pthread_setaffinity.c | ||
| pthread_setname.c | ||
| pthread_sigmask.c | ||
| pthread_sigqueue.c | ||
| ptrace.c | ||
| ptsname.c | ||
| pwrite64.c | ||
| pwrite.c | ||
| pwritev64.c | ||
| pwritev.c | ||
| raise.c | ||
| readahead.c | ||
| readdir64_r.c | ||
| readdir64.c | ||
| readlinkat.c | ||
| readonly-area.c | ||
| readv.c | ||
| reboot.c | ||
| recv.S | ||
| recvfrom.S | ||
| recvmmsg.c | ||
| recvmsg.S | ||
| remove.c | ||
| renameat.c | ||
| sa_len.c | ||
| safe-fatal.h | ||
| sched_getaffinity.c | ||
| sched_getcpu.c | ||
| sched_setaffinity.c | ||
| segfault.c | ||
| semctl.c | ||
| semget.c | ||
| semop.c | ||
| semtimedop.c | ||
| send.S | ||
| sendmmsg.c | ||
| sendmsg.S | ||
| sendto.S | ||
| setegid.c | ||
| seteuid.c | ||
| setgid.c | ||
| setgroups.c | ||
| sethostid.c | ||
| setipv4sourcefilter.c | ||
| setregid.c | ||
| setresgid.c | ||
| setresuid.c | ||
| setreuid.c | ||
| setrlimit64.c | ||
| setsockopt.S | ||
| setsourcefilter.c | ||
| setuid.c | ||
| shlib-versions | ||
| shm_open.c | ||
| shm_unlink.c | ||
| shmat.c | ||
| shmctl.c | ||
| shmdt.c | ||
| shmget.c | ||
| shutdown.S | ||
| sigaction.c | ||
| siglist.h | ||
| signal.c | ||
| signalfd.c | ||
| sigpending.c | ||
| sigprocmask.c | ||
| sigqueue.c | ||
| sigreturn.c | ||
| sigset-cvt-mask.h | ||
| sigstack.c | ||
| sigsuspend.c | ||
| sigtimedwait.c | ||
| sigwait.c | ||
| sigwaitinfo.c | ||
| sizes.h | ||
| sleep.c | ||
| socketcall.h | ||
| socketpair.S | ||
| speed.c | ||
| statfs64.c | ||
| statvfs64.c | ||
| statvfs.c | ||
| symlinkat.c | ||
| sync_file_range.c | ||
| syscalls.list | ||
| sysconf.c | ||
| sysctl.c | ||
| sysctl.mk | ||
| syslog.c | ||
| system.c | ||
| tcdrain.c | ||
| tcflow.c | ||
| tcflush.c | ||
| tcgetattr.c | ||
| tcgetpgrp.c | ||
| tcsendbrk.c | ||
| tcsetattr.c | ||
| tcsetpgrp.c | ||
| termio.h | ||
| testrtsig.h | ||
| time.c | ||
| timer_create.c | ||
| timer_delete.c | ||
| timer_getoverr.c | ||
| timer_gettime.c | ||
| timer_routines.c | ||
| timer_settime.c | ||
| times.c | ||
| timespec_get.c | ||
| truncate64.c | ||
| tst-clone.c | ||
| tst-fanotify.c | ||
| tst-getcpu.c | ||
| tst-setgetname.c | ||
| ttyname_r.c | ||
| ttyname.c | ||
| ualarm.c | ||
| umount2.S | ||
| umount.S | ||
| unlinkat.c | ||
| unlockpt.c | ||
| updwtmp.c | ||
| usleep.c | ||
| ustat.c | ||
| utimensat.c | ||
| utimes.c | ||
| utmp_file.c | ||
| Versions | ||
| vfork.c | ||
| wait3.c | ||
| wait.c | ||
| waitid.c | ||
| waitpid.c | ||
| writev.c | ||
| xmknod.c | ||
| xmknodat.c | ||
| xstat64.c | ||
| xstat.c | ||
| xstatconv.c | ||
| xstatconv.h | ||