r1540 - in glibc-package/branches/glibc-2.4/debian: . control.in local/manpages patches patches/any patches/arm patches/hppa patches/hurd-i386 patches/kfreebsd patches/localedata patches/mips rules.d sysdeps
Author: schizo
Date: 2006-05-27 13:41:18 +0000 (Sat, 27 May 2006)
New Revision: 1540
Added:
glibc-package/branches/glibc-2.4/debian/sysdeps/m32r.mk
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/control.in/main
glibc-package/branches/glibc-2.4/debian/local/manpages/iconv.1
glibc-package/branches/glibc-2.4/debian/local/manpages/localedef.1
glibc-package/branches/glibc-2.4/debian/patches/README
glibc-package/branches/glibc-2.4/debian/patches/any/local-asserth-decls.diff
glibc-package/branches/glibc-2.4/debian/patches/any/local-dl-execstack.diff
glibc-package/branches/glibc-2.4/debian/patches/any/local-gcc4-wcstol_l.diff
glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig.diff
glibc-package/branches/glibc-2.4/debian/patches/any/submitted-strfmon.diff
glibc-package/branches/glibc-2.4/debian/patches/arm/local-dwarf2-buildfix.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fenv-align.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-full-nptl-2003-10-22.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-full-nptl-2004-12-20.diff
glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/local-enable-ldconfig.diff
glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-wo_SN.diff
glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-inline.diff
glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-sysdeps.diff
glibc-package/branches/glibc-2.4/debian/patches/mips/local-lazy-eval.diff
glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff
glibc-package/branches/glibc-2.4/debian/patches/mips/submitted-msq.diff
glibc-package/branches/glibc-2.4/debian/rules
glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
glibc-package/branches/glibc-2.4/debian/rules.d/control.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
Log:
haphazardly merge things from trunk
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-27 13:41:18 UTC (rev 1540)
@@ -32,8 +32,6 @@
- Build with gcc 4.1 on all architectures.
- debian/patches/sparc/local-linuxthreads.diff: fill in missing
preprocessor macros.
- - debian/control: bump to Standards-Version 3.7.2.
- - debian/debhelper.in/libc.preinst: use POSIX syntax for kill.
[ Denis Barbier ]
- Remove complex-collate.diff (merged upstream).
@@ -56,10 +54,35 @@
glibc (2.3.6-11) UNRELEASED; urgency=low
- *
+ [ Aurelien Jarno ]
+ * debian/rules/build.mk: don't remove ld.so from udeb packages.
+ * debian/rules: move udeb_add-ons to debian/sysdeps/{kfreebsd,linux}.mk.
+ * M32R support: (Closes: #366962)
+ - debian/rules.d/control.mk: add m32r.
+ - Add debian/sysdeps/m32r.mk.
+ * debian/local/manpages/localedef.1: fix a typo. (Closes: #310477)
+ * debian/local/manpages/iconv.1: fix the indentation (Closes: #316148)
+ * debian/local/manpages/iconv.1, debian/local/manpages/localedef.1: change
+ sarge into etch.
+ * debian/sysdeps/kfreebsd.mk: build the udeb package with -Os on
+ kfreebsd-i386 and kfreebsd-amd64.
+ * debian/sysdeps/*.mk: build the udeb with -Os on amd64, i386, mips and
+ mipsel, powerpc and sparc.
+ * debian/sysdeps/arm.mk: set udeb_MIN_KERNEL_SUPPORTED to 2.4.1, as the
+ arm build daemons are still running a 2.4 kernel.
+ * debian/sysdeps/i386.mk: add a symlink (/usr)/lib/i386-linux-gnu ->
+ (/usr)/lib/i486-linux-gnu.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 21 May 2006 21:49:35 +0000
+ [ Denis Barbier ]
+ * Add patches/all/submitted-new-brf-encoding.diff: Add new BRF encoding
+ (ASCII Braille), submitted upstream by Samuel Thibault.
+ [ Clint Adams ]
+ * debian/debhelper.in/libc.preinst: use POSIX syntax for kill.
+ * debian/control.in/main: bump to Standards-Version 3.7.2.
+
+ -- Denis Barbier <barbier@debian.org> Mon, 22 May 2006 23:14:52 +0200
+
glibc (2.3.6-10) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/branches/glibc-2.4/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control.in/main 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/control.in/main 2006-05-27 13:41:18 UTC (rev 1540)
@@ -12,7 +12,7 @@
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Denis Barbier <barbier@debian.org>, Aurelien Jarno <aurel32@debian.org>
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Package: @glibc@-doc
Architecture: all
Modified: glibc-package/branches/glibc-2.4/debian/local/manpages/iconv.1
===================================================================
--- glibc-package/branches/glibc-2.4/debian/local/manpages/iconv.1 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/local/manpages/iconv.1 2006-05-27 13:41:18 UTC (rev 1540)
@@ -101,7 +101,7 @@
.nr % 0
.rr F
.\}
-.TH ICONV 1 "sarge" "20/Jun/2004" "Debian GNU/Linux"
+TH ICONV 1 "etch" "20/Jun/2004" "Debian GNU/Linux"
.UC
.if n .hy 0
.if n .na
@@ -204,45 +204,35 @@
\fIinputfile\fR from one coded character set to another. The result is
written to standard output unless otherwise specified by the
\fB\-\-output\fR option.
-.PP
+.TP
\fB\-\-from\-code\fR, \fB\-f\fR \fIencoding\fR
-.PP
Convert characters from \fIencoding\fR.
-.PP
+.TP
\fB\-\-to\-code\fR, \fB\-t\fR \fIencoding\fR
-.PP
Convert characters to \fIencoding\fR.
-.PP
+.TP
\fB\-\-list\fR, \fB\-l\fR
-.PP
List known coded character sets.
-.PP
+.TP
\fB\-c\fR
-.PP
Omit invalid characters from output.
-.PP
+.TP
\fB\-\-output\fR, \fB\-o\fR \fIfile\fR
-.PP
Specify output file (instead of stdout).
-.PP
+.TP
\fB\-\-silent\fR, \fB\-s\fR
-.PP
Supress warnings.
-.PP
+.TP
\fB\-\-verbose\fR
-.PP
Print progress information.
-.PP
+.TP
\fB\-\-help\fR, \fB\-?\fR
-.PP
Give help list.
-.PP
+.TP
\fB\-\-usage\fR
-.PP
Give a short usage message.
-.PP
+.TP
\fB\-\-version\fR, \fB\-V\fR
-.PP
Print program version.
.SH "AUTHOR"
\fIiconv\fR was written by Ulrich Drepper as part of the GNU C Library.
Modified: glibc-package/branches/glibc-2.4/debian/local/manpages/localedef.1
===================================================================
--- glibc-package/branches/glibc-2.4/debian/local/manpages/localedef.1 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/local/manpages/localedef.1 2006-05-27 13:41:18 UTC (rev 1540)
@@ -163,7 +163,7 @@
Suppress all notifications and warnings, and report only fatal errors.
.TP
.B \-\-posix
-Be strictly POSIX conformant. Implies
+Conform strictly to POSIX. Implies
.BR \-\-verbose .
This option currently has no other effect. Posix conformance is
assumed if the environment variable
Modified: glibc-package/branches/glibc-2.4/debian/patches/README
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/README 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/README 2006-05-27 13:41:18 UTC (rev 1540)
@@ -12,6 +12,7 @@
arch maintainers if needed.
The difference between 'all' and 'any' is that the latter touches several
-architecture dependent files, whereas the former only modifies
-architecture independent files.
+architecture dependent files (usually in the sysdeps directory), whereas
+the former only modifies architecture independent files. Porters are
+supposed to have an eye on their arch patches and on 'any'.
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-asserth-decls.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-asserth-decls.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-asserth-decls.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,4 +1,3 @@
-# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: /usr/include/assert.h
# DP: One must be allowed to include <assert.h> multiple times with different
# DP: values for NDEBUG, so the file is not protected against multiple
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-dl-execstack.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-dl-execstack.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-dl-execstack.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Support libraries that has execstack on <= 2.4.18 kernels.
# DP: Related bugs: #321718
# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-gcc4-wcstol_l.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-gcc4-wcstol_l.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-gcc4-wcstol_l.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on 64bit archs.
# DP: Related bugs:
# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# DP: Make it so that a missing /etc/ld.so.conf does not cause an error
# DP: message, unless --verbose is enabled. This keeps the debian
# DP: installer from barfing during bootstrap of the system.
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/submitted-strfmon.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/submitted-strfmon.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/submitted-strfmon.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,7 +1,3 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: The negative sign is not printed by strfmon when
# DP: current locale defines sign_posn == 4 (as in de_CH) and
# DP: format argument contains the ! modifier.
# DP: Note: upstream will fix indentation when applying this patch,
Modified: glibc-package/branches/glibc-2.4/debian/patches/arm/local-dwarf2-buildfix.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/arm/local-dwarf2-buildfix.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/arm/local-dwarf2-buildfix.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Adding empty m68k framestate.c not to build for dwarf2.
# DP: Related bugs:
# DP: Dpatch author: Philip Blundell <pb@nexus.co.uk>
Modified: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fenv-align.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fenv-align.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fenv-align.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Use temporary, 8-byte-aligned buffers for doubleword transfer.
# DP: Dpatch author: Daniel Jacobowitz <dan@debian.org>
# DP: Patch author: Daniel Jacobowitz <dan@debian.org>
Modified: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-full-nptl-2003-10-22.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-full-nptl-2003-10-22.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-full-nptl-2003-10-22.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: HP-PARISC GNU/Libc Fixes 2003-10-22
# DP: Related bugs:
Modified: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-full-nptl-2004-12-20.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-full-nptl-2004-12-20.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-full-nptl-2004-12-20.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: parisc patches based on 50_glibc232-hppa-full-nptl-2003-10-22.
# This dpatch excepts (1) patches applied already in cvs
Modified: glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/local-enable-ldconfig.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/local-enable-ldconfig.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/local-enable-ldconfig.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# DP: Description: Enable ldconfig and such on hurd-i386
# DP: Author: Jeff Bailey <jbailey@nisa.net>
# DP: Related Bugs: #309489
Modified: glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -9899,8 +9899,8 @@
+endif
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/i386/rfork.S sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/rfork.S
--- null/unix/bsd/bsd4.4/kfreebsd/i386/rfork.S 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/rfork.S 2006-05-21 22:27:34.000000000 +0200
-@@ -0,0 +1,44 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/rfork.S 2006-05-25 21:43:10.000000000 +0200
+@@ -0,0 +1,43 @@
+/* Copyright (C) 1991-1992, 1994-1995, 1997, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9936,7 +9936,6 @@
+ andl %edx, %eax
+
+ popl %edx
-+ cfi_adjust_cfa_offset(-4)
+ jmp *%ecx
+
+L(pseudo_end):
@@ -9976,8 +9975,8 @@
+ (handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx))
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S
--- null/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S 2006-05-21 22:27:34.000000000 +0200
-@@ -0,0 +1,207 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S 2006-05-25 21:43:10.000000000 +0200
+@@ -0,0 +1,202 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Bruno Haible <bruno@clisp.org>, 2002.
@@ -10008,10 +10007,6 @@
+
+ .text
+ENTRY (__start_thread)
-+ /* End FDE now, because in the child the unwind info will be
-+ wrong. */
-+ cfi_endproc
-+
+ /* There is a window of a few instructions, right after the rfork
+ system call, where the handling of a signal would write garbage
+ into the stack shared by the parent and the child (assuming
@@ -10183,7 +10178,6 @@
+ popl %ebx
+ popl %ebp
+ jmp SYSCALL_ERROR_LABEL
-+ cfi_startproc
+PSEUDO_END (__start_thread)
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/i386/swapcontext.S sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/swapcontext.S
--- null/unix/bsd/bsd4.4/kfreebsd/i386/swapcontext.S 1970-01-01 01:00:00.000000000 +0100
@@ -10596,8 +10590,8 @@
+#endif /* _SYSARCH_H */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/i386/syscall.S sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/syscall.S
--- null/unix/bsd/bsd4.4/kfreebsd/i386/syscall.S 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/syscall.S 2006-05-21 22:27:34.000000000 +0200
-@@ -0,0 +1,33 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/syscall.S 2006-05-25 21:43:10.000000000 +0200
+@@ -0,0 +1,31 @@
+/* Copyright (C) 1993, 1995-1998, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -10621,11 +10615,9 @@
+ .text;
+ENTRY (syscall)
+ popl %ecx /* Pop return address into %ecx. */
-+ cfi_adjust_cfa_offset (-4)
+ movl 0(%esp), %eax /* Load syscall number into %eax. */
+ int $0x80 /* Do the system call. */
+ pushl %ecx /* Push back return address. */
-+ cfi_adjust_cfa_offset (4)
+ jb SYSCALL_ERROR_LABEL; /* Jump to error handler if error. */
+
+L(pseudo_end):
@@ -10633,8 +10625,8 @@
+PSEUDO_END (syscall)
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/i386/sysdep.h sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep.h
--- null/unix/bsd/bsd4.4/kfreebsd/i386/sysdep.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep.h 2006-05-18 19:31:40.000000000 +0200
-@@ -0,0 +1,228 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep.h 2006-05-25 21:43:10.000000000 +0200
+@@ -0,0 +1,222 @@
+/* Copyright (C) 1992,1993,1995-2000,2002,2003,2004
+ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -10773,20 +10765,14 @@
+# else
+# define SYSCALL_ERROR_HANDLER \
+0:pushl %ebx; \
-+ cfi_adjust_cfa_offset (4); \
-+ cfi_rel_offset (ebx, 0); \
+ SETUP_PIC_REG (bx); \
+ addl $_GLOBAL_OFFSET_TABLE_, %ebx; \
+ pushl %eax; \
-+ cfi_adjust_cfa_offset (4); \
+ PUSH_ERRNO_LOCATION_RETURN; \
+ call BP_SYM (__errno_location)@PLT; \
+ POP_ERRNO_LOCATION_RETURN; \
+ popl %ecx; \
-+ cfi_adjust_cfa_offset (-4); \
+ popl %ebx; \
-+ cfi_adjust_cfa_offset (-4); \
-+ cfi_restore (ebx); \
+ movl %ecx, (%eax); \
+ orl $-1, %eax; \
+ jmp L(pseudo_end);
@@ -11032,8 +11018,8 @@
+}
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/i386/vfork.S sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/vfork.S
--- null/unix/bsd/bsd4.4/kfreebsd/i386/vfork.S 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/vfork.S 2006-05-21 22:27:34.000000000 +0200
-@@ -0,0 +1,58 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/vfork.S 2006-05-25 21:43:10.000000000 +0200
+@@ -0,0 +1,56 @@
+/* Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -11063,7 +11049,6 @@
+
+ /* Pop the return PC value into ECX. */
+ popl %ecx
-+ cfi_adjust_cfa_offset(-4)
+
+ /* Perform the system call. */
+ DO_CALL (vfork, 0)
@@ -11082,7 +11067,6 @@
+L(error):
+ /* Push back the return PC. */
+ pushl %ecx
-+ cfi_adjust_cfa_offset(4)
+
+ /* Branch to the error handler, hidden in PSEUDO_END. */
+ jmp SYSCALL_ERROR_LABEL
@@ -12148,8 +12132,8 @@
+weak_alias (__lxstat, _lxstat)
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/Makefile sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile
--- null/unix/bsd/bsd4.4/kfreebsd/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile 2006-05-02 21:24:22.000000000 +0200
-@@ -0,0 +1,118 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile 2006-05-25 21:43:10.000000000 +0200
+@@ -0,0 +1,119 @@
+# Use bash, not /bin/sh, for executing scripts, because the native
+# FreeBSD /bin/sh does not interpret the IFS="<tab>" read ... command
+# in localedata/tst-fmon.sh correctly.
@@ -12161,6 +12145,7 @@
+sysdep_headers += \
+ sys/ktrace.h \
+ sys/mount.h \
++ sys/kd.h \
+ sys/rfork.h
+endif
+
@@ -12275,8 +12260,8 @@
+/* 'mmap64' is the same as 'mmap', because __off64_t == __off_t. */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/mmap.c sysdeps/unix/bsd/bsd4.4/kfreebsd/mmap.c
--- null/unix/bsd/bsd4.4/kfreebsd/mmap.c 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/mmap.c 2006-01-02 19:10:55.000000000 +0100
-@@ -0,0 +1,78 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/mmap.c 2006-05-25 21:43:10.000000000 +0200
+@@ -0,0 +1,81 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Bruno Haible <bruno@clisp.org>, 2002.
@@ -12334,6 +12319,9 @@
+ }
+
+ /* We pass 7 arguments in 8 words. */
++ /* for ANON mapping we must pass -1 in place of fd */
++ if (flags & MAP_ANON)
++ return INLINE_SYSCALL (mmap, 7, addr, len, prot, flags, -1, 0, offset);
+ result = INLINE_SYSCALL (mmap, 7, addr, len, prot, flags, fd, 0, offset);
+
+ if (result != (void *) (-1) && fd >= 0 && len > 0)
@@ -12921,8 +12909,8 @@
+#endif /* !_NET_IF_H_ */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/netinet/if_ether.h sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/if_ether.h
--- null/unix/bsd/bsd4.4/kfreebsd/netinet/if_ether.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/if_ether.h 2006-05-21 22:27:37.000000000 +0200
-@@ -0,0 +1,127 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/if_ether.h 2006-05-25 21:43:09.000000000 +0200
+@@ -0,0 +1,138 @@
+/* Copyright (C) 1996, 1997, 1999, 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -12984,6 +12972,7 @@
+
+#include <net/ethernet.h>
+#include <net/if_arp.h>
++#include <netinet/in.h>
+
+__BEGIN_DECLS
+/*
@@ -13006,6 +12995,16 @@
+#define arp_pln ea_hdr.ar_pln
+#define arp_op ea_hdr.ar_op
+
++struct sockaddr_inarp {
++ __SOCKADDR_COMMON (sin_);
++ in_port_t sin_port; /* Port number. */
++ struct in_addr sin_addr; /* Internet address. */
++ struct in_addr sin_srcaddr;
++ unsigned short sin_tos;
++ unsigned short sin_other;
++#define SIN_PROXY 1
++};
++
+/*
+ * IP and ethernet specific routing flags
+ */
@@ -21342,8 +21341,8 @@
+#endif /* _FREEBSD_PT_MACHINE_H */
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep-cancel.h linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep-cancel.h
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep-cancel.h 1970-01-01 01:00:00.000000000 +0100
-+++ linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep-cancel.h 2006-05-18 19:31:39.000000000 +0200
-@@ -0,0 +1,158 @@
++++ linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sysdep-cancel.h 2006-05-25 21:43:09.000000000 +0200
+@@ -0,0 +1,149 @@
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@@ -21407,13 +21406,12 @@
+ fork()
+ vfork()
+ rfork()
-+ pipe()
+
+ none of them is cancelable, therefore
+*/
+
-+# define PUSHRESULT pushl %eax; cfi_adjust_cfa_offset (4); pushfl; cfi_adjust_cfa_offset (4)
-+# define POPRESULT popfl; cfi_adjust_cfa_offset (-4); popl %eax; cfi_adjust_cfa_offset (-4)
++# define PUSHRESULT pushl %eax; pushfl
++# define POPRESULT popfl; popl %eax
+
+# ifdef IS_IN_libpthread
+# define CENABLE call __pthread_enable_asynccancel;
@@ -21421,23 +21419,15 @@
+# elif defined IS_IN_librt
+# ifdef PIC
+# define CENABLE pushl %ebx; \
-+ cfi_adjust_cfa_offset (4); \
-+ cfi_rel_offset (ebx, 0); \
+ call __i686.get_pc_thunk.bx; \
+ addl $_GLOBAL_OFFSET_TABLE_, %ebx; \
+ call __librt_enable_asynccancel@PLT; \
-+ popl %ebx; \
-+ cfi_adjust_cfa_offset (-4); \
-+ cfi_restore (ebx);
++ popl %ebx;
+# define CDISABLE pushl %ebx; \
-+ cfi_adjust_cfa_offset (4); \
-+ cfi_rel_offset (ebx, 0); \
+ call __i686.get_pc_thunk.bx; \
+ addl $_GLOBAL_OFFSET_TABLE_, %ebx; \
+ call __librt_disable_asynccancel@PLT; \
-+ popl %ebx; \
-+ cfi_adjust_cfa_offset (-4); \
-+ cfi_restore (ebx);
++ popl %ebx;
+# else
+# define CENABLE call __librt_enable_asynccancel;
+# define CDISABLE call __librt_disable_asynccancel
Modified: glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-wo_SN.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-wo_SN.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-wo_SN.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ localedata/locales/wo_SN
-@@ -0,0 +1,179 @@
+@@ -0,0 +1,180 @@
+comment_char %
+escape_char /
+%
@@ -96,40 +96,40 @@
+END LC_NUMERIC
+
+LC_TIME
-+% dibeer (dib), altine (alt), talaata (tal), allarba (all), alxames (alx),
++% dib'eer (dib), altine (alt), talaata (tal), allarba (all), alxames (alx),
+% ajjuma (ajj), gaawu (gaa)
+% Sunday, Monday....
+abday "<U0064><U0069><U0062>";"<U0061><U006C><U0074>";/
+ "<U0074><U0061><U006C>";"<U0061><U006C><U006C>";/
+ "<U0061><U006C><U0078>";"<U0061><U006A><U006A>";/
+ "<U0067><U0061><U0061>"
-+day "<U0064><U0069><U0062><U0065><U0065><U0072>";/
++day "<U0064><U0069><U0062><U0027><U0065><U0065><U0072>";/
+ "<U0061><U006C><U0074><U0069><U006E><U0065>";/
+ "<U0074><U0061><U006C><U0061><U0061><U0074><U0061>";/
+ "<U0061><U006C><U006C><U0061><U0072><U0062><U0061>";/
+ "<U0061><U006C><U0078><U0061><U006D><U0065><U0073>";/
+ "<U0061><U006A><U006A><U0075><U006D><U0061>";/
+ "<U0067><U0061><U0061><U0077><U0075>"
-+% Sanwiy'e, feebiry'e, mars, awiril, me, suwen, sulet, ut, sattumbar,
-+% oktobar, nowambar, desambar.
++% Sanwiy'e, feebriy'e, mars, awril, me, suwen, sulet, uut, septaambar,
++% oktoobar, nowaambar, desaambar.
+abmon "<U0073><U0061><U006E>";"<U0066><U0065><U0065>";/
-+ "<U006D><U0061><U0072>";"<U0061><U0077><U0069>";/
++ "<U006D><U0061><U0072>";"<U0061><U0077><U0072>";/
+ "<U006D><U0065><U0020>";"<U0073><U0075><U0077>";/
-+ "<U0073><U0075><U006C>";"<U0075><U0074>";/
-+ "<U0073><U0061><U0074>";"<U006F><U006B><U0074>";/
++ "<U0073><U0075><U006C>";"<U0075><U0075><U0074>";/
++ "<U0073><U0065><U0070>";"<U006F><U006B><U0074>";/
+ "<U006E><U006F><U0077>";"<U0064><U0065><U0073>"
+mon "<U0073><U0061><U006E><U0077><U0069><U0079><U0027><U0065>";/
-+ "<U0066><U0065><U0065><U0062><U0069><U0072><U0079><U0027><U0065>";/
-+ "<U006D><U0061><U0072><U0074>";/
-+ "<U0061><U0077><U0069><U0072><U0069><U006C>";/
++ "<U0066><U0065><U0065><U0062><U0072><U0069><U0079><U0027><U0065>";/
++ "<U006D><U0061><U0072><U0073>";/
++ "<U0061><U0077><U0072><U0069><U006C>";/
+ "<U006D><U0065>";/
-+ "<U0073><U0075><U0077><U006E><U006E>";/
++ "<U0073><U0075><U0077><U0065><U006E>";/
+ "<U0073><U0075><U006C><U0065><U0074>";/
-+ "<U0075><U0074>";/
-+ "<U0073><U0061><U0074><U0074><U0075><U006D><U0062><U0061><U0072>";/
-+ "<U006F><U006B><U0074><U006F><U0062><U0061><U0072>";/
-+ "<U006E><U006F><U0077><U0061><U006D><U0062><U0061><U0072>";/
-+ "<U0064><U0065><U0073><U0061><U006D><U0062><U0061><U0072>"
++ "<U0075><U0075><U0074>";/
++ "<U0073><U0065><U0070><U0074><U0061><U0061><U006D><U0062><U0061><U0072>";/
++ "<U006F><U006B><U0074><U006F><U006F><U0062><U0061><U0072>";/
++ "<U006E><U006F><U0077><U0061><U0061><U006D><U0062><U0061><U0072>";/
++ "<U0064><U0065><U0073><U0061><U0061><U006D><U0062><U0061><U0072>"
+% %a %d %b %Y %T %Z
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+% %d.%m.%Y
@@ -157,7 +157,7 @@
+tel_dom_fmt "<U0025><U0061><U0020><U0025><U006C>"
+% 221
+int_prefix "<U0032><U0032><U0031>"
-+% 00
++% 00
+int_select "<U0030><U0030>"
+END LC_TELEPHONE
+
@@ -182,6 +182,7 @@
+country_ab3 "<U004D><U0044><U0047>"
+country_num 450
+END LC_ADDRESS
++
Index: localedata/SUPPORTED
===================================================================
--- localedata/SUPPORTED.orig
Modified: glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-inline.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-inline.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-inline.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on mips for inline
# functions of dl-machine.h.
Modified: glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-sysdeps.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/cvs-gcc4-sysdeps.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on mips for
# the breakage of large syscall arguments handling.
Modified: glibc-package/branches/glibc-2.4/debian/patches/mips/local-lazy-eval.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/local-lazy-eval.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/local-lazy-eval.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Workaround invalid resolving of lazy evaluation stubs
# DP: Related bugs: #265678
Modified: glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: clock_{get,set}time@@GLIBC_2.0 - programs in Woody need it.
# DP: Add fix that the previous version does not provide @GLIBC_2.2 symbols.
@@ -7,7 +5,7 @@
# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
# DP: Patch author: Guido Guenther <agx@debian.org>, GOTO Masanori <gotom@debian.org>
# DP: Upstream status: Debian-Specific
-# DP: Status Details: debian-specific, until sarge+1 will be released.
+# DP: Status Details: debian-specific, until etch will be released.
# DP: Date: 2004-12-24 (updated)
--- sysdeps/unix/sysv/linux/mips/Versions.orig Tue Sep 24 15:56:55 2002
Modified: glibc-package/branches/glibc-2.4/debian/patches/mips/submitted-msq.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/submitted-msq.diff 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/submitted-msq.diff 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# DP: Description: fix msqs on mips
# DP: Related bugs: 215273
# DP: Author: Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>
Modified: glibc-package/branches/glibc-2.4/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/rules 2006-05-27 13:41:18 UTC (rev 1540)
@@ -98,7 +98,6 @@
sbindir=$(prefix)/sbin
libexecdir=$(prefix)/lib
-udeb_add-ons = linuxthreads $(add-ons)
udeb_rtlddir = /lib
udeb_slibdir = /lib
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -120,7 +120,7 @@
fi
# Remove ld.so from optimized libraries
- if [ $(curpass) != libc ] && [ $(call xx,configure_build) = $(call xx,configure_target) ]; then \
+ if [ $(curpass) != libc ] && [ $(curpass) != udeb ] && [ $(call xx,configure_build) = $(call xx,configure_target) ]; then \
rm -f debian/tmp-$(curpass)/$(call xx,slibdir)/ld*.so* ; \
fi
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/control.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/control.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/control.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,10 +1,10 @@
control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.1 libc0.3 sparc64 s390x powerpc ppc64 opt amd64)
-threads_archs := alpha amd64 arm arm-softfloat armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
+threads_archs := alpha amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
debian/control.in/libc6: debian/control.in/libc debian/rules.d/control.mk
sed -e 's%@libc@%libc6%g' \
- -e 's%@archs@%amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
+ -e 's%@archs@%amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
debian/control.in/libc6.1: debian/control.in/libc debian/rules.d/control.mk
sed -e 's%@libc@%libc6.1%g;s%@archs@%alpha ia64%g' < $< > $@
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,3 +1,6 @@
+# udeb Config
+udeb_extra_cflags = -Os
+
# build libc with nptl instead of linuxthreads
libc_MIN_KERNEL_SUPPORTED = 2.6.0
libc_add-ons = nptl $(add-ons)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,2 +1,5 @@
libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
libc_add-ons = ports $(add-ons)
+
+# udeb Config
+udeb_MIN_KERNEL_SUPPORTED = 2.4.1
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,7 +1,16 @@
+# udeb Config
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
+udeb_extra_cflags = -Os
+# Starting with libc6 2.3.6-6 TLS support is enabled
libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
+define libc6_extra_pkg_install
+mkdir -p debian/$(curpass)/usr/lib
+ln -sf /lib/i486-linux-gnu debian/$(curpass)/lib/i386-linux-gnu
+ln -sf /usr/lib/i486-linux-gnu debian/$(curpass)/usr/lib/i386-linux-gnu
+endef
+
# NPTL requires at least i486 assembly. We don't need to take
# special measures for i386 systems, since Debian kernel images now
# emulate the missing instructions on the i386.
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -21,8 +21,9 @@
with_headers = --with-headers=$(shell pwd)/debian/include --enable-kernel=$(call xx,MIN_KERNEL_SUPPORTED)
# udeb Config
-#udeb_extra_cflags = -Os
+udeb_extra_cflags = -Os
udeb_MIN_KERNEL_SUPPORTED := 5.4.0
+udeb_add-ons = linuxthreads $(add-ons)
KERNEL_HEADER_DIR = $(stamp)mkincludedir
$(stamp)mkincludedir:
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -22,6 +22,7 @@
# udeb Config
#udeb_extra_cflags = -Os
udeb_MIN_KERNEL_SUPPORTED = 2.6.1
+udeb_add-ons = linuxthreads $(add-ons)
# NPTL Config
nptl_add-ons = nptl $(add-ons)
Added: glibc-package/branches/glibc-2.4/debian/sysdeps/m32r.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/m32r.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/m32r.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -0,0 +1,3 @@
+libc_MIN_KERNEL_SUPPORTED = 2.6.9
+libc_add-ons = glibc-ports-2.3.6 linuxthreads $(add-ons)
+libc_extra_config_options = $(extra_config_options) --without-tls
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,4 +1,5 @@
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
+udeb_extra_cflags = -Os
libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
libc_add-ons = ports $(add-ons)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1 +1,3 @@
+# udeb Config
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
+udeb_extra_cflags = -Os
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-05-27 13:21:56 UTC (rev 1539)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-05-27 13:41:18 UTC (rev 1540)
@@ -1,7 +1,8 @@
GLIBC_PASSES += nptl s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
-s390x_MIN_KERNEL_SUPPORTED = 2.4.1
+udeb_MIN_KERNEL_SUPPORTED = 2.4.1
+
s390x_configure_target = s390x-linux
s390x_CC = $(CC) -m64
s390x_add-ons = linuxthreads $(add-ons)
Reply to: