r1542 - in glibc-package/branches/glibc-2.4/debian: . patches patches/all patches/arm patches/localedata patches/m68k sysdeps
Author: aurel32
Date: 2006-05-28 00:50:58 +0000 (Sun, 28 May 2006)
New Revision: 1542
Added:
glibc-package/branches/glibc-2.4/debian/patches/all/local-pt_BR.diff
glibc-package/branches/glibc-2.4/debian/patches/all/local-remove-manual.diff
glibc-package/branches/glibc-2.4/debian/patches/arm/cvs-gcc4-inline.diff
glibc-package/branches/glibc-2.4/debian/patches/localedata/new-valencian-locale.diff
glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff
Removed:
glibc-package/branches/glibc-2.4/debian/patches/all/remove-manual.diff
glibc-package/branches/glibc-2.4/debian/patches/arm-output-format.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc-make-check-perms.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc23-ctype-compat.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc23-errno-hack.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc23-errno.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc23-function-compat.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc234-m68k-linuxthreads-fPIC.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-arm-inline.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-cvs.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/control
glibc-package/branches/glibc-2.4/debian/patches/m68k/local-fpic.diff
glibc-package/branches/glibc-2.4/debian/patches/m68k/local-reloc.diff
glibc-package/branches/glibc-2.4/debian/patches/m68k/submitted-gcc34-seccomment.diff
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/ia64.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/powerpc.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
Log:
Merge some more things from 2.3.6. Except hurd-i386 and m32r, everything should be merged
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 00:50:58 UTC (rev 1542)
@@ -11,13 +11,14 @@
- Remove any/cvs-tst-setcontext_c.diff (merged upstream).
- Remove any/local-dash.diff (merged upstream).
- Remove any/local-gcc4-elf.diff (merged upstream).
+ - Remove powerpc/cvs-executable-got.diff (merged upstream).
- Remove sparc/cvs-datastart.diff (merged upstream).
- Remove sparc/cvs-gcc4-inline.diff (merged upstream).
- Remove sparc/local-gcc4-mv8.diff (merged upstream).
- Remove sparc/submitted-socket-weakalias.diff (merged upstream).
- Remove everything to do with nscd_nischeck.
- Update any/local-linuxthreads-sizefix.diff.
- - Update glibc235-hppa-lt.diff.
+ - Update hppa/submitted-lt.diff.
- debian/shlibver: Bump up to 2.4-1.
- Add any/local-bashisms.diff: fix invalid test operator (==)
in run-iconv-test.sh
@@ -26,6 +27,7 @@
- debian/sysdeps/ia64.mk: build with linuxthreads instead of NPTL
- debian/sysdeps/m68k.mk: use ports add-on
- debian/sysdeps/mips.mk: use ports add-on
+ - debian/sysdeps/mipsel.mk: use ports add-on
- debian/sysdeps/i386.mk: disable sanity checks on linuxthreads build
- debian/sysdeps/powerpc.mk: build with linuxthreads instead of NPTL
- debian/sysdeps/arm.mk: use ports add-on
@@ -34,9 +36,10 @@
preprocessor macros.
[ Denis Barbier ]
- - Remove complex-collate.diff (merged upstream).
- - Remove cvs-{localedata,iso4217,iso639,tzdata}.diff,
- - Remove from forward-backward-collation.diff a chunk merged upstream.
+ - Remove locale/complex-collate.diff (merged upstream).
+ - Remove locale/cvs-{iso4217,iso639}.diff, locale/cvs-localedata.diff
+ - Remove from any/local-forward-backward-collation.diff a chunk merged
+ upstream.
- debian/rules.d/tarball.mk: glibc-<foo>-2.4.tar.bz2 add-on unpacks
into either <foo> or glibc-<foo>-2.4, in which case it is renamed
into <foo>.
@@ -50,9 +53,12 @@
* debian/sysdeps/hurd.mk: Only use libidn for add-ons.
[ Aurelien Jarno ]
- * Remove argp_h.diff (merged upstream).
+ * Remove any/cvs-argp_h.diff (merged upstream).
* Remove any/cvs-futimes.diff (merged upstream).
+ * Remove any/cvs-nfs_h.diff (merged upstream).
+ * Remove any/cvs-path_log.diff (merged upstream).
* Remove any/local-kernel-features.diff (merged upstream).
+ * Remove powerpc/cvs-gcc41-initfini.diff (merged upstream).
glibc (2.3.6-11) UNRELEASED; urgency=low
@@ -62,6 +68,11 @@
* M32R support: (Closes: #366962)
- debian/rules.d/control.mk: add m32r.
- Add debian/sysdeps/m32r.mk.
+ - Add debian/patches/any/cvs-futimes.diff (use fnctl64 if fnctl is no
+ available).
+ - Add debian/patch/any/local-kernel-features.diff (fix the include path
+ for kernel-features.h) so that it could be used from other files.
+ - Add debian/patches/any/local-libgcc-static.diff (link with libgcc_s).
* 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
@@ -72,6 +83,10 @@
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.
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 1577 (from
+ glibc-bsd).
+ * Add debian/patches/powerpc/cvs-gcc41-initfini.diff (fix build with gcc 4.1
+ on powerpc) from upstream CVS.
* debian/sysdeps/i386.mk: add a symlink (/usr)/lib/i386-linux-gnu ->
(/usr)/lib/i486-linux-gnu.
Modified: glibc-package/branches/glibc-2.4/debian/control
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/control 2006-05-28 00:50:58 UTC (rev 1542)
@@ -54,7 +54,7 @@
locale files take a lot of memory to be compiled.
Package: nscd
-Architecture: alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
+Architecture: 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
Section: admin
Priority: optional
Depends: libc6 (>= ${Source-Version})
@@ -65,7 +65,7 @@
slow Services like LDAP, NIS or NIS+
Package: libc6
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
@@ -76,7 +76,7 @@
and the standard math library, as well as many others.
Package: libc6-dev
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: standard
Depends: libc6 (= ${Source-Version})
@@ -86,7 +86,7 @@
and link programs which use the standard C library.
Package: libc6-dbg
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: extra
Provides: libc-dbg
@@ -100,7 +100,7 @@
Most people will not need this package.
Package: libc6-prof
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: extra
Depends: libc6 (= ${Source-Version})
@@ -109,7 +109,7 @@
with gprof.
Package: libc6-pic
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: optional
Conflicts: libc-pic
@@ -124,7 +124,7 @@
Package: libc6-udeb
XC-Package-Type: udeb
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: debian-installer
Priority: extra
Provides: libc6, libc-udeb, ${locale-compat:Depends}
Copied: glibc-package/branches/glibc-2.4/debian/patches/all/local-pt_BR.diff (from rev 1540, glibc-package/trunk/debian/patches/all/local-pt_BR.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/all/local-remove-manual.diff (from rev 1540, glibc-package/branches/glibc-2.4/debian/patches/all/remove-manual.diff)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/all/remove-manual.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/all/remove-manual.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/all/remove-manual.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,290 +0,0 @@
-The GNU Libc Reference manual has to be removed for licensing reasons.
-But some files have a dependency on manual/errno.texi; the easiest
-solution is to drop those dependencies and make sure that MAKEINFO=:
-so that no target depends on manual/*.texi files.
-
-Index: glibc-2.4/manual/Makefile
-===================================================================
---- /dev/null
-+++ glibc-2.4/manual/Makefile
-@@ -0,0 +1,254 @@
-+# Copyright (C) 1992-1999,2000,2001,2002,2003,2004,2006
-+# 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, write to the Free
-+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+# 02111-1307 USA.
-+
-+# Makefile for the GNU C Library manual.
-+
-+subdir := manual
-+export subdir := $(subdir)
-+
-+# Allow override
-+INSTALL_INFO = install-info
-+
-+.PHONY: all dvi pdf info html
-+all: dvi
-+dvi: libc.dvi
-+pdf: libc.pdf
-+
-+# Get glibc's configuration info.
-+ifneq (,$(wildcard ../Makeconfig))
-+include ../Makeconfig
-+else
-+MAKEINFO = makeinfo
-+TEXI2DVI = texi2dvi
-+AWK = gawk
-+endif
-+
-+TEXI2PDF = texi2dvi --pdf
-+
-+ifneq ($(strip $(MAKEINFO)),:)
-+all: info
-+info: libc.info
-+endif
-+
-+# scripts we use
-+ifndef move-if-change
-+move-if-change = ./move-if-change
-+endif
-+mkinstalldirs = $(..)scripts/mkinstalldirs
-+
-+chapters = $(addsuffix .texi, \
-+ intro errno memory ctype string charset locale \
-+ message search pattern io stdio llio filesys \
-+ pipe socket terminal syslog math arith time \
-+ resource setjmp signal startup process job nss \
-+ users sysinfo conf crypt debug)
-+add-chapters = $(wildcard $(foreach d, $(add-ons), ../$d/$d.texi))
-+appendices = lang.texi header.texi install.texi maint.texi contrib.texi \
-+ freemanuals.texi
-+
-+-include texis
-+texis: texis.awk $(chapters) $(add-chapters) $(appendices) lesser.texi fdl.texi
-+ $(AWK) -f $^ > $@.T
-+ mv -f $@.T $@
-+
-+nonexamples = $(filter-out $(add-chapters) %.c.texi, $(texis))
-+examples = $(filter-out $(foreach d, $(add-ons), ../$d/%.c.texi), \
-+ $(filter %.c.texi, $(texis)))
-+
-+# Kludge: implicit rule so Make knows the one command does it all.
-+chapters.% top-menu.%: libc-texinfo.sh $(texis) Makefile
-+ AWK=$(AWK) $(SHELL) $< '$(chapters)' '$(add-chapters)' '$(appendices)'
-+
-+libc.dvi libc.pdf libc.info: chapters.texi top-menu.texi dir-add.texi \
-+ libm-err.texi
-+libc.dvi libc.pdf: texinfo.tex
-+
-+html: libc/index.html
-+libc/index.html: chapters.texi top-menu.texi dir-add.texi libm-err.texi
-+ $(MAKEINFO) --html libc.texinfo
-+
-+# Generate the summary from the Texinfo source files for each chapter.
-+summary.texi: stamp-summary ;
-+stamp-summary: summary.awk $(filter-out summary.texi, $(texis))
-+ $(AWK) -f $^ | sort -t' ' -df -k 1,1 | tr '\014' '\012' > summary-tmp
-+ $(move-if-change) summary-tmp summary.texi
-+ touch $@
-+
-+# Generate a file which can be added to the `dir' content to provide direct
-+# access to the documentation of the function, variables, and other
-+# definitions.
-+dir-add.texi: xtract-typefun.awk $(texis)
-+ (echo "@dircategory GNU C library functions and macros"; \
-+ echo "@direntry"; \
-+ $(AWK) -f $^ | sort; \
-+ echo "@end direntry") > $@.new
-+ mv -f $@.new $@
-+
-+# The table with the math errors is generated.
-+libm-err.texi: stamp-libm-err
-+stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
-+ $(dir)/libm-test-ulps))
-+ pwd=`pwd`; \
-+ $(PERL) $< $$pwd/.. > libm-err-tmp
-+ $(move-if-change) libm-err-tmp libm-err.texi
-+ touch $@
-+
-+# Generate Texinfo files from the C source for the example programs.
-+%.c.texi: examples/%.c
-+ sed -e 's,[{}],@&,g' \
-+ -e 's,/\*\(@.*\)\*/,\1,g' \
-+ -e 's,/\* *,/* @r{,g' -e 's, *\*/,} */,' \
-+ -e 's/\(@[a-z][a-z]*\)@{\([^}]*\)@}/\1{\2}/g'\
-+ $< | expand > $@.new
-+ mv -f $@.new $@
-+
-+%.info: %.texinfo
-+ LANGUAGE=C LC_ALL=C $(MAKEINFO) $<
-+
-+%.dvi: %.texinfo
-+ $(TEXI2DVI) $<
-+
-+%.pdf: %.texinfo
-+ $(TEXI2PDF) $<
-+
-+# Distribution.
-+minimal-dist = summary.awk texis.awk tsort.awk libc-texinfo.sh libc.texinfo \
-+ libm-err.texi stamp-libm-err \
-+ $(filter-out summary.texi, $(nonexamples)) \
-+ $(patsubst %.c.texi,examples/%.c, $(examples))
-+
-+doc-only-dist = Makefile COPYING.LIB
-+distribute = $(minimal-dist) $(examples) stdio-fp.c \
-+ libc.info* libc.?? libc.??s texinfo.tex \
-+ xtract-typefun.awk dir-add.texi dir libm-err-tab.pl
-+export distribute := $(distribute)
-+
-+tar-it = tar chovf $@ $^
-+
-+manual.tar: $(doc-only-dist) $(minimal-dist) ; $(tar-it)
-+mandist.tar: $(doc-only-dist) $(distribute) ; $(tar-it)
-+
-+edition := $(shell sed -n 's/^@set EDITION \([0-9][0-9.]*\)[^0-9.]*.*$$/\1/p' \
-+ libc.texinfo)
-+
-+glibc-doc-$(edition).tar: $(doc-only-dist) $(distribute)
-+ @rm -f glibc-doc-$(edition)
-+ ln -s . glibc-doc-$(edition)
-+ tar chovf $@ $(addprefix glibc-doc-$(edition)/,$^)
-+ rm -f glibc-doc-$(edition)
-+
-+%.Z: %
-+ compress -c $< > $@.new
-+ mv -f $@.new $@
-+%.gz: %
-+ gzip -9 -c $< > $@.new
-+ mv -f $@.new $@
-+%.uu: %
-+ uuencode $< < $< > $@.new
-+ mv -f $@.new $@
-+
-+.PHONY: mostlyclean distclean realclean clean
-+mostlyclean:
-+ -rm -f libc.dvi libc.pdf libc.tmp libc.info*
-+ -rm -f $(objpfx)stubs
-+ -rm -f $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)
-+clean: mostlyclean
-+distclean: clean
-+indices = cp fn pg tp vr ky
-+realclean: distclean
-+ -rm -f texis summary.texi stamp-summary *.c.texi dir-add.texi
-+ -rm -f $(foreach index,$(indices),libc.$(index) libc.$(index)s)
-+ -rm -f libc.log libc.aux libc.toc dir-add.texinfo
-+ -rm -f top-menu.texi chapters.texi
-+
-+.PHONY: install subdir_install installdirs install-data
-+install-data subdir_install: install
-+ifneq ($(strip $(MAKEINFO)),:)
-+install: $(inst_infodir)/libc.info
-+ @if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \
-+ test -f $(inst_infodir)/dir || $(INSTALL_DATA) dir $(inst_infodir);\
-+ $(INSTALL_INFO) --info-dir=$(inst_infodir) $(inst_infodir)/libc.info;\
-+ else : ; fi
-+endif
-+# Catchall implicit rule for other installation targets from the parent.
-+install-%: ;
-+
-+$(inst_infodir)/libc.info: libc.info installdirs
-+ for file in $<*; do \
-+ $(INSTALL_DATA) $$file $(@D)/$$file; \
-+ done
-+
-+installdirs:
-+ $(mkinstalldirs) $(inst_infodir)
-+
-+.PHONY: dist
-+dist: # glibc-doc-$(edition).tar.gz
-+
-+ifneq (,$(wildcard ../Make-dist))
-+dist: ../Make-dist
-+ $(MAKE) -f $< $(Make-dist-args)
-+endif
-+
-+ifndef ETAGS
-+ETAGS = etags -T
-+endif
-+TAGS: $(minimal-dist)
-+ $(ETAGS) -o $@ $^
-+
-+# The parent makefile sometimes invokes us with targets `subdir_REAL-TARGET'.
-+subdir_%: % ;
-+# For targets we don't define, do nothing.
-+subdir_%: ;
-+
-+# These are targets that each glibc subdirectory is expected to understand.
-+# ../Rules defines them for code subdirectories; for us, they are no-ops.
-+# None of these should be `subdir_TARGET'; those targets are transformed
-+# by the implicit rule above into `TARGET' deps.
-+glibc-targets := lib objects objs others tests xtests lint.out echo-headers
-+.PHONY: $(glibc-targets)
-+$(glibc-targets):
-+
-+# Create stamp files if they don't exist, so the parent makefile's rules for
-+# updating the library archives are happy with us, and never think we have
-+# changed the library.
-+lib: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)
-+ifdef objpfx
-+.PHONY: stubs
-+stubs: $(objpfx)stubs
-+endif
-+$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
-+ $(make-target-directory)
-+ touch $@
-+
-+# Make the target directory if it doesn't exist, using the `mkinstalldirs'
-+# script that does `mkdir -p' even if `mkdir' doesn't support that flag.
-+define make-target-directory
-+$(addprefix $(mkinstalldirs) ,\
-+ $(filter-out $(wildcard $(@D:%/=%)),$(@D:%/=%)))
-+endef
-+
-+# The top-level glibc Makefile expects subdir_install to update the stubs file.
-+subdir_install: stubs
-+
-+# Get rid of these variables if they came from the parent.
-+routines =
-+aux =
-+sources =
-+objects =
-+headers =
-Index: glibc-2.4/sysdeps/gnu/Makefile
-===================================================================
---- glibc-2.4.orig/sysdeps/gnu/Makefile
-+++ glibc-2.4/sysdeps/gnu/Makefile
-@@ -20,7 +20,7 @@
- # Generate the list of strings for errno codes from the section of the
- # manual which documents the codes.
-
--$(..)sysdeps/gnu/errlist.c: $(..)sysdeps/gnu/errlist.awk \
-+$(..)sysdeps/gnu/errlist-disabled.c: $(..)sysdeps/gnu/errlist.awk \
- $(..)manual/errno.texi
- $(AWK) -f $^ > $@-tmp
- # Make it unwritable so noone will edit it by mistake.
-Index: glibc-2.4/sysdeps/mach/hurd/Makefile
-===================================================================
---- glibc-2.4.orig/sysdeps/mach/hurd/Makefile
-+++ glibc-2.4/sysdeps/mach/hurd/Makefile
-@@ -87,7 +87,7 @@
- -e 's, \.\./, $(..),g' > $@t
- mv -f $@t $@
-
--$(hurd)/bits/errno.h: $(common-objpfx)stamp-errnos ;
-+$(hurd)/bits/errno-disabled.h: $(common-objpfx)stamp-errnos ;
- $(common-objpfx)stamp-errnos: $(hurd)/errnos.awk $(errno.texinfo) \
- $(mach-errnos-deps) $(common-objpfx)errnos.d
- $(AWK) -f $^ > $(hurd)/bits/errno.h-tmp
Copied: glibc-package/branches/glibc-2.4/debian/patches/arm/cvs-gcc4-inline.diff (from rev 1540, glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-arm-inline.diff)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/arm-output-format.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/arm-output-format.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/arm-output-format.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-
-# DP: Very bad hack to avoid BUG line in libc.so on arm
-
-Index: scripts/output-format.sed
-===================================================================
-RCS file: /cvs/glibc/libc/scripts/output-format.sed,v
-retrieving revision 1.2
-diff -u -r1.2 output-format.sed
---- scripts/output-format.sed 8 Dec 2002 08:13:16 -0000 1.2
-+++ scripts/output-format.sed 26 Aug 2003 15:01:13 -0000
-@@ -18,7 +18,7 @@
- s/\n//
- s/^\([^,]*\),\([^,]*\),B/OUTPUT_FORMAT(\1)/p
- s/^\([^,]*\),\([^,]*\),L/OUTPUT_FORMAT(\2)/p
--/,/s|^|*** BUG in libc/scripts/output-format.sed *** |p
-+/,/Q
- q
- : q
- s/"//g
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc-make-check-perms.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc-make-check-perms.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc-make-check-perms.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,27 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix a permission denied during make check
-# DP: Author: Daniel Jacobowitz <dan@debian.org>
-# DP: Upstream status: Submitted
-# DP: Date: 2003-10-12
-
-2003-10-12 Daniel Jacobowitz <drow@mvista.com>
-
- * Makefile (tests): Make sure check-c++-types.sh is executable.
-
-Index: glibc/Makefile
-===================================================================
-RCS file: /big/fsf/rsync/glibc-cvs/libc/Makefile,v
-retrieving revision 1.234
-diff -u -p -r1.234 Makefile
---- glibc/Makefile 9 Sep 2003 02:30:15 -0000 1.234
-+++ glibc/Makefile 12 Oct 2003 23:24:08 -0000
-@@ -232,6 +232,7 @@ tests: $(objpfx)c++-types-check.out
- ifneq ($(CXX),no)
- ifneq (,$(wildcard scripts/data/c++-types-$(base-machine)-$(config-os).data))
- $(objpfx)c++-types-check.out: scripts/data/c++-types-$(base-machine)-$(config-os).data
-+ chmod a+x scripts/check-c++-types.sh
- scripts/check-c++-types.sh $^ $(CXX) $(filter-out -std=gnu99,$(CFLAGS)) $(CPPFLAGS) > $@
- else
- $(objpfx)c++-types-check.out:
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc23-ctype-compat.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc23-ctype-compat.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc23-ctype-compat.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,103 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description:
-# DP: glibc 2.3.x changes some symbols (__ctype_b, __ctype_toupper,
-# DP: __ctype_tolower) as hidden attribute. These symbols that are
-# DP: crashing the old 2.2.x dynamic linking code in static binaries
-# DP: are now exported.
-# DP: This patch is originally pulled from RedHat patch, I modified
-# DP: it for current debian glibc.
-# DP: Original Author: RedHat glibc-2.2.93 cygnus-to-redhat patch
-# DP: Applying Author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: Debian/Redhat Specific
-# DP: Status Details: We apply for a while (until sarge freeze?)
-# DP: Date: 2002-10-21
-# DP: Updated: 2002-12-02
-
---- glibc-2.3.1-cygnus/ctype/ctype-info.c 28 Sep 2002 20:36:35 -0000 1.1.1.9
-+++ glibc-2.3.1-redhat/ctype/ctype-info.c 29 Sep 2002 11:38:50 -0000 1.4
-@@ -48,18 +48,32 @@ extern const char _nl_C_LC_CTYPE_class_a
-
- #define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o)
-
-+// const unsigned short int *__ctype_b = b (unsigned short int, class, 128);
-+// const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0);
-+// const __int32_t *__ctype_tolower = b (__int32_t, tolower, 128);
-+// const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128);
-+// const __uint32_t *__ctype32_tolower = b (__uint32_t, tolower, 128);
-+// const __uint32_t *__ctype32_toupper = b (__uint32_t, toupper, 128);
-+
-+// compat_symbol (libc, __ctype_b, __ctype_b, GLIBC_2_0);
-+// compat_symbol (libc, __ctype_tolower, __ctype_tolower, GLIBC_2_0);
-+// compat_symbol (libc, __ctype_toupper, __ctype_toupper, GLIBC_2_0);
-+// compat_symbol (libc, __ctype32_b, __ctype32_b, GLIBC_2_0);
-+// compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
-+// compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
-+
-+#endif
-+
-+/* Temporarily exported until all .a libraries are recompiled. */
-+#undef b
-+#define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o)
-+extern const char _nl_C_LC_CTYPE_class[] attribute_hidden;
-+extern const char _nl_C_LC_CTYPE_class32[] attribute_hidden;
-+extern const char _nl_C_LC_CTYPE_toupper[] attribute_hidden;
-+extern const char _nl_C_LC_CTYPE_tolower[] attribute_hidden;
- const unsigned short int *__ctype_b = b (unsigned short int, class, 128);
- const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0);
- const __int32_t *__ctype_tolower = b (__int32_t, tolower, 128);
- const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128);
- const __uint32_t *__ctype32_tolower = b (__uint32_t, tolower, 128);
- const __uint32_t *__ctype32_toupper = b (__uint32_t, toupper, 128);
--
--compat_symbol (libc, __ctype_b, __ctype_b, GLIBC_2_0);
--compat_symbol (libc, __ctype_tolower, __ctype_tolower, GLIBC_2_0);
--compat_symbol (libc, __ctype_toupper, __ctype_toupper, GLIBC_2_0);
--compat_symbol (libc, __ctype32_b, __ctype32_b, GLIBC_2_0);
--compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
--compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
--
--#endif
---- glibc-2.3.1-cygnus/locale/lc-ctype.c 28 Sep 2002 20:37:14 -0000 1.1.1.8
-+++ glibc-2.3.1-redhat/locale/lc-ctype.c 29 Sep 2002 11:38:51 -0000 1.5
-@@ -75,18 +75,32 @@ _nl_postload_ctype (void)
- We need those relocations so that a versioned definition with a COPY
- reloc in an executable will override the libc.so definition. */
-
--compat_symbol (libc, __ctype_b, __ctype_b, GLIBC_2_0);
--compat_symbol (libc, __ctype_tolower, __ctype_tolower, GLIBC_2_0);
--compat_symbol (libc, __ctype_toupper, __ctype_toupper, GLIBC_2_0);
--compat_symbol (libc, __ctype32_b, __ctype32_b, GLIBC_2_0);
--compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
--compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
-+// compat_symbol (libc, __ctype_b, __ctype_b, GLIBC_2_0);
-+// compat_symbol (libc, __ctype_tolower, __ctype_tolower, GLIBC_2_0);
-+// compat_symbol (libc, __ctype_toupper, __ctype_toupper, GLIBC_2_0);
-+// compat_symbol (libc, __ctype32_b, __ctype32_b, GLIBC_2_0);
-+// compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
-+// compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
-
-+// __ctype_b = current (uint16_t, CLASS, 128);
-+// __ctype_toupper = current (uint32_t, TOUPPER, 128);
-+// __ctype_tolower = current (uint32_t, TOLOWER, 128);
-+// __ctype32_b = current (uint32_t, CLASS32, 0);
-+// __ctype32_toupper = current (uint32_t, TOUPPER32, 0);
-+// __ctype32_tolower = current (uint32_t, TOLOWER32, 0);
-+#endif
-+
-+ /* Temporary. */
-+ extern __const unsigned short int *__ctype_b; /* Characteristics. */
-+ extern __const __int32_t *__ctype_tolower; /* Case conversions. */
-+ extern __const __int32_t *__ctype_toupper; /* Case conversions. */
-+ extern const uint32_t *__ctype32_b;
-+ extern const uint32_t *__ctype32_toupper;
-+ extern const uint32_t *__ctype32_tolower;
- __ctype_b = current (uint16_t, CLASS, 128);
- __ctype_toupper = current (uint32_t, TOUPPER, 128);
- __ctype_tolower = current (uint32_t, TOLOWER, 128);
- __ctype32_b = current (uint32_t, CLASS32, 0);
- __ctype32_toupper = current (uint32_t, TOUPPER32, 0);
- __ctype32_tolower = current (uint32_t, TOLOWER32, 0);
--#endif
- }
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc23-errno-hack.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc23-errno-hack.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc23-errno-hack.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,67 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Force non-NPTL libraries (and warn) for binaries which access errno
-# DP: Author: (?) Someone at Red Hat
-# DP: Upstream status: Debian-Specific
-# DP: Status Details: This patch should be removed, probably after sarge.
-# DP: Date: 2003-11-02
-
---- glibc-2.3.2/elf/rtld.c.orig 2003-11-02 16:12:36.000000000 -0500
-+++ glibc-2.3.2/elf/rtld.c 2003-11-02 16:24:43.000000000 -0500
-@@ -966,6 +966,55 @@ of this helper program; chances are you
- GL(dl_rtld_map).l_prev = GL(dl_loaded);
- ++GL(dl_nloaded);
-
-+#if defined(__linux__) && defined(__i386__)
-+ /* Debian note: this code imported from Red Hat. */
-+ /* Force non-TLS libraries for glibc 2.0 binaries
-+ or if a buggy binary references non-TLS errno or h_errno. */
-+ if (__builtin_expect (GL(dl_loaded)->l_info[DT_NUM
-+ + DT_THISPROCNUM
-+ + DT_VERSIONTAGIDX (DT_VERNEED)]
-+ == NULL, 0)
-+ && GL(dl_loaded)->l_info[DT_DEBUG])
-+ GL(dl_osversion) = 0x20401;
-+ else if ((__builtin_expect (mode, normal) != normal
-+ || GL(dl_loaded)->l_info [ADDRIDX (DT_GNU_LIBLIST)] == NULL)
-+ /* Only binaries have DT_DEBUG dynamic tags... */
-+ && GL(dl_loaded)->l_info[DT_DEBUG])
-+ {
-+ /* Workaround for buggy binaries. This doesn't handle buggy
-+ libraries. */
-+ bool buggy = false;
-+ const ElfW(Sym) *symtab = (const void *) D_PTR (GL(dl_loaded), l_info[DT_SYMTAB]);
-+ const char *strtab = (const void *) D_PTR (GL(dl_loaded), l_info[DT_STRTAB]);
-+ Elf_Symndx symidx;
-+ for (symidx = GL(dl_loaded)->l_buckets[0x6c994f % GL(dl_loaded)->l_nbuckets];
-+ !buggy && symidx != STN_UNDEF;
-+ symidx = GL(dl_loaded)->l_chain[symidx])
-+ {
-+ if (__builtin_expect (strcmp (strtab + symtab[symidx].st_name,
-+ "errno") == 0, 0)
-+ && ELFW(ST_TYPE) (symtab[symidx].st_info) != STT_TLS)
-+ buggy = true;
-+ }
-+ for (symidx = GL(dl_loaded)->l_buckets[0xe5c992f % GL(dl_loaded)->l_nbuckets];
-+ !buggy && symidx != STN_UNDEF;
-+ symidx = GL(dl_loaded)->l_chain[symidx])
-+ {
-+ if (__builtin_expect (strcmp (strtab + symtab[symidx].st_name,
-+ "h_errno") == 0, 0)
-+ && ELFW(ST_TYPE) (symtab[symidx].st_info) != STT_TLS)
-+ buggy = true;
-+ }
-+ if (__builtin_expect (buggy, false))
-+ {
-+ if (GL(dl_osversion) > 0x20401)
-+ GL(dl_osversion) = 0x20401;
-+ if (0) _dl_error_printf ("ld.so: Incorrectly built binary which accesses errno or h_errno directly.\n"
-+ "ld.so: See /usr/share/doc/libc6/FAQ.gz.\n");
-+ }
-+ }
-+#endif
-+
- /* Set up the program header information for the dynamic linker
- itself. It is needed in the dl_iterate_phdr() callbacks. */
- ElfW(Ehdr) *rtld_ehdr = (ElfW(Ehdr) *) GL(dl_rtld_map).l_map_start;
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc23-errno.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc23-errno.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc23-errno.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,54 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Un-hide errno
-# DP: Author: Daniel Jacobowitz <dan@debian.org>
-# DP: Upstream status: Not submitted
-# DP: Status Details: This patch makes errno re-available at link time.
-# DP: The right solution is to make it only available at run time without
-# DP: re-breaking old applications.
-# DP: This patch should not be considered permanent; see libc-alpa
-# DP: archives for 12/23/2002 for a better alternative (not implemented
-# DP: yet)
-# DP: Date: Dec 24, 2002
-# DP: Updated: Jan 2, 2003
-
-diff -ur glibc-2.3.1.bak/inet/herrno.c glibc-2.3.1/inet/herrno.c
---- glibc-2.3.1.bak/inet/herrno.c 2003-01-02 10:54:16.000000000 -0500
-+++ glibc-2.3.1/inet/herrno.c 2003-01-02 10:55:25.000000000 -0500
-@@ -38,8 +38,8 @@
- visible at link time. Programs must use the accessor functions. */
- # if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING
- # include <shlib-compat.h>
--compat_symbol (libc, h_errno, h_errno, GLIBC_2_0);
--compat_symbol (libc, _h_errno, _h_errno, GLIBC_2_0);
-+// compat_symbol (libc, h_errno, h_errno, GLIBC_2_0);
-+// compat_symbol (libc, _h_errno, _h_errno, GLIBC_2_0);
- # endif
- #endif
-
-diff -ur glibc-2.3.1.bak/resolv/res_libc.c glibc-2.3.1/resolv/res_libc.c
---- glibc-2.3.1.bak/resolv/res_libc.c 2003-01-02 10:54:16.000000000 -0500
-+++ glibc-2.3.1/resolv/res_libc.c 2003-01-02 10:54:45.000000000 -0500
-@@ -87,7 +87,7 @@
- visible at link time. Programs must use the accessor functions. */
- #if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING
- # include <shlib-compat.h>
--compat_symbol (libc, _res, _res, GLIBC_2_0);
-+// compat_symbol (libc, _res, _res, GLIBC_2_0);
- #endif
-
- #include <shlib-compat.h>
-diff -ur glibc-2.3.1.bak/sysdeps/generic/errno.c glibc-2.3.1/sysdeps/generic/errno.c
---- glibc-2.3.1.bak/sysdeps/generic/errno.c 2003-01-02 10:54:16.000000000 -0500
-+++ glibc-2.3.1/sysdeps/generic/errno.c 2003-01-02 10:55:16.000000000 -0500
-@@ -36,7 +36,7 @@
- visible at link time. Programs must use the accessor functions. */
- # if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING
- # include <shlib-compat.h>
--compat_symbol (libc, errno, errno, GLIBC_2_0);
--compat_symbol (libc, _errno, _errno, GLIBC_2_0);
-+// compat_symbol (libc, errno, errno, GLIBC_2_0);
-+// compat_symbol (libc, _errno, _errno, GLIBC_2_0);
- # endif
- #endif
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc23-function-compat.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc23-function-compat.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc23-function-compat.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,51 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description:
-# DP: Some internal symbols are changed in glibc 2.3.x. The result that
-# DP: some ill-mannered applications does not run because they use glibc
-# DP: internal only symbols which cannot be resolved now.
-# DP: Such symbols are: __libc_wait, __libc_waitpid, __libc_fork, and so on.
-# DP: We really dislike to keep such bad application binary compatibility
-# DP: but we decide to adopt this change for condering user upgradablity
-# DP: from woody to sarge. Thus, this patch should remove when sarge is
-# DP: released.
-# DP: This patch is originally pulled from RedHat patch.
-# DP: Original Author: RedHat glibc-2.2.93 cygnus-to-redhat patch
-# DP: Applying Author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: Debian/Redhat-Specific
-# DP: Status Details: We apply for a while (until sarge is released)
-# DP: Date: 2002-12-19
-
---- glibc-2.3.1-cygnus/posix/Versions 2002-12-19 00:13:27.000000000 +0900
-+++ glibc-2.3.1-redhat/posix/Versions 2002-12-19 00:14:34.000000000 +0900
-@@ -3,6 +3,9 @@
- # functions with special/multiple interfaces
- __bsd_getpgrp; __setpgid; __getpgid;
-
-+ # This will be GLIBC_PRIVATE, just give Sun JDK some time to catch up
-+ __libc_wait; __libc_waitpid;
-+
- # functions with required interface outside normal name space
- _exit;
-
-@@ -83,6 +86,9 @@
- GLIBC_2.1.2 {
- # functions used in other libraries
- __vfork;
-+
-+ # This will be GLIBC_PRIVATE, just give wine some time to catch up
-+ __libc_fork;
- }
- GLIBC_2.2 {
- # p*
-@@ -121,7 +127,8 @@
- GLIBC_PRIVATE {
- # functions which have an additional interface since they are
- # are cancelable.
-- __libc_wait; __libc_waitpid; __libc_pause; __libc_nanosleep; __libc_fork;
-+ # __libc_wait; __libc_waitpid;
-+ __libc_pause; __libc_nanosleep; # __libc_fork;
- __libc_pread; __libc_pread64; __libc_pwrite; __libc_pwrite64;
- __waitid; __pselect;
- }
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc234-m68k-linuxthreads-fPIC.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc234-m68k-linuxthreads-fPIC.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc234-m68k-linuxthreads-fPIC.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix m68k compilation to remove linuxthreads o-iterator.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: Not submitted
-# DP: Status Details: Will be submitted.
-# DP: Date: 2005-03-16
-
-PATCHLEVEL=0
-
-2004-12-17 GOTO Masanori <gotom@debian.or.jp>
-
- * linuxthreads/sysdeps/m68k/Makefile: Removed to delete unneeded
- o-iterator which adds for -fPIC.
-
-Index: linuxthreads/sysdeps/m68k/Makefile
-===================================================================
-RCS file: /cvs/glibc/libc/linuxthreads/sysdeps/m68k/Makefile,v
-retrieving revision 1.1
-diff -u -r1.1 Makefile
---- linuxthreads/sysdeps/m68k/Makefile 5 Jan 2003 17:15:43 -0000 1.1
-+++ /dev/null 16 Dec 2004 16:53:06 -0000
-@@ -1,7 +0,0 @@
--ifeq ($(subdir), linuxthreads)
--object-suffixes-left := $(libpthread-nonshared)
--define o-iterator-doit
--$(objpfx)$o.os: pic-ccflag = -fPIC
--endef
--include $(o-iterator)
--endif
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-arm-inline.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-arm-inline.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-arm-inline.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,32 +0,0 @@
-#! /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 arm for inline
-# functions of dl-machine.h.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Dan Kegel
-# DP: Upstream status: In CVS / Debian-Specific
-# DP: Status Details:
-# DP: Date: 2005-07-16
-
-Fetched from: http://kegel.com/crosstool/crosstool-0.37/patches/glibc-2.3.5/glibc-2.3.4-allow-gcc-4.0-arm.patch
-
---- glibc-2.3.4/sysdeps/arm/dl-machine.h.old Sun Mar 20 17:54:37 2005
-+++ glibc-2.3.4/sysdeps/arm/dl-machine.h Sun Mar 20 17:57:32 2005
-@@ -359,7 +359,14 @@
- # endif
-
- /* Deal with an out-of-range PC24 reloc. */
--static Elf32_Addr
-+#if __GNUC__ >= 4
-+ auto inline Elf32_Addr
-+#else
-+ static inline Elf32_Addr
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value)
- {
- static void *fix_page;
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-cvs.diff
===================================================================
Copied: glibc-package/branches/glibc-2.4/debian/patches/localedata/new-valencian-locale.diff (from rev 1540, glibc-package/trunk/debian/patches/localedata/new-valencian-locale.diff)
Modified: glibc-package/branches/glibc-2.4/debian/patches/m68k/local-fpic.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/m68k/local-fpic.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/m68k/local-fpic.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# DP: Make sure libc_nonshared.a is compiled with -fPIC on m68k
diff -urN glibc-2.2.3.orig/sysdeps/m68k/Makefile glibc-2.2.3/sysdeps/m68k/Makefi
Copied: glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff (from rev 1540, glibc-package/trunk/debian/patches/m68k/local-mathinline_h.diff)
Modified: glibc-package/branches/glibc-2.4/debian/patches/m68k/local-reloc.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/m68k/local-reloc.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/m68k/local-reloc.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: binutils bug workaround
# DP: Related bugs: #263601: m68k: workaround for binutils problem
# DP: Dpatch author: Roman Zippel <zippel@linux-m68k.org>
Modified: glibc-package/branches/glibc-2.4/debian/patches/m68k/submitted-gcc34-seccomment.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/m68k/submitted-gcc34-seccomment.diff 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/m68k/submitted-gcc34-seccomment.diff 2006-05-28 00:50:58 UTC (rev 1542)
@@ -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-3.4/4.0 + binutils 2.16
# on m68k fixed by adding #APP.
# DP: Related bugs:
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,76 +1,14 @@
localedata/locale-de_CH.diff -p1
-any/local-libgcc-static.diff
-all/local-ru_RU.diff -p1
-all/submitted-new-brf-encoding.diff -p0
localedata/locale-eo_EO.diff -p1
localedata/locale-no_NO.diff -p0
-glibc-i686-timing.diff -p1
-any/local-makeconfig.diff -p0
-any/local-ldconfig.diff -p0
-any/local-ldd.diff -p0
-any/local-fhs-linux-paths.diff -p1
-any/local-nss-upgrade.diff -p1
-#m68k/local-compat.diff -p1
-#m68k/local-fpic.diff -p1
-any/local-ttyname-devfs.diff -p0
-#arm/local-no-hwcap.diff -p0
-#glibc23-ctype-compat.diff -p1 # g: untilsarge
-hppa/local-Rminkernel.diff -p0
-#glibc23-function-compat.diff -p1 # g: untilsarge
-#glibc23-errno.diff -p1 # g: untilsarge
-any/local-asserth-decls.diff -p0
-#alpha/submitted-pic.diff -p0 # g: suspended
-i386/local-cmov.diff -p0
-#any/local-libgcc-compat-all.diff -p0
-#any/local-libgcc-compat-others.diff -p1
-#any/local-base.diff -p0 # g: suspended
-arm/local-dwarf2-buildfix.diff -p0
-m68k/local-dwarf2-buildfix.diff -p0
-#arm-output-format.diff -p0 # g: suspended
-#arm/local-ioperm.diff -p0
-#arm/cvs-float-byteorder.diff -p0
-#glibc-make-check-perms.diff -p1 # g: suspended
-any/local-ldconfig-tls.diff -p1
-#any/local-ldso-disable-hwcap.diff -p0
-#any/local-version-sanity.diff -p1
-#i386/local-sse-oldkernel.diff -p0
-#glibc23-errno-hack.diff -p1 # g: untilsarge
-any/local-tcsetaddr.diff -p1
-any/local-localedef-fix-trampoline.diff -p1
localedata/locale-eu_FR.diff -p0
-#m68k/local-reloc.diff -p1
-#any/local-globfree-clear.diff -p1 # g: suspended
-#hppa/submitted-drop-utimes.diff -p1
-#alpha/submitted-xstat.diff -p0
-#hppa/cvs-linesep.diff -p0
-#hppa/local-remove-mallocdef.diff -p0 # g: this should be replaced by Carlos' new patch.
-any/local-linuxthreads-sizefix.diff -p1
-#any/cvs-tls-crashfix.diff -p1
-any/local-gcc4-wcstol_l.diff -p1
-#glibc235-gcc4-arm-inline.diff -p1
-#hurd-i386/cvs-ioctl-pfinet.diff -p0
-hppa/submitted-lt.diff -p1
-#hppa/submitted-sysdeps.diff -p1
-#alpha/cvs-gcc4-profile.diff -p0
-#m68k/submitted-gcc34-seccomment.diff -p0
locale/iso4217-RON.diff -p0
localedata/locale-ro_RO.diff -p0
-#hppa/local-gcc-4-profile.diff -p0
-any/local-dl-execstack.diff -p0
-i386/local-biarch.diff -p1
-#hppa/submitted-iitlbp.diff -p1
-#hppa/submitted-fenv-align.diff -p1
-#hppa/submitted-fpu.diff -p1
-#any/submitted-eh-frame-terminator.diff -p1
-#arm/cvs-socket-weakalias.diff -p0
-#any/cvs-ctan.diff -p0
-#any/submitted-nis-netgrp.diff
localedata/locale-ku_TR.diff -p0
#localedata/discard-dz_BT.diff # not needed when complex-collate is applied
locale/fix-exhausted-memory.diff
#locale/check-unknown-symbols.diff # locales have to be fixed first
locale/fix-LC_COLLATE-rules.diff
-any/local-forward-backward-collation.diff
locale/preprocessor-collate.diff
locale/LC_IDENTIFICATION-optional-fields.diff
locale/LC_COLLATE-keywords-ordering.diff
@@ -95,42 +33,108 @@
localedata/dz_BT-collation.diff
localedata/update-ZA.diff
localedata/locale-ia.diff
+localedata/new-valencian-locale.diff
localedata/tailor-iso14651_t1.diff -p0
localedata/fix-lang.diff
localedata/fix-unknown-symbols.diff
localedata/first_weekday.diff -p0
localedata/sort-UTF8-first.diff -p0
localedata/local-all-no-archive.diff
+
+#alpha/cvs-gcc4-profile.diff -p0
+#alpha/submitted-pic.diff -p0 # g: suspended
+#alpha/submitted-xstat.diff -p0
+
+amd64/local-biarch.diff -p1
+
+#arm/cvs-float-byteorder.diff -p0
+#arm/cvs-gcc4-inline.diff -p1
+#arm/cvs-socket-weakalias.diff -p0
+arm/local-dwarf2-buildfix.diff -p0
+#arm/local-ioperm.diff -p0
+#arm/local-no-hwcap.diff -p0
+
+hppa/local-Rminkernel.diff -p0
+#hppa/submitted-drop-utimes.diff -p1
+#hppa/cvs-linesep.diff -p0
+#hppa/local-remove-mallocdef.diff -p0 # g: this should be replaced by Carlos' new patch.
+hppa/submitted-lt.diff -p1
+#hppa/submitted-sysdeps.diff -p1
+#hppa/local-gcc-4-profile.diff -p0
+#hppa/submitted-iitlbp.diff -p1
+#hppa/submitted-fenv-align.diff -p1
+#hppa/submitted-fpu.diff -p1
#hppa/cvs-pie-relocs.diff -p1
-#hurd-i386/cvs-getresuid-dyslexia.diff -p0
#hppa/cvs-no-ldbl-128.diff -p1
-any/remove-manual.diff
-#any/local-rtld.diff -p1
-#any/cvs-resource_h.diff -p1
#hppa/local-inlining.diff -p1
-any/submitted-strfmon.diff
-#any/cvs-argp_h.diff -p1
-any/cvs-getcwd_c.diff -p1
-any/local-bashisms.diff
-any/local-ld-multiarch.diff -p1
-any/local-ldconfig-multiarch.diff -p1
-
-amd64/local-biarch.diff -p1
-
+#hurd-i386/cvs-getresuid-dyslexia.diff -p0
+#hurd-i386/cvs-ioctl-pfinet.diff -p0
hurd-i386/cvs-machrules-make.diff -p1
hurd-i386/local-enable-ldconfig.diff -p1
hurd-i386/submitted-ioctl-decode-argument.diff -p0
+i386/local-i486_ldt_support.diff -p1
+i386/local-biarch.diff -p1
+i386/local-cmov.diff -p0
+#i386/local-sse-oldkernel.diff -p0
+i386/submitted-i686-timing.diff -p1
+
+#m68k/local-compat.diff -p1
+m68k/local-dwarf2-buildfix.diff -p0
+#m68k/local-fpic.diff -p1
+#m68k/local-mathinline_h.diff -p1
+#m68k/local-reloc.diff -p1
+#m68k/submitted-gcc34-seccomment.diff -p0
+
+#mips/cvs-gcc4-inline.diff -p0
+#mips/cvs-gcc4-sysdeps.diff -p0
+#mips/local-librt.diff -p0
mips/local-lazy-eval.diff -p2
-#mips/local-librt.diff -p0
#mips/submitted-msq.diff -p0
-#mips/cvs-gcc4-inline.diff -p0
-#mips/cvs-gcc4-sysdeps.diff -p0
powerpc/local-sysconf.diff -p1
+sparc/local-linuxthreads.diff
sparc/local-sparcv8-target.diff -p0
sparc/submitted-timing.diff -p1
-sparc/local-linuxthreads.diff
-i386/local-i486_ldt_support.diff
+
+all/local-remove-manual.diff
+all/local-ru_RU.diff -p1
+all/local-pt_BR.diff -p1
+all/submitted-new-brf-encoding.diff -p0
+
+#any/cvs-argp_h.diff -p1
+#any/cvs-ctan.diff -p0
+any/cvs-getcwd_c.diff -p1
+#any/cvs-resource_h.diff -p1
+#any/cvs-tls-crashfix.diff -p1
+any/local-asserth-decls.diff -p0
+#any/local-base.diff -p0 # g: suspended
+any/local-bashisms.diff
+any/local-dl-execstack.diff -p0
+any/local-fhs-linux-paths.diff -p1
+any/local-forward-backward-collation.diff
+any/local-gcc4-wcstol_l.diff -p1
+#any/local-globfree-clear.diff -p1 # g: suspended
+any/local-ld-multiarch.diff -p1
+any/local-ldd.diff -p0
+#any/local-ldso-disable-hwcap.diff -p0
+any/local-ldconfig.diff -p0
+any/local-ldconfig-multiarch.diff -p1
+any/local-ldconfig-tls.diff -p1
+#any/local-libgcc-compat-all.diff -p0
+#any/local-libgcc-compat-others.diff -p1
+any/local-libgcc-static.diff -p0
+any/local-linuxthreads-sizefix.diff -p1
+any/local-localedef-fix-trampoline.diff -p1
+any/local-makeconfig.diff -p0
+any/local-nss-upgrade.diff -p1
+#any/local-rtld.diff -p1
+any/local-tcsetaddr.diff -p1
+any/local-ttyname-devfs.diff -p0
+#any/local-version-sanity.diff -p1
+#any/submitted-eh-frame-terminator.diff -p1
+#any/submitted-nis-netgrp.diff
+any/submitted-strfmon.diff
+
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,3 +1,6 @@
+libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
+libc_add-ons = ports $(add-ons)
+
# hppa64 needs symlink /usr/hppa64-linux/include to /usr/include
# (See: Bug#239020) In future we may drop this file with supporting hppa64.
@@ -9,5 +12,3 @@
ln -sf /usr/include debian/$(curpass)/usr/hppa64-linux-gnu/include
endef
-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/ia64.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/ia64.mk 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/ia64.mk 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,5 +1,5 @@
-GLIBC_PASSES += nptl
-
libc = libc6.1
+libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
-libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
+# NPTL Config
+GLIBC_PASSES += nptl
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-05-28 00:50:58 UTC (rev 1542)
@@ -23,6 +23,7 @@
#udeb_extra_cflags = -Os
udeb_MIN_KERNEL_SUPPORTED = 2.6.1
udeb_add-ons = linuxthreads $(add-ons)
+udeb_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
# NPTL Config
nptl_add-ons = nptl $(add-ons)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,5 +1,6 @@
+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
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 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,3 +1,6 @@
+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
udeb_extra_cflags = -Os
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,10 +1,15 @@
-GLIBC_PASSES += ppc64 nptl
-DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
-
libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
+# udeb Config
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
+udeb_extra_cflags = -Os
+# NPTL Config
+GLIBC_PASSES += nptl
+
+# build 64-bit (ppc64) alternative library
+GLIBC_PASSES += ppc64
+DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
ppc64_MIN_KERNEL_SUPPORTED = 2.6.0
ppc64_configure_target = powerpc64-linux
ppc64_CC = $(CC) -m64
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-05-27 23:01:44 UTC (rev 1541)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-05-28 00:50:58 UTC (rev 1542)
@@ -1,8 +1,11 @@
-GLIBC_PASSES += nptl sparcv9 sparcv9b sparc64
-DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-sparcv9 libc6-sparcv9b libc6-dev-sparc64
+libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
-libc_extra_config_options = $(extra_config_options) --without-__thread --disable-sanity-checks
-
+# udeb Config
+udeb_extra_cflags = -Os
+
+# build 64-bit (sparc64) alternative library
+GLIBC_PASSES += sparc64
+DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
sparc64_MIN_KERNEL_SUPPORTED = 2.6.0
sparc64_configure_target=sparc64-linux
sparc64_CC = $(BUILD_CC) -m64
@@ -12,7 +15,10 @@
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
sparc64_slibdir = /lib64
sparc64_libdir = /usr/lib64
-
+
+# build a sparcv9 optimized library
+GLIBC_PASSES += sparcv9
+DEB_ARCH_REGULAR_PACKAGES += libc6-sparcv9
sparcv9_MIN_KERNEL_SUPPORTED = 2.6.0
sparcv9_configure_target=sparcv9-linux
sparcv9_configure_build=sparcv9-linux
@@ -22,6 +28,9 @@
sparcv9_rtlddir = /lib
sparcv9_slibdir = /lib/v9
+# build a sparcv9b optimized library
+GLIBC_PASSES += sparcv9b
+DEB_ARCH_REGULAR_PACKAGES += libc6-sparcv9b
sparcv9b_MIN_KERNEL_SUPPORTED = 2.6.0
sparcv9b_configure_target=sparcv9b-linux
sparcv9b_configure_build=sparcv9b-linux
Reply to: