Author: aurel32 Date: 2009-04-28 21:25:08 +0000 (Tue, 28 Apr 2009) New Revision: 3436
Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/mips/cvs-context.diff Log: * mips/cvs-context.diff: add missing part from upstream. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2009-04-27 21:33:29 UTC (rev 3435) +++ glibc-package/trunk/debian/changelog 2009-04-28 21:25:08 UTC (rev 3436) @@ -1,3 +1,9 @@ +glibc (2.9-9) unstable; urgency=low + + * mips/cvs-context.diff: add missing part from upstream. + + -- Aurelien Jarno <[email protected]> Tue, 28 Apr 2009 23:11:30 +0200 + glibc (2.9-8) unstable; urgency=low [ Aurelien Jarno ] Modified: glibc-package/trunk/debian/patches/mips/cvs-context.diff =================================================================== --- glibc-package/trunk/debian/patches/mips/cvs-context.diff 2009-04-27 21:33:29 UTC (rev 3435) +++ glibc-package/trunk/debian/patches/mips/cvs-context.diff 2009-04-28 21:25:08 UTC (rev 3436) @@ -1,8 +1,4 @@ -commit ff3475331e3007db16d792b1e1489170b71308a1 -Author: Joseph Myers <[email protected]> -Date: Sat Apr 18 17:32:04 2009 +0000 - - 2009-04-18 Maciej W. Rozycki <[email protected]> +2009-04-18 Maciej W. Rozycki <[email protected]> * sysdeps/unix/sysv/linux/mips/getcontext.S: New file. * sysdeps/unix/sysv/linux/mips/makecontext.S: New file. @@ -15,6 +11,10 @@ * sysdeps/unix/sysv/linux/mips/Makefile (gen-as-const-headers): Add ucontext_i.sym. +2009-04-15 Maciej W. Rozycki <[email protected]> + + * sysdeps/mips/sys/fpregdef.h: Update for new ABIs. + diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index 110fccb..162f1b9 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/Makefile @@ -893,3 +893,127 @@ +MCONTEXT_DSP mcontext (dsp) + +UCONTEXT_SIZE sizeof (ucontext_t) +diff --git a/ports/sysdeps/mips/sys/fpregdef.h b/ports/sysdeps/mips/sys/fpregdef.h +index 3781152..d6c72bb 100644 +--- a/ports/sysdeps/mips/sys/fpregdef.h ++++ b/ports/sysdeps/mips/sys/fpregdef.h +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc. ++/* Copyright (C) 1991,92,94,95,96,97,98,2009 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 +@@ -19,19 +19,52 @@ + #ifndef _SYS_FPREGDEF_H + #define _SYS_FPREGDEF_H + +-/* +- * These definitions only cover the R3000-ish 16/32 register model. +- * But we're trying to be R3000 friendly anyway ... +- */ +-#define fv0 $f0 /* return value */ +-#define fv0f $f1 ++#include <sgidefs.h> ++ ++/* Commonalities first, individualities next... */ ++ ++#define fv0 $f0 /* return value */ + #define fv1 $f2 ++ ++#if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32 ++#define fs0 $f20 /* callee saved */ ++#define fs1 $f22 ++#define fs2 $f24 ++#define fs3 $f26 ++#define fs4 $f28 ++#define fs5 $f30 ++#endif /* _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32 */ ++ ++#if _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32 ++#define fa0 $f12 /* argument registers */ ++#define fa1 $f13 ++#define fa2 $f14 ++#define fa3 $f15 ++#define fa4 $f16 ++#define fa5 $f17 ++#define fa6 $f18 ++#define fa7 $f19 ++ ++#define ft0 $f4 /* caller saved */ ++#define ft1 $f5 ++#define ft2 $f6 ++#define ft3 $f7 ++#define ft4 $f8 ++#define ft5 $f9 ++#define ft6 $f10 ++#define ft7 $f11 ++#endif /* _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32 */ ++ ++#if _MIPS_SIM == _ABIO32 ++#define fv0f $f1 /* return value, high part */ + #define fv1f $f3 +-#define fa0 $f12 /* argument registers */ ++ ++#define fa0 $f12 /* argument registers */ + #define fa0f $f13 + #define fa1 $f14 + #define fa1f $f15 +-#define ft0 $f4 /* caller saved */ ++ ++#define ft0 $f4 /* caller saved */ + #define ft0f $f5 + #define ft1 $f6 + #define ft1f $f7 +@@ -43,19 +76,44 @@ + #define ft4f $f17 + #define ft5 $f18 + #define ft5f $f19 +-#define fs0 $f20 /* callee saved */ +-#define fs0f $f21 +-#define fs1 $f22 ++ ++#define fs0f $f21 /* callee saved, high part */ + #define fs1f $f23 +-#define fs2 $f24 + #define fs2f $f25 +-#define fs3 $f26 + #define fs3f $f27 +-#define fs4 $f28 + #define fs4f $f29 +-#define fs5 $f30 + #define fs5f $f31 ++#endif /* _MIPS_SIM == _ABIO32 */ ++ ++#if _MIPS_SIM == _ABI64 ++#define ft8 $f20 /* caller saved */ ++#define ft9 $f21 ++#define ft10 $f22 ++#define ft11 $f23 ++#define ft12 $f1 ++#define ft13 $f3 ++ ++#define fs0 $f24 /* callee saved */ ++#define fs1 $f25 ++#define fs2 $f26 ++#define fs3 $f27 ++#define fs4 $f28 ++#define fs5 $f29 ++#define fs6 $f30 ++#define fs7 $f31 ++#endif /* _MIPS_SIM == _ABI64 */ ++ ++#if _MIPS_SIM == _ABIN32 ++#define ft8 $f21 /* caller saved */ ++#define ft9 $f23 ++#define ft10 $f25 ++#define ft11 $f27 ++#define ft12 $f29 ++#define ft13 $f31 ++#define ft14 $f1 ++#define ft15 $f3 ++#endif /* _MIPS_SIM == _ABIN32 */ + +-#define fcr31 $31 /* FPU status register */ ++#define fcr31 $31 /* FPU status register */ + + #endif /* sys/fpregdef.h */ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]

