r1458 - in glibc-package/branches/glibc-2.4/debian/patches: . sparc
Author: schizo
Date: 2006-04-23 16:02:26 +0000 (Sun, 23 Apr 2006)
New Revision: 1458
Added:
glibc-package/branches/glibc-2.4/debian/patches/sparc/submitted-timing.diff
Removed:
glibc-package/branches/glibc-2.4/debian/patches/glibc-sparc-timing.diff
glibc-package/branches/glibc-2.4/debian/patches/sparc64-fixups.diff
Modified:
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
remove sparc64-fixups.diff, and rename glibc-sparc-timing.diff
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc-sparc-timing.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc-sparc-timing.diff 2006-04-23 00:48:25 UTC (rev 1457)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc-sparc-timing.diff 2006-04-23 16:02:26 UTC (rev 1458)
@@ -1,63 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: sparc/sparcv9 libraries fix
-# DP: Author: Daniel Jacobowitz <dan@debian.org>, Jeff Bailey <jbailey@nisa.net>
-# DP: Upstream status: Not Submitted
-# DP: Status Details:
-# DP: Date: 2003-12-31
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-2003-12-31 Jeff Bailey <jbailey@nisa.net>
-
- * sysdeps/sparc/hp-timing.h: New file.
-
---- /dev/null 1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.3.2/sysdeps/sparc/sparc32/hp-timing.h 2003-10-03 11:50:30.000000000 -0400
-@@ -0,0 +1,34 @@
-+/* High precision, low overhead timing functions. i386 version.
-+ Copyright (C) 2003 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. */
-+
-+#ifndef _SPARC_HP_TIMING_H
-+#define _SPARC_HP_TIMING_H 1
-+
-+#define hp_timing_t hp_timing_t__
-+#include <sysdeps/generic/hp-timing.h>
-+#undef hp_timing_t
-+
-+/* We don't use high-precision timers, but we might load an sparcv9 libpthread
-+ which does. */
-+#define HP_TIMING_PAD 1
-+
-+/* sparcv9 uses 64bit values for the times. */
-+typedef unsigned long long int hp_timing_t;
-+
-+#endif /* hp-timing.h */
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-23 00:48:25 UTC (rev 1457)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-23 16:02:26 UTC (rev 1458)
@@ -3,7 +3,6 @@
localedata/locale-eo_EO.diff -p1
localedata/locale-no_NO.diff -p0
glibc-i686-timing.diff -p1
-glibc-sparc-timing.diff -p1
makeconfig.diff -p0
ldconfig.diff -p0
ldd.diff -p0
@@ -11,7 +10,6 @@
glibc22-nss-upgrade.diff -p1
#glibc22-m68k-compat.diff -p1
#glibc22-m68k-fpic.diff -p1
-sparc64-fixups.diff -p1
glibc22-ttyname-devfs.diff -p0
powerpc-sysconf.diff -p1
#arm-no-hwcap.diff -p0
@@ -130,3 +128,4 @@
hurd-i386/submitted-ioctl-decode-argument.diff -p0
sparc/local-sparcv8-target.diff -p0
+sparc/submitted-timing.diff -p1
Copied: glibc-package/branches/glibc-2.4/debian/patches/sparc/submitted-timing.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/glibc-sparc-timing.diff)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/sparc64-fixups.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/sparc64-fixups.diff 2006-04-23 00:48:25 UTC (rev 1457)
+++ glibc-package/branches/glibc-2.4/debian/patches/sparc64-fixups.diff 2006-04-23 16:02:26 UTC (rev 1458)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-
-# DP: Fix ldconfig so that lib64 searches are implicit.
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- glibc-2.2.3/elf/ldconfig.c~ Tue Mar 20 11:44:35 2001
-+++ glibc-2.2.3/elf/ldconfig.c Tue Apr 24 18:14:05 2001
-@@ -287,6 +287,26 @@
- dir_entries = entry;
- else if (ptr == NULL)
- prev->next = entry;
-+#ifdef __sparc__
-+#define MSUBDIR "64"
-+ if (ptr == NULL) {
-+ int si = strlen(entry->path) - strlen(MSUBDIR);
-+ if (strcmp (entry->path + (si <= 0 ? 0 : si), MSUBDIR) != 0) {
-+ /* Handle subdirectory later. */
-+ struct dir_entry *new_entry;
-+
-+ new_entry = xmalloc (sizeof (struct dir_entry));
-+ new_entry->path = xmalloc(strlen(entry->path)+strlen(MSUBDIR)+1);
-+ new_entry->flag = entry->flag;
-+ new_entry->next = NULL;
-+ sprintf(new_entry->path, "%s%s", entry->path, MSUBDIR);
-+ if (opt_verbose)
-+ printf("Adding implicit multilib directory:\n\t%s\n", new_entry->path);
-+ add_single_dir (new_entry, 0);
-+ }
-+ }
-+#undef MSUBDIR
-+#endif
- }
-
- /* Add one directory to the list of directories to process. */
Reply to: