From c097f7325346ef7f258084fa78263a6f18c10213 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 8 Nov 2000 07:03:52 +0000 Subject: [PATCH] Update. * sysdeps/sh/sh3/setjmp.S (__sigsetjmp): Skip FPU fields. --- ChangeLog | 4 +- localedata/locales/mk_MK | 118 ++++++++++++++++++----------- sysdeps/sh/{sh4 => }/bits/setjmp.h | 0 sysdeps/sh/sh3/bits/setjmp.h | 44 ----------- sysdeps/sh/sh3/setjmp.S | 4 +- 5 files changed, 76 insertions(+), 94 deletions(-) rename sysdeps/sh/{sh4 => }/bits/setjmp.h (100%) delete mode 100644 sysdeps/sh/sh3/bits/setjmp.h diff --git a/ChangeLog b/ChangeLog index b3a16199a7..f0f13d51db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,6 @@ 2000-11-07 Kazumoto Kojima - * sysdeps/sh/bits/setjmp.h: Move to... - * sysdeps/sh/sh4/bits/setjmp.h: ...here. - * sysdeps/sh/sh3/bits/setjmp.h: New file. + * sysdeps/sh/sh3/setjmp.S (__sigsetjmp): Skip FPU fields. 2000-11-06 Ulrich Drepper diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK index b1258dd0cb..baae0da814 100644 --- a/localedata/locales/mk_MK +++ b/localedata/locales/mk_MK @@ -1,40 +1,24 @@ comment_char % escape_char / -% Macedonian Language Locale for Macedonia -% Source: -% Address: -% Contact: Damjan Georgievski -% Email: gdamjan@freemail.org.mk -% Tel: none -% Fax: none -% Language: mk -% Territory: MK -% Revision: 0.4 (2000-06-28) -% Date: 1999-12-22 -% Application: general -% Users: general -% Repertoiremap: -% Charset: ISO-8859-5 +% Macedonian language locale for Macedonia +% Damjan Georgievski +% Revision: 1.8 (2000-11-07) +% Charsets: UTF-8, ISO-8859-5, CP1251 % Distribution and use is free, also % for commercial purposes. -% -% Based on the rusian locale, -% sligtly changed to reflect macedonian language. -% To compile: localedef -i mk_MK.src -u mnemonic.ds -f ISO-8859-5 mk_MK -% Or, optional: localedef -i mk_MK.src -u mnemonic.ds -f CP1251 mk_MK.cp1251 LC_IDENTIFICATION title "Macedonian locale for Macedonia" source "" address "" -contact "" -email "bug-glibc@gnu.org" +contact "Damjan Georgievski" +email "gdamjan@freemail.org.mk" tel "" fax "" language "Macedonian" territory "Macedonia" -revision "1.0" -date "2000-06-29" +revision "1.8" +date "2000-11-07" % category "mk_MK:2000";LC_IDENTIFICATION category "mk_MK:2000";LC_CTYPE @@ -59,11 +43,37 @@ copy "i18n" END LC_CTYPE LC_TIME -abday "";"";"";"";"";"";"" -day "";"";"";"";"";"";"" -abmon "";"";"";"";"";"";"";"";"";"";"";"" -mon "";"";"";"";"";"";"";"";"";"";"";"" -d_t_fmt "" +abday "";"";/ +"";"";/ +"";"";/ +"" +day "";/ +"";/ +"";/ +"";/ +"";/ +"";/ +"" +abmon "";"";/ +"";"";/ +"";"";/ +"";"";/ +"";"";/ +"";"" +mon "";/ +"";/ +"";/ +"";/ +"";/ +"";/ +"";/ +"";/ +"";/ +"";/ +"";/ +"" +d_t_fmt "/ +" d_fmt "" t_fmt "" am_pm "";"" @@ -98,33 +108,28 @@ grouping 3;3 END LC_NUMERIC LC_MESSAGES -yesexpr "" +yesexpr "/ +" noexpr "" yesstr "" nostr "" END LC_MESSAGES - -LC_PAPER -height 297 -width 210 -END LC_PAPER - LC_TELEPHONE -tel_int_fmt "/ -" +tel_int_fmt "/ +" tel_dom_fmt "" -int_prefix "" +int_prefix "" int_select "" END LC_TELEPHONE -LC_MEASUREMENT -measurement 1 -END LC_MEASUREMENT - LC_NAME -name_fmt "/ -" +name_fmt "" +name_mr "" +name_mrs "" +name_miss "" +name_ms "" +name_gen "" END LC_NAME LC_ADDRESS @@ -133,4 +138,27 @@ postal_fmt "/ / / " +country_name "/ +" +country_post "" +country_ab2 "" +country_ab3 "" +country_car "" +country_num 807 +country_isbn "9989" +lang_name "/ +" +lang_ab "" +lang_term "" +lang_lib "" END LC_ADDRESS + +LC_PAPER +height 297 +width 210 +END LC_PAPER + +LC_MEASUREMENT +measurement 1 +END LC_MEASUREMENT + diff --git a/sysdeps/sh/sh4/bits/setjmp.h b/sysdeps/sh/bits/setjmp.h similarity index 100% rename from sysdeps/sh/sh4/bits/setjmp.h rename to sysdeps/sh/bits/setjmp.h diff --git a/sysdeps/sh/sh3/bits/setjmp.h b/sysdeps/sh/sh3/bits/setjmp.h deleted file mode 100644 index 782704ddd6..0000000000 --- a/sysdeps/sh/sh3/bits/setjmp.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright (C) 1999, 2000 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 Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* Define the machine-dependent type `jmp_buf'. SH version. */ - -#ifndef _SETJMP_H -# error "Never include directly; use instead." -#endif - -#ifndef _ASM -typedef struct - { - /* Callee-saved registers r8 through r15. */ - int __regs[8]; - - /* Program counter. */ - void * __pc; - - /* The global pointer. */ - void * __gbr; - } __jmp_buf[1]; -#endif - -#define JB_SIZE (4 * 10) - -/* Test if longjmp to JMPBUF would unwind the frame - containing a local variable at ADDRESS. */ -#define _JMPBUF_UNWINDS(jmpbuf, address) \ - ((void *) (address) < &(jmpbuf)[0].__regs[7]) diff --git a/sysdeps/sh/sh3/setjmp.S b/sysdeps/sh/sh3/setjmp.S index ea41f459de..74c7f707ec 100644 --- a/sysdeps/sh/sh3/setjmp.S +++ b/sysdeps/sh/sh3/setjmp.S @@ -1,4 +1,4 @@ -/* setjmp for SH4. +/* setjmp for SH3. Copyright (C) 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -27,7 +27,7 @@ ENTRY (__setjmp) mov #0, r5 ENTRY (__sigsetjmp) /* Save registers */ - add #JB_SIZE, r4 + add #(JB_SIZE - 4 * 5), r4 stc.l gbr, @-r4 sts.l pr, @-r4 mov.l r15, @-r4