Commit 5385713a authored by Masanori Goto's avatar Masanori Goto

- These debian/patches/<below files> are removed from cvs because

      they are no longer being used and were superceeded by CVS patches:
      - glibc23-02-hppa-min-kern-unwind-fde.dpatch
      - glibc23-03-hppa-mcontext.dpatch
      - glibc23-04-hppa-fcntl64.dpatch
      - glibc23-05-hppa-buildhack.dpatch
      - glibc23-06-hppa-tests.dpatch
      - glibc23-08-hppa-configure.dpatch

svn path=/trunk/; revision=220
parent d2644e3a
......@@ -68,6 +68,15 @@ glibc (2.3.1-15) unstable; urgency=low
His summary: Malloc alignment has been moved back to 8 for optimal
performance.
- These debian/patches/<below files> are removed from cvs because
they are no longer being used and were superceeded by CVS patches:
- glibc23-02-hppa-min-kern-unwind-fde.dpatch
- glibc23-03-hppa-mcontext.dpatch
- glibc23-04-hppa-fcntl64.dpatch
- glibc23-05-hppa-buildhack.dpatch
- glibc23-06-hppa-tests.dpatch
- glibc23-08-hppa-configure.dpatch
- Glibc 2.3 uses another regex engine: "sed: woody version more than
1000 times slower than potato version" should be fixed.
(Closes: #155751)
......
#! /bin/sh -e
# DP: Description: Minimum required kernel bump.
# DP: Author: Carlos O'Donell <carlos@baldric.uwo.ca>
# DP: Upstream status: Submitted
# DP: Status Details: Awaiting upstream approval
# DP: Date: November 16, 2002
#
#2002-11-11 Carlos O'Donell <carlos@baldric.uwo.ca>
#
# * sysdeps/unix/sysv/linux/configure.in:
# Make 2.4.19 minimum linux kernel for hppa, and add unwind symbols
# from gcc-3.0 era for backwards compatibility.
# * sysdeps/unix/sysv/linux/configure: Regenerate.
#
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
# append the patch here and adjust the -p? flag in the patch calls.
--- glibc-2.3.1.orig/sysdeps/unix/sysv/linux/configure.in 2002-10-25 21:06:29.000000000 -0400
+++ glibc-2.3.1/sysdeps/unix/sysv/linux/configure.in 2002-11-17 22:09:57.000000000 -0500
@@ -64,7 +64,8 @@
arch_minimum_kernel=2.4.0
;;
hppa*)
- arch_minimum_kernel=2.3.99
+ libc_cv_gcc_unwind_find_fde=yes
+ arch_minimum_kernel=2.4.19
;;
m68k*)
arch_minimum_kernel=2.0.10
--- glibc-2.3.1.orig/sysdeps/unix/sysv/linux/configure 2002-10-25 21:06:29.000000000 -0400
+++ glibc-2.3.1/sysdeps/unix/sysv/linux/configure 2002-11-17 22:10:17.000000000 -0500
@@ -101,7 +101,8 @@
arch_minimum_kernel=2.4.0
;;
hppa*)
- arch_minimum_kernel=2.3.99
+ libc_cv_gcc_unwind_find_fde=yes
+ arch_minimum_kernel=2.4.19
;;
m68k*)
arch_minimum_kernel=2.0.10
#! /bin/sh -e
# DP: Description: Change HPPA mcontext to match kernel view.
# DP: Author: Carlos O'Donell <carlos@baldric.uwo.ca>
# DP: Upstream status: Submitted
# DP: Status Details: Awaiting approval
# DP: Date: November 16, 2002
#
#2002-08-20 Carlos O'Donell <carlos@baldric.uwo.ca>
#
# * sysdeps/unix/sysv/linux/hppa/sys/ucontext.h:
# Define mcontext_t as a sigcontext.
#
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
# append the patch here and adjust the -p? flag in the patch calls.
diff -urN glibc-2.2.5/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h glibc-2.2.5/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h
--- glibc-2.2.5/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h 2002-08-20 20:50:17.000000000 -0400
+++ glibc-2.2.5/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h 2002-08-20 20:49:01.000000000 -0400
@@ -52,11 +52,7 @@
} fpregset_t;
/* Context to describe whole processor state. */
-typedef struct
- {
- gregset_t gregs;
- fpregset_t fpregs;
- } mcontext_t;
+typedef struct sigcontext mcontext_t;
/* Userlevel context. */
typedef struct ucontext
#! /bin/sh -e
# DP: Description: Fixes fcntl64 on HPPA
# DP: Author: Randolph Chung <tausq@debian.org>
# DP: Upstream status: Submitted by Carlos O'Donell <carlos@baldric.uwo.ca>
# DP: Status Details: Awaiting upstream approval
# DP: Date: November 16, 2002
#
#2002-10-01 Randolph Chung <tausq@debian.org>
#
# * sysdeps/unix/sysv/linux/hppa/fcntl.c:
# Include sysdeps/unix/sysv/linux/i386/fcntl.c
# * sysdeps/unix/sysv/linux/hppa/bits/fcntl.h:
# Change defines when using __USE_FILE_OFFSET64
#
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
# append the patch here and adjust the -p? flag in the patch calls.
--- glibc/sysdeps/unix/sysv/linux/hppa/fcntl.c 2002-09-10 20:58:07.000000000 -0700
+++ glibc/sysdeps/unix/sysv/linux/hppa/fcntl.c 2002-09-10 20:58:07.000000000 -0700
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/fcntl.c>
--- glibc/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h 2002-09-12 10:31:56.000000000 -0700
+++ glibc/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h 2002-09-12 23:43:14.000000000 -0700
@@ -63,9 +63,15 @@
#define F_SETFD 2 /* Set file descriptor flags. */
#define F_GETFL 3 /* Get file status flags. */
#define F_SETFL 4 /* Set file status flags. */
+#ifndef __USE_FILE_OFFSET64
#define F_GETLK 5 /* Get record locking info. */
#define F_SETLK 6 /* Set record locking info (non-blocking). */
#define F_SETLKW 7 /* Set record locking info (blocking). */
+#else
+#define F_GETLK F_GETLK64 /* Get record locking info. */
+#define F_SETLK F_SETLK64 /* Set record locking info (non-blocking). */
+#define F_SETLKW F_SETLKW64 /* Set record locking info (blocking). */
+#endif
#define F_GETLK64 8 /* Get record locking info. */
#define F_SETLK64 9 /* Set record locking info (non-blocking). */
#! /bin/sh -e
# DP: Description: Remove the use of fp regs during the loader
# DP: Author: Randolph Chung <tausq@debian.org>
# DP: Upstream status: Submitted by Carlos O'Donell <carlos@baldric.uwo.ca>
# DP: Status Details: Awaiting upstream approval
# DP: Date: November 16, 2002
#
#2002-11-11 Randolph Chung <tausq@debian.org>
#
# * sysdeps/hppa/Makefile: Disable the use of fp regs in rtld.c
#
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
# append the patch here and adjust the -p? flag in the patch calls.
--- glibc/sysdeps/hppa/Makefile.orig 2002-09-11 20:19:15.000000000 -0700
+++ glibc/sysdeps/hppa/Makefile 2002-09-11 20:19:17.000000000 -0700
@@ -27,6 +27,7 @@
endif
ifeq ($(subdir),elf)
+CFLAGS-rtld.c += -mdisable-fpregs
dl-routines += dl-symaddr dl-fptr
rtld-routines += dl-symaddr dl-fptr
endif
This diff is collapsed.
#! /bin/sh -e
# DP: Description: Change link order of libgcc and libgcc_eh
# DP: Author: Carlos O'Donell <carlos@baldric.uwo.ca>
# DP: Upstream status: Submitted
# DP: Status Details: Awaiting upstream approval
# DP: Date: November 16, 2002
#
#2002-11-16 Carlos O'Donell <carlos@baldric.uwo.ca>
#
# * configure.in: Change "-lgcc -lgcc_eh" to "-lgcc_eh -lgcc"
# * configure: Regenerate.
#
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 -p0 < $0;;
-unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
esac
exit 0
# append the patch here and adjust the -p? flag in the patch calls.
--- configure.in~ 2002-11-18 23:55:32.000000000 -0500
+++ configure.in 2002-11-18 23:55:54.000000000 -0500
@@ -1508,9 +1508,9 @@
fi
if AC_TRY_COMMAND([${CC-cc} $CFLAGS -DCHECK__register_frame_info
-nostdlib -nostartfiles
- -o conftest conftest.c -lgcc -lgcc_eh >&AC_FD_CC]); then
+ -o conftest conftest.c -lgcc_eh -lgcc >&AC_FD_CC]); then
if ${CC-cc} $CFLAGS -DCHECK__register_frame_info -nostdlib -nostartfiles \
- -o conftest conftest.c -lgcc -lgcc_eh -v 2>&1 >/dev/null \
+ -o conftest conftest.c -lgcc_eh -lgcc -v 2>&1 >/dev/null \
| grep -q -- --eh-frame-hdr; then
libc_cv_gcc_dwarf2_unwind_info=no_registry_needed
else
--- configure~ 2002-11-18 23:56:01.000000000 -0500
+++ configure 2002-11-19 00:02:22.000000000 -0500
@@ -2383,7 +2383,7 @@
fi
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3612,9 +3612,9 @@
fi
if { ac_try='${CC-cc} $CFLAGS -DCHECK__register_frame_info
-nostdlib -nostartfiles
- -o conftest conftest.c -lgcc -lgcc_eh >&5'; { (eval echo configure:3616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ -o conftest conftest.c -lgcc_eh -lgcc >&5'; { (eval echo configure:3616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
if ${CC-cc} $CFLAGS -DCHECK__register_frame_info -nostdlib -nostartfiles \
- -o conftest conftest.c -lgcc -lgcc_eh -v 2>&1 >/dev/null \
+ -o conftest conftest.c -lgcc_eh -lgcc -v 2>&1 >/dev/null \
| grep -q -- --eh-frame-hdr; then
libc_cv_gcc_dwarf2_unwind_info=no_registry_needed
else
@@ -3821,15 +3821,16 @@
#line 3822 "configure"
#include "confdefs.h"
#include <stdio.h>
-int main()
+#include <sys/types.h>
+main()
{
FILE *f=fopen("conftestval", "w");
- if (!f) return(1);
+ if (!f) exit(1);
fprintf(f, "%d\n", sizeof(long double));
- return(0);
+ exit(0);
}
EOF
-if { (eval echo configure:3833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_double=`cat conftestval`
else
@@ -3907,7 +3908,7 @@
fi
echo $ac_n "checking OS release for uname""... $ac_c" 1>&6
-echo "configure:3911: checking OS release for uname" >&5
+echo "configure:3912: checking OS release for uname" >&5
if eval "test \"`echo '$''{'libc_cv_uname_release'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3929,7 +3930,7 @@
uname_release="$libc_cv_uname_release"
echo $ac_n "checking OS version for uname""... $ac_c" 1>&6
-echo "configure:3933: checking OS version for uname" >&5
+echo "configure:3934: checking OS version for uname" >&5
if eval "test \"`echo '$''{'libc_cv_uname_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3958,7 +3959,7 @@
# Test for old glibc 2.0.x headers so that they can be removed properly
# Search only in includedir.
echo $ac_n "checking for old glibc 2.0.x headers""... $ac_c" 1>&6
-echo "configure:3962: checking for old glibc 2.0.x headers" >&5
+echo "configure:3963: checking for old glibc 2.0.x headers" >&5
if eval test -f "${includedir}/elfclass.h" -a -f "${includedir}/fcntlbits.h"
then
old_glibc_headers=yes
@@ -4019,7 +4020,7 @@
fi
echo $ac_n "checking whether -fPIC is default""... $ac_c" 1>&6
-echo "configure:4023: checking whether -fPIC is default" >&5
+echo "configure:4024: checking whether -fPIC is default" >&5
if eval "test \"`echo '$''{'pic_default'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
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