mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
Remove ldd libc4 support
The older libc versions are obsolete for over twenty years now.
This commit is contained in:
Adhemerval Zanella
parent
8ee878592c
commit
36676f5e5d
@ -866,7 +866,7 @@ endif
|
||||
+extra-math-flags = $(if $(filter libm,$(in-module)),-fno-math-errno,-fmath-errno)
|
||||
|
||||
# Use 64 bit time_t support for installed programs
|
||||
installed-modules = nonlib nscd lddlibc4 ldconfig locale_programs \
|
||||
installed-modules = nonlib nscd ldconfig locale_programs \
|
||||
iconvprogs libnss_files libnss_compat libnss_db libnss_hesiod \
|
||||
libutil libpcprofile libSegFault
|
||||
+extra-time-flags = $(if $(filter $(installed-modules),\
|
||||
@ -966,7 +966,7 @@ endif # $(+cflags) == ""
|
||||
libio-include = -I$(..)libio
|
||||
|
||||
# List of non-library modules that we build.
|
||||
built-modules = iconvprogs iconvdata ldconfig lddlibc4 libmemusage \
|
||||
built-modules = iconvprogs iconvdata ldconfig libmemusage \
|
||||
libSegFault libpcprofile librpcsvc locale-programs \
|
||||
memusagestat nonlib nscd extramodules libnldbl libsupport \
|
||||
testsuite testsuite-internal
|
||||
|
||||
@ -393,8 +393,6 @@ endif
|
||||
ifeq ($(subdir),elf)
|
||||
sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir
|
||||
|
||||
libof-lddlibc4 = lddlibc4
|
||||
|
||||
others += pldd
|
||||
install-bin += pldd
|
||||
$(objpfx)pldd: $(objpfx)xmalloc.o
|
||||
|
||||
1
sysdeps/unix/sysv/linux/csky/configure
vendored
1
sysdeps/unix/sysv/linux/csky/configure
vendored
@ -2,4 +2,3 @@
|
||||
# Local configure fragment for sysdeps/unix/sysv/linux/csky
|
||||
|
||||
arch_minimum_kernel=4.20.0
|
||||
ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
|
||||
|
||||
@ -2,4 +2,3 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
|
||||
# Local configure fragment for sysdeps/unix/sysv/linux/csky
|
||||
|
||||
arch_minimum_kernel=4.20.0
|
||||
ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
|
||||
|
||||
@ -7,11 +7,6 @@ sysdep_routines += ioperm iopl vm86
|
||||
tests += tst-bz21269
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),elf)
|
||||
sysdep-others += lddlibc4
|
||||
install-bin += lddlibc4
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),io)
|
||||
sysdep_routines += libc-do-syscall libc-do-syscall-int80
|
||||
endif
|
||||
|
||||
1
sysdeps/unix/sysv/linux/i386/configure
vendored
1
sysdeps/unix/sysv/linux/i386/configure
vendored
@ -2,4 +2,3 @@
|
||||
# Local configure fragment for sysdeps/unix/sysv/linux/i386.
|
||||
|
||||
libc_cv_gcc_unwind_find_fde=yes
|
||||
ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
|
||||
|
||||
@ -2,4 +2,3 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
|
||||
# Local configure fragment for sysdeps/unix/sysv/linux/i386.
|
||||
|
||||
libc_cv_gcc_unwind_find_fde=yes
|
||||
ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
/Maybe extra code for non-ELF binaries/a\
|
||||
file=$1\
|
||||
# Run the ldd stub.\
|
||||
lddlibc4 "$file"\
|
||||
# Test the result.\
|
||||
if test $? -lt 3; then\
|
||||
return 0;\
|
||||
fi\
|
||||
# In case of an error punt.
|
||||
/LD_TRACE_LOADED_OBJECTS=1/a\
|
||||
@ -1,104 +0,0 @@
|
||||
/* Stub for ldd script to print Linux libc4 dependencies.
|
||||
Copyright (C) 1998-2022 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 Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
/* This code is based on the `ldd' program code from the Linux ld.so
|
||||
package. */
|
||||
|
||||
#include <a.out.h>
|
||||
#include <errno.h>
|
||||
#include <error.h>
|
||||
#include <libintl.h>
|
||||
#include <locale.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/* Get libc version number. */
|
||||
#include "../version.h"
|
||||
|
||||
#define PACKAGE _libc_intl_domainname
|
||||
|
||||
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
const char *filename;
|
||||
size_t filename_len;
|
||||
struct exec exec;
|
||||
char *buf;
|
||||
FILE *fp;
|
||||
|
||||
/* Set locale via LC_ALL. */
|
||||
setlocale (LC_ALL, "");
|
||||
|
||||
/* Set the text message domain. */
|
||||
textdomain (PACKAGE);
|
||||
|
||||
/* We expect exactly one argument. */
|
||||
if (argc != 2)
|
||||
return 1;
|
||||
|
||||
if (strcmp (argv[1], "--help") == 0)
|
||||
{
|
||||
printf (gettext ("Usage: lddlibc4 FILE\n\n"));
|
||||
printf (gettext ("For bug reporting instructions, please see:\n\
|
||||
%s.\n"), REPORT_BUGS_TO);
|
||||
return 0;
|
||||
}
|
||||
else if (strcmp (argv[1], "--version") == 0)
|
||||
{
|
||||
printf ("lddlibc4 %s%s\n", PKGVERSION, VERSION);
|
||||
printf (gettext ("\
|
||||
Copyright (C) %s Free Software Foundation, Inc.\n\
|
||||
This is free software; see the source for copying conditions. There is NO\n\
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
|
||||
"), "2022");
|
||||
return 0;
|
||||
}
|
||||
|
||||
filename = argv[1];
|
||||
|
||||
/* First see whether this is really an a.out binary. */
|
||||
fp = fopen (filename, "rb");
|
||||
if (fp == NULL)
|
||||
error (2, errno, gettext ("cannot open `%s'"), filename);
|
||||
|
||||
/* Read the program header. */
|
||||
if (fread (&exec, sizeof exec, 1, fp) < 1)
|
||||
error (2, errno, gettext ("cannot read header from `%s'"), filename);
|
||||
|
||||
/* Test for the magic numbers. */
|
||||
if (N_MAGIC (exec) != ZMAGIC && N_MAGIC (exec) != QMAGIC
|
||||
&& N_MAGIC (exec) != OMAGIC)
|
||||
exit (3);
|
||||
|
||||
/* We don't need the file open anymore. */
|
||||
fclose (fp);
|
||||
|
||||
/* We must put `__LDD_ARGV0=<program-name>' in the environment. */
|
||||
filename_len = strlen (filename);
|
||||
buf = (char *) alloca (sizeof "__LDD_ARGV0=" + filename_len);
|
||||
mempcpy (mempcpy (buf, "__LDD_ARGV0=", sizeof "__LDD_ARGV0=" - 1),
|
||||
filename, filename_len + 1);
|
||||
/* ...and put the value in the environment. */
|
||||
putenv (buf);
|
||||
|
||||
/* Now we can execute the binary. */
|
||||
return execv (filename, &argv[argc]) ? 4 : 0;
|
||||
}
|
||||
@ -15,8 +15,3 @@ ifeq ($(subdir),misc)
|
||||
sysdep_routines += mremap
|
||||
sysdep_headers += sys/reg.h
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),elf)
|
||||
sysdep-others += lddlibc4
|
||||
install-bin += lddlibc4
|
||||
endif
|
||||
|
||||
1
sysdeps/unix/sysv/linux/m68k/configure
vendored
1
sysdeps/unix/sysv/linux/m68k/configure
vendored
@ -6,4 +6,3 @@ m68k/coldfire)
|
||||
libc_cv_gcc_unwind_find_fde=yes
|
||||
;;
|
||||
esac
|
||||
ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
|
||||
|
||||
@ -7,4 +7,3 @@ m68k/coldfire)
|
||||
libc_cv_gcc_unwind_find_fde=yes
|
||||
;;
|
||||
esac
|
||||
ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
|
||||
|
||||
@ -13,8 +13,6 @@ endif
|
||||
ifeq ($(subdir),elf)
|
||||
CFLAGS-rtld.c += -mcpu=v8
|
||||
#rtld-routines += dl-sysdepsparc
|
||||
sysdep-others += lddlibc4
|
||||
install-bin += lddlibc4
|
||||
endif # elf
|
||||
|
||||
ifeq ($(subdir),math)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user