aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--localedata/locales/mk_MK118
-rw-r--r--sysdeps/sh/bits/setjmp.h (renamed from sysdeps/sh/sh4/bits/setjmp.h)0
-rw-r--r--sysdeps/sh/sh3/bits/setjmp.h44
-rw-r--r--sysdeps/sh/sh3/setjmp.S4
5 files changed, 76 insertions, 94 deletions
diff --git a/ChangeLog b/ChangeLog
index b3a16199a7..f0f13d51db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,6 @@
2000-11-07 Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
- * 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 <drepper@redhat.com>
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 <gdamjan@freemail.org.mk>
+% 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 "<U043D><U0435><U0434>";"<U043F><U043E><U043D>";"<U0432><U0442><U043E>";"<U0441><U0440><U0435>";"<U0447><U0435><U0442>";"<U043F><U0435><U0442>";"<U0441><U0430><U0431>"
-day "<U043D><U0435><U0434><U0435><U043B><U0430>";"<U043F><U043E><U043D><U0435><U0434><U0435><U043B><U043D><U0438><U043A>";"<U0432><U0442><U043E><U0440><U043D><U0438><U043A>";"<U0441><U0440><U0435><U0434><U0430>";"<U0447><U0435><U0442><U0432><U0440><U0442><U043E><U043A>";"<U043F><U0435><U0442><U043E><U043A>";"<U0441><U0430><U0431><U043E><U0442><U0430>"
-abmon "<U0458><U0430><U043D>";"<U0444><U0435><U0432>";"<U043C><U0430><U0440>";"<U0430><U043F><U0440>";"<U043C><U0430><U0458>";"<U0458><U0443><U043D>";"<U0458><U0443><U043B>";"<U0430><U0432><U0433>";"<U0441><U0435><U043F>";"<U043E><U043A><U0442>";"<U043D><U043E><U0435>";"<U0434><U0435><U043A>"
-mon "<U0458><U0430><U043D><U0443><U0430><U0440><U0438>";"<U0444><U0435><U0432><U0440><U0443><U0430><U0440><U0438>";"<U043C><U0430><U0440><U0442>";"<U0430><U043F><U0440><U0438><U043B>";"<U043C><U0430><U0458>";"<U0458><U0443><U043D><U0438>";"<U0458><U0443><U043B><U0438>";"<U0430><U0432><U0433><U0443><U0441><U0442>";"<U0441><U0435><U043F><U0442><U0435><U043C><U0432><U0440><U0438>";"<U043E><U043A><U0442><U043E><U043C><U0432><U0440><U0438>";"<U043D><U043E><U0435><U043C><U0432><U0440><U0438>";"<U0434><U0435><U043A><U0435><U043C><U0432><U0440><U0438>"
-d_t_fmt "<U0025><U0061><U002C><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+abday "<U043D><U0435><U0434>";"<U043F><U043E><U043D>";/
+"<U0432><U0442><U043E>";"<U0441><U0440><U0435>";/
+"<U0447><U0435><U0442>";"<U043F><U0435><U0442>";/
+"<U0441><U0430><U0431>"
+day "<U043D><U0435><U0434><U0435><U043B><U0430>";/
+"<U043F><U043E><U043D><U0435><U0434><U0435><U043B><U043D><U0438><U043A>";/
+"<U0432><U0442><U043E><U0440><U043D><U0438><U043A>";/
+"<U0441><U0440><U0435><U0434><U0430>";/
+"<U0447><U0435><U0442><U0432><U0440><U0442><U043E><U043A>";/
+"<U043F><U0435><U0442><U043E><U043A>";/
+"<U0441><U0430><U0431><U043E><U0442><U0430>"
+abmon "<U0458><U0430><U043D>";"<U0444><U0435><U0432>";/
+"<U043C><U0430><U0440>";"<U0430><U043F><U0440>";/
+"<U043C><U0430><U0458>";"<U0458><U0443><U043D>";/
+"<U0458><U0443><U043B>";"<U0430><U0432><U0433>";/
+"<U0441><U0435><U043F>";"<U043E><U043A><U0442>";/
+"<U043D><U043E><U0435>";"<U0434><U0435><U043A>"
+mon "<U0458><U0430><U043D><U0443><U0430><U0440><U0438>";/
+"<U0444><U0435><U0432><U0440><U0443><U0430><U0440><U0438>";/
+"<U043C><U0430><U0440><U0442>";/
+"<U0430><U043F><U0440><U0438><U043B>";/
+"<U043C><U0430><U0458>";/
+"<U0458><U0443><U043D><U0438>";/
+"<U0458><U0443><U043B><U0438>";/
+"<U0430><U0432><U0433><U0443><U0441><U0442>";/
+"<U0441><U0435><U043F><U0442><U0435><U043C><U0432><U0440><U0438>";/
+"<U043E><U043A><U0442><U043E><U043C><U0432><U0440><U0438>";/
+"<U043D><U043E><U0435><U043C><U0432><U0440><U0438>";/
+"<U0434><U0435><U043A><U0435><U043C><U0432><U0440><U0438>"
+d_t_fmt "<U0025><U0061><U002C><U0020><U0025><U0064><U0020><U0025><U0062>/
+<U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
t_fmt "<U0025><U0054>"
am_pm "";""
@@ -98,33 +108,28 @@ grouping 3;3
END LC_NUMERIC
LC_MESSAGES
-yesexpr "<U005B><U0414><U0434><U0044><U0064><U0059><U0079><U0031><U005D><U002E><U002A>"
+yesexpr "<U005B><U0414><U0434><U0044><U0064><U0059><U0079>/
+<U0031><U005D><U002E><U002A>"
noexpr "<U005B><U041D><U043D><U004E><U006E><U0030><U005D><U002E><U002A>"
yesstr "<U0434><U0430>"
nostr "<U043D><U0435>"
END LC_MESSAGES
-
-LC_PAPER
-height 297
-width 210
-END LC_PAPER
-
LC_TELEPHONE
-tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
+tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020>/
+<U0025><U006C>"
tel_dom_fmt "<U0025><U0041><U0020><U0025><U006C>"
-int_prefix "<U0033><U0038><U0039>"
+int_prefix "<U0033><U0038><U0039>"
int_select "<U0030><U0030>"
END LC_TELEPHONE
-LC_MEASUREMENT
-measurement 1
-END LC_MEASUREMENT
-
LC_NAME
-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+name_fmt "<U0025><U0067><U0025><U0074><U0025><U0066>"
+name_mr "<U0433><U002D><U0434><U0438><U043D>"
+name_mrs "<U0433><U002d><U0453><U0430>"
+name_miss "<U0433><U002d><U0453><U0438><U0446><U0430>"
+name_ms "<U0433><U002d><U0453><U0430>"
+name_gen "<U043f><U043e><U0447><U0438><U0442><U0443><U0432><U0430><U043d>"
END LC_NAME
LC_ADDRESS
@@ -133,4 +138,27 @@ postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
<U004E><U0025><U0063><U0025><U004E>"
+country_name "<U004d><U0061><U0063><U0065><U0064>/
+<U006f><U006e><U0069><U0061>"
+country_post "<U004d><U004b>"
+country_ab2 "<U004d><U004b>"
+country_ab3 "<U004d><U004b><U0044>"
+country_car "<U004d><U004b>"
+country_num 807
+country_isbn "9989"
+lang_name "<U004d><U0061><U0063><U0065><U0064><U006f>/
+<U006e><U0069><U0061><U006e>"
+lang_ab "<U006d><U006b>"
+lang_term "<U006d><U006b><U0064>"
+lang_lib "<U006d><U0061><U0063>"
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
index d5918f2ad0..d5918f2ad0 100644
--- a/sysdeps/sh/sh4/bits/setjmp.h
+++ b/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 <bits/setjmp.h> directly; use <setjmp.h> 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