Commit ab8d9022 authored by Jeff Bailey's avatar Jeff Bailey

From changelog:

    - debian/control.in/main: Require binutils 2.13.90.0.10-1 for ppc

    - debian/patches/elf-machine-rela-mips.dpatch: New file
    - debian/patches/0list: Update accordingly.

    - debian/rules: Use -O on i386.  This should go somewhere else,
    but I want to get this release out.

Also, reverted `make check' failure.

svn path=/trunk/; revision=92
parent 863d88d9
glibc (2.3.1-1) unstable; urgency=low
* This is the "twilight" release...
* Jeff Bailey <jbailey@nisa.net>
- Upgrade tarballs to 2.3.1
- version: Update to 2.3.1
- debian/rules: Fail build on failed `make check'.
- debian/sysdeps/linux.mk: Do not build optimized libraries
- debian/rules.d/control.mk: Likewise
- debian/control.in/main: Require binutils 2.13.90.0.10-1 for ppc
- debian/patches/elf-machine-rela-mips.dpatch: New file
- debian/patches/0list: Update accordingly.
- debian/rules: Use -O on i386. This should go somewhere else,
but I want to get this release out.
* XXX Below here was during the 2.3 development, and never released.
* Jeff Bailey <jbailey@nisa.net>
......@@ -56,7 +62,7 @@ glibc (2.3.1-1) unstable; urgency=low
- debian/patches/fhs-linux-paths.dpatch: Update to new template format
- .cvsignore: New file
* XXX Below here was during the 2.2.93 development, and never released.
* Jeff Bailey <jbailey@nisa.net>
......@@ -154,7 +160,7 @@ glibc (2.3.1-1) unstable; urgency=low
glibc22-hppa-pthreads, glibc22-hppa-rela, ia64-perf
- debian/rules: memset.S works on ppc now, so stop deleting it. Thanks
- debian/rules: memset.S works on ppc now, so stop deleting it. Thanks
to Jack Howarth <howarth@fuse.net> for letting us know.
- debian/sysdeps/gnu.mk: Remove --enable-libio, now set by default. Add
......@@ -200,7 +206,7 @@ glibc (2.3.1-1) unstable; urgency=low
Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
Closes: #155606
-- Jeff Bailey <jbailey@nisa.net> Fri, 30 Aug 2002 17:27:04 -0400
-- Jeff Bailey <jbailey@nisa.net> Thu, 17 Oct 2002 08:37:52 -0400
glibc (2.2.5-15) unstable; urgency=low
......
Source: glibc
Section: libs
Priority: required
Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.2, autoconf, binutils (>= 2.13.90.0.4-1)
Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.2, autoconf, binutils (>= 2.13.90.0.10-1)
Build-Depends-Indep: perl, latex2html
Build-Conflicts: kernel-headers-2.4.19-sparc [!sparc], kernel-headers-2.4.18-sparc [!sparc]
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
......
Source: @glibc@
Section: libs
Priority: required
Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.2, autoconf, binutils (>= 2.13.90.0.4-1)
Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.2, autoconf, binutils (>= 2.13.90.0.10-1)
Build-Depends-Indep: perl, latex2html
Build-Conflicts: kernel-headers-2.4.19-sparc [!sparc], kernel-headers-2.4.18-sparc [!sparc]
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
......
......@@ -29,3 +29,4 @@ glibc22-hppa-mcontext
glibc22-hppa-fcntl
ldso-disable-hwcap
glibc22-hppa-fcntl-lfs
elf-machine-rela-mips
#! /bin/sh -e
# DP: Description: Dummy out _dl_resolve_conflicts for mips
# DP: Author: H.J. Lu <hjl@gnu.org>
# DP: Upstream status: Pending
# DP: Status Details: Not accepted upstream. The right thing is to
# Support this correctly.
# DP: Date: 2002-02-04
echo $#
if [ $# -ne 2 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
esac
exit 0
--- libc/elf/dl-conflict.c.mips Mon Feb 4 13:44:57 2002
+++ libc/elf/dl-conflict.c Mon Feb 4 15:10:31 2002
@@ -33,6 +33,7 @@ void
_dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
ElfW(Rela) *conflictend)
{
+#ifndef _DL_HAVE_NO_ELF_MACHINE_RELA
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_RELOC, 0))
_dl_printf ("\nconflict processing: %s\n",
l->l_name[0] ? l->l_name : _dl_argv[0]);
@@ -63,4 +64,5 @@ _dl_resolve_conflicts (struct link_map *
for (; conflict < conflictend; ++conflict)
elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset);
}
+#endif
}
--- libc/sysdeps/mips/dl-machine.h.mips Mon Feb 4 13:45:18 2002
+++ libc/sysdeps/mips/dl-machine.h Mon Feb 4 15:08:39 2002
@@ -56,6 +56,9 @@
#define ELF_MACHINE_JMP_SLOT R_MIPS_REL32
#define elf_machine_type_class(type) ELF_RTYPE_CLASS_PLT
+/* MIPS doesn't support RELA. */
+#define _DL_HAVE_NO_ELF_MACHINE_RELA
+
/* Translate a processor specific dynamic tag to the index
in l_info array. */
#define DT_MIPS(x) (DT_MIPS_##x - DT_LOPROC + DT_NUM)
......@@ -95,7 +95,7 @@ ifeq ($(NO_LOG),)
endif
$(warning Please check results before uploading in case of test failures.)
date >$(log_test)
$(MAKE) SHELL=/bin/bash -C $(objdir) check 2>&1 | tee -a $(log_test)
-$(MAKE) -k SHELL=/bin/bash -C $(objdir) check 2>&1 | tee -a $(log_test)
date >>$(log_test)
endif
......@@ -123,10 +123,16 @@ endif
rm -f $(objdir)/configparms
echo "CC = $(CC)" >> $(objdir)/configparms
echo "BUILD_CC = $(BUILD_CC)" >> $(objdir)/configparms
# DISABLE CFLAGS for now until better solution is found
# for ldconfig miscompile - JB 2002-Oct-03
# echo "CFLAGS = $(HOST_CFLAGS)" >> $(objdir)/configparms
# echo "BUILD_CFLAGS = -O2" >> $(objdir)/configparms
# Reduce optimization level of build on i386. This needs to
# be properly put into sysdeps somewhere until the bug is
# fixed. - JB 2002-Oct-17
ifeq ($(DEB_HOST_GNU_CPU),i386)
echo "CFLAGS = -O" >> $(objdir)/configparms
echo "BUILD_CFLAGS = -O" >> $(objdir)/configparms
else
echo "CFLAGS = $(HOST_CFLAGS)" >> $(objdir)/configparms
echo "BUILD_CFLAGS = -O2" >> $(objdir)/configparms
endif
echo "BASH := /bin/bash" >> $(objdir)/configparms
echo "KSH := /bin/bash" >> $(objdir)/configparms
echo "mandir = $(mandir)" >> $(objdir)/configparms
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment