summaryrefslogtreecommitdiff
path: root/patches/glibc/2.1.3/rh62-07-glibc-2.1.3-alpha.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/glibc/2.1.3/rh62-07-glibc-2.1.3-alpha.patch')
-rw-r--r--patches/glibc/2.1.3/rh62-07-glibc-2.1.3-alpha.patch124
1 files changed, 124 insertions, 0 deletions
diff --git a/patches/glibc/2.1.3/rh62-07-glibc-2.1.3-alpha.patch b/patches/glibc/2.1.3/rh62-07-glibc-2.1.3-alpha.patch
new file mode 100644
index 0000000..037758c
--- /dev/null
+++ b/patches/glibc/2.1.3/rh62-07-glibc-2.1.3-alpha.patch
@@ -0,0 +1,124 @@
+2000-03-15 Cristian Gafton <gafton@redhat.com>
+
+ * db2/mutex/alpha.gcc (TSL_SET): Backport from db3.
+ * sysdeps/alpha/Makefile (CPPFLAGS): Define for db2 directory.
+ * db2/mutex/mutex.c: Include alpha.gcc ifdef HAVE_ASSEM_ALPHA_GCC.
+
+2000-03-14 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/alpha/ioperm.c (platform): Add entry for
+ Nautilus. Patch by Soohoon Lee <soohoon.lee@alpha-processor.com>.
+
+--- glibc-2.1.3-15/db2/mutex/alpha.gcc Wed Aug 27 15:32:54 1997
++++ glibc-2.1.3-16/db2/mutex/alpha.gcc Wed Mar 15 16:50:45 2000
+@@ -1,52 +1,24 @@
+ /*
+- * @(#)alpha.gcc 10.1 (Sleepycat) 4/12/97
+- *
+- * The code appearing below is taken from Richard L. Sites, ed. "Alpha
+- * Architecture Reference Manual", Digital Press, 1992, page 5-7 and 5-8.
+- * There are 2 modifications:
+- *
+- * 1. The jump from blbs __r1,30f to !__r1, which is dictated by the way the
+- * TSL_SET macro is used. The code suggested in Sites includes the main loop
+- * of the spin lock, whereas in this code the rest the loop is specified in C.
+- * The generated code might be suboptimal if the compiler generates a forward
+- * branch for the usual case in which the mutex is uncontested.
+- *
+- * 2. At label 20, Sites suggests including code for testing for an excessive
+- * number of _processor_ lock conflicts. (The seq_c instruction stores its
+- * first argument provided that no other processor has written to a byte range
+- * including its memory-location argument.) Absent such checking the code
+- * below could conceivably stall silently on a multiprocessor alpha, depending
+- * on how often processor/processor conflicts occur in a particular byte range.
+- *
+- * Note that the mb ("memory-barrier") instruction in TSL_UNSET is critical to
+- * correct operation in a multiprocessor alpha (as is, of course, the mb in
+- * the TSL_SET macro). Without the mb, changes to shared memory that occurred
+- * inside the critical section (before the TSL_UNSET) might reach shared memory
+- * _after_ the change of tsl to 0, thereby permitting another processor to see
+- * an inconsistent view of the data protected by the mutex.
++ * @(#)alpha.gcc 11.1 (Sleepycat) 8/30/99
+ *
+ * For gcc/alpha, 0 is clear, 1 is set.
+ */
+-#define TSL_SET(tsl) ({ \
++#ifdef __GNUC__
++#define TSL_SET(tsl) ({ \
+ register tsl_t *__l = (tsl); \
+- register tsl_t __r1, __r2; \
+- __asm__ volatile(" \n\
+- 10: ldq_l %0,(%2) \n\
+- blbs %0,30f \n\
+- or %0,1,%1 \n\
+- stq_c %1,(%2) \n\
+- beq %1,20f \n\
+- mb \n\
+- br 30f \n\
+- 20: br 10b \n\
+- 30: " \
+- : "=&r" (__r1), "=&r" (__r2) \
+- : "r" (__l)); \
+- !__r1; \
++ int __r; \
++ asm volatile( \
++ "1: ldl_l %0,%1\n" \
++ " blbs %0,2f\n" \
++ " mov 1,%0\n" \
++ " stl_c %0,%1\n" \
++ " bne %0,1b\n" \
++ " mb\n" \
++ "2:" \
++ : "=&r"(__r), "=m"(*__l) : "m"(*__l) : "memory"); \
++ __r; \
+ })
++#endif
+
+-#define TSL_UNSET(tsl) ({ \
+- register tsl_t *__l = (tsl); \
+- __asm__ volatile("mb; stq $31,(%0);" : : "r" (__l)); \
+-})
++#define TSL_UNSET(tsl) (*(tsl) = 0)
+ #define TSL_INIT(tsl) TSL_UNSET(tsl)
+--- glibc-2.1.3-15/db2/mutex/mutex.c Wed Jun 30 11:51:07 1999
++++ glibc-2.1.3-16/db2/mutex/mutex.c Wed Mar 15 16:50:45 2000
+@@ -86,6 +86,10 @@ static const char sccsid[] = "@(#)mutex.
+ #include "sparc.gcc"
+ #endif
+
++#ifdef HAVE_ASSEM_ALPHA_GCC
++#include "alpha.gcc"
++#endif
++
+ #ifdef HAVE_ASSEM_UTS4_CC
+ #define TSL_INIT(x)
+ #define TSL_SET(x) (!uts_lock(x, 1))
+--- glibc-2.1.3-15/sysdeps/alpha/Makefile Thu Jul 9 14:52:03 1998
++++ glibc-2.1.3-16/sysdeps/alpha/Makefile Wed Mar 15 16:50:45 2000
+@@ -17,6 +17,10 @@
+ # write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ # Boston, MA 02111-1307, USA.
+
++ifeq ($(subdir),db2)
++CPPFLAGS += -DHAVE_SPINLOCKS=1 -DHAVE_ASSEM_ALPHA_GCC=1
++endif
++
+ ifeq ($(subdir),gmon)
+ sysdep_routines += _mcount
+ endif
+--- glibc-2.1.3-15/sysdeps/unix/sysv/linux/alpha/ioperm.c Mon Oct 11 10:25:24 1999
++++ glibc-2.1.3-16/sysdeps/unix/sysv/linux/alpha/ioperm.c Wed Mar 15 11:57:14 2000
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1992, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
++/* Copyright (C) 1992, 1996-1999, 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by David Mosberger.
+
+@@ -139,6 +139,7 @@ static struct platform {
+ {"Sable", IOSYS_CPUDEP},
+ {"Miata", IOSYS_CIA},
+ {"Tsunami", IOSYS_TSUNAMI},
++ {"Nautilus", IOSYS_TSUNAMI},
+ {"Rawhide", IOSYS_MCPCIA},
+ {"Ruffian", IOSYS_CIA},
+ {"Takara", IOSYS_CIA},