source: patches/gcc-4.3.3-branch_update-1.patch@ cb76e18

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since cb76e18 was fe40bd7, checked in by Jim Gifford <clfs@…>, 16 years ago

Added GCC Branch Update Patch to -1
  • Property mode set to 100644
File size: 246.9 KB
RevLine 
[fe40bd7]1Submitted By: Jim Gifford (jim at cross-lfs dot org)
2Date: 02-03-2009
3Initial Package Version: 4.3.3
4Origin: Upstream
5Upstream Status: Applied
6Description: This is a branch update for gcc-4.3.3, and should be
7 rechecked periodically.
8
9diff -Naur gcc-4.3.3.orig/gcc/alias.c gcc-4.3.3/gcc/alias.c
10--- gcc-4.3.3.orig/gcc/alias.c 2008-03-19 03:06:52.000000000 -0700
11+++ gcc-4.3.3/gcc/alias.c 2009-01-25 04:26:15.714544000 -0800
12@@ -1508,26 +1508,27 @@
13 if (rtx_equal_p (x_base, y_base))
14 return 1;
15
16- /* The base addresses of the read and write are different expressions.
17- If they are both symbols and they are not accessed via AND, there is
18- no conflict. We can bring knowledge of object alignment into play
19- here. For example, on alpha, "char a, b;" can alias one another,
20- though "char a; long b;" cannot. */
21+ /* The base addresses are different expressions. If they are not accessed
22+ via AND, there is no conflict. We can bring knowledge of object
23+ alignment into play here. For example, on alpha, "char a, b;" can
24+ alias one another, though "char a; long b;" cannot. AND addesses may
25+ implicitly alias surrounding objects; i.e. unaligned access in DImode
26+ via AND address can alias all surrounding object types except those
27+ with aligment 8 or higher. */
28+ if (GET_CODE (x) == AND && GET_CODE (y) == AND)
29+ return 1;
30+ if (GET_CODE (x) == AND
31+ && (GET_CODE (XEXP (x, 1)) != CONST_INT
32+ || (int) GET_MODE_UNIT_SIZE (y_mode) < -INTVAL (XEXP (x, 1))))
33+ return 1;
34+ if (GET_CODE (y) == AND
35+ && (GET_CODE (XEXP (y, 1)) != CONST_INT
36+ || (int) GET_MODE_UNIT_SIZE (x_mode) < -INTVAL (XEXP (y, 1))))
37+ return 1;
38+
39+ /* Differing symbols not accessed via AND never alias. */
40 if (GET_CODE (x_base) != ADDRESS && GET_CODE (y_base) != ADDRESS)
41- {
42- if (GET_CODE (x) == AND && GET_CODE (y) == AND)
43- return 1;
44- if (GET_CODE (x) == AND
45- && (GET_CODE (XEXP (x, 1)) != CONST_INT
46- || (int) GET_MODE_UNIT_SIZE (y_mode) < -INTVAL (XEXP (x, 1))))
47- return 1;
48- if (GET_CODE (y) == AND
49- && (GET_CODE (XEXP (y, 1)) != CONST_INT
50- || (int) GET_MODE_UNIT_SIZE (x_mode) < -INTVAL (XEXP (y, 1))))
51- return 1;
52- /* Differing symbols never alias. */
53- return 0;
54- }
55+ return 0;
56
57 /* If one address is a stack reference there can be no alias:
58 stack references using different base registers do not alias,
59diff -Naur gcc-4.3.3.orig/gcc/calls.c gcc-4.3.3/gcc/calls.c
60--- gcc-4.3.3.orig/gcc/calls.c 2008-06-24 00:58:17.000000000 -0700
61+++ gcc-4.3.3/gcc/calls.c 2009-01-29 02:05:17.651873000 -0800
62@@ -978,7 +978,6 @@
63 && targetm.calls.split_complex_arg (argtype))
64 {
65 tree subtype = TREE_TYPE (argtype);
66- arg = save_expr (arg);
67 args[j].tree_value = build1 (REALPART_EXPR, subtype, arg);
68 j += inc;
69 args[j].tree_value = build1 (IMAGPART_EXPR, subtype, arg);
70diff -Naur gcc-4.3.3.orig/gcc/ChangeLog gcc-4.3.3/gcc/ChangeLog
71--- gcc-4.3.3.orig/gcc/ChangeLog 2009-01-24 02:16:13.000000000 -0800
72+++ gcc-4.3.3/gcc/ChangeLog 2009-02-02 12:31:19.548659000 -0800
73@@ -1,3 +1,138 @@
74+2009-02-02 Catherine Moore <clm@codesourcery.com>
75+
76+ * sde.h (SUBTARGET_ARM_SPEC): Don't assemble -fpic code as
77+ -mabicalls.
78+
79+2009-01-31 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
80+
81+ * config/pa/fptr.c: Revert license to GPL 2.
82+ * config/pa/milli64.S: Likewise.
83+
84+2009-01-30 Richard Guenther <rguenther@suse.de>
85+
86+ PR tree-optimization/39041
87+ * tree-ssa-forwprop.c (forward_propagate_addr_expr_1):
88+ Propagate variable indices only if the types match for this stmt.
89+
90+2009-01-29 Uros Bizjak <ubizjak@gmail.com>
91+
92+ Backport from mainline:
93+ 2009-01-28 Uros Bizjak <ubizjak@gmail.com>
94+
95+ PR target/38988
96+ * config/i386/i386.md (set_rip_rex64): Wrap operand 1 in label_ref.
97+ (set_got_offset_rex64): Ditto.
98+
99+ 2009-01-27 Uros Bizjak <ubizjak@gmail.com>
100+
101+ PR middle-end/38969
102+ * calls.c (initialize_argument_information): Do not wrap complex
103+ arguments in SAVE_EXPR.
104+
105+2009-01-27 Steve Ellcey <sje@cup.hp.com>
106+
107+ PR middle-end/38615
108+ * gimplify.c (gimplify_init_constructor): Fix promotion of const
109+ variables to static.
110+ * doc/invoke.texi (-fmerge-all-constants): Update description.
111+
112+2009-01-27 Uros Bizjak <ubizjak@gmail.com>
113+
114+ Backport from mainline:
115+ 2009-01-13 Uros Bizjak <ubizjak@gmail.com>
116+
117+ * config/alpha/alpha.c (alpha_legitimate_address_p): Explicit
118+ relocations of local symbols wider than UNITS_PER_WORD are not valid.
119+ (alpha_legitimize_address): Do not split local symbols wider than
120+ UNITS_PER_WORD into HIGH/LO_SUM parts.
121+
122+ 2009-01-07 Uros Bizjak <ubizjak@gmail.com>
123+
124+ PR target/38706
125+ * config/alpha/alpha.c (alpha_end_function): For TARGET_ABI_OSF, call
126+ free_after_compilation when outputting a thunk.
127+ (alpha_output_mi_thunk_osf): Assert that we are processing a thunk.
128+ Do not call free_after_compilation here.
129+
130+ 2008-12-22 Uros Bizjak <ubizjak@gmail.com>
131+
132+ * config/alpha/elf.h (ASM_OUTPUT_EXTERNAL): New macro.
133+
134+ 2008-12-21 Uros Bizjak <ubizjak@gmail.com>
135+
136+ * config/alpha/alpha.c (alpha_pad_noreturn): New static function.
137+ (alpha_reorg): Call alpha_pad_noreturn.
138+
139+ 2008-12-08 Uros Bizjak <ubizjak@gmail.com>
140+
141+ * config/alpha/alpha.c (alpha_set_memflags): Process memory
142+ references in full insn sequence.
143+
144+ 2008-12-05 Uros Bizjak <ubizjak@gmail.com>
145+
146+ * config/alpha/alpha.c (alpha_fold_vector_minmax): Create
147+ VIEW_CONVERT_EXPR to convert output to long_integer_type_node.
148+
149+ (alpha_emit_conditional_branch): Do not generate direct branch
150+ for UNORDERED comparisons.
151+
152+2008-01-26 Paolo Bonzini <bonzini@gnu.org>
153+
154+ PR tree-optimization/38932
155+ * fold-const.c (fold_unary_ignore_overflow): New.
156+ * tree.h (fold_unary_ignore_overflow): Declare.
157+ * tree-ssa-ccp.c (ccp_fold): Use fold_unary_ignore_overflow.
158+ * tree-ssa-sccvn.c (simplify_unary_expression): Likewise.
159+
160+2009-01-25 Uros Bizjak <ubizjak@gmail.com>
161+
162+ Backport from mainline:
163+ 2009-01-22 Uros Bizjak <ubizjak@gmail.com>
164+
165+ PR target/38931
166+ * config/i386/i386.md (*movsi_1): Use type "mmx" for alternative 2.
167+ (*movdi_1_rex64): Use type "mmx" for alternative 5.
168+
169+ 2009-01-21 Uros Bizjak <ubizjak@gmail.com>
170+
171+ PR rtl-optimization/38879
172+ * alias.c (base_alias_check): Unaligned access via AND address can
173+ alias all surrounding object types except those with sizes equal
174+ or wider than the size of unaligned access.
175+
176+2009-01-25 Richard Guenther <rguenther@suse.de>
177+
178+ Backport from mainline:
179+ 2008-12-02 Richard Guenther <rguenther@suse.de>
180+
181+ PR tree-optimization/38359
182+ * fold-const.c (fold_binary): Fold -1 >> x to -1 only for
183+ non-negative x.
184+
185+2009-01-24 Eric Botcazou <ebotcazou@adacore.com>
186+
187+ * config/sparc/linux.h (DBX_REGISTER_NUMBER): Delete.
188+ * config/sparc/linux64.h (DBX_REGISTER_NUMBER): Likewise.
189+ * config/sparc/sysv4.h (DBX_REGISTER_NUMBER): Likewise.
190+
191+2009-01-24 H.J. Lu <hongjiu.lu@intel.com>
192+
193+ PR target/38902
194+ Backport from mainline:
195+ 2008-12-23 Jakub Jelinek <jakub@redhat.com>
196+
197+ * config/i386/i386.c (expand_movmem_via_rep_mov): Set MEM_SIZE
198+ correctly.
199+ (expand_setmem_via_rep_stos): Add ORIG_VALUE argument. If
200+ ORIG_VALUE is const0_rtx and COUNT is constant, set MEM_SIZE
201+ on DESTMEM.
202+ (ix86_expand_setmem): Adjust callers.
203+
204+2008-01-24 Richard Guenther <rguenther@suse.de>
205+
206+ * BASE-VER: Set to 4.3.4.
207+ * DEV-PHASE: Set to prerelease.
208+
209 2009-01-24 Release Manager
210
211 * GCC 4.3.3 released.
212@@ -5,8 +140,7 @@
213 2009-01-20 Joseph Myers <joseph@codesourcery.com>
214
215 PR other/38758
216- * longlong.h: Update copyright years. Use soft-fp license
217- notice.
218+ * longlong.h: Update copyright years. Use soft-fp license notice.
219
220 2009-01-19 Richard Guenther <rguenther@suse.de>
221
222@@ -41,7 +175,8 @@
223
224 2009-01-11 Matthias Klose <doko@ubuntu.com>
225
226- PR middle-end/38616, backport from mainline:
227+ PR middle-end/38616
228+ Backport from mainline:
229 2008-05-04 Uros Bizjak <ubizjak@gmail.com>
230
231 * config/i386/i386.md (*strmovsi_1): Simplify asm alternatives.
232@@ -509,8 +644,8 @@
233 PR tree-optimization/37102
234 * tree-outof-ssa.c (remove_gimple_phi_args): Remove all the PHI args
235 from a node. Check to see if another PHI is dead.
236- (eliminate_useless_phis): Rename from eliminate_virtual_phis and remove
237- real PHIs which have no uses.
238+ (eliminate_useless_phis): Rename from eliminate_virtual_phis and
239+ remove real PHIs which have no uses.
240 (rewrite_out_of_ssa): Call eliminate_useless_phis.
241
242 2008-10-08 Simon Martin <simartin@users.sourceforge.net>
243@@ -986,8 +1121,10 @@
244
245 (MFC_MIN_DMA_LIST_ELEMENTS): New define.
246 (MFC_MAX_DMA_LIST_ELEMENTS): Likewise.
247- (MFC_MIN_DMA_LIST_SIZE): Redefine in terms of MFC_MIN_DMA_LIST_ELEMENTS.
248- (MFC_MAX_DMA_LIST_SIZE): Redefine in terms of MFC_MAX_DMA_LIST_ELEMENTS.
249+ (MFC_MIN_DMA_LIST_SIZE): Redefine in terms of
250+ MFC_MIN_DMA_LIST_ELEMENTS.
251+ (MFC_MAX_DMA_LIST_SIZE): Redefine in terms of
252+ MFC_MAX_DMA_LIST_ELEMENTS.
253
254 (MFC_START_ENABLE): Remove PPU-only define.
255 (MFC_PUTS_CMD, MFC_PUTFS_CMD, MFC_PUTBS_CMD): Likewise.
256diff -Naur gcc-4.3.3.orig/gcc/config/alpha/alpha.c gcc-4.3.3/gcc/config/alpha/alpha.c
257--- gcc-4.3.3.orig/gcc/config/alpha/alpha.c 2008-09-08 16:16:55.000000000 -0700
258+++ gcc-4.3.3/gcc/config/alpha/alpha.c 2009-01-27 03:39:42.241832000 -0800
259@@ -1,6 +1,7 @@
260 /* Subroutines used for code generation on the DEC Alpha.
261 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
262- 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
263+ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
264+ Free Software Foundation, Inc.
265 Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
266
267 This file is part of GCC.
268@@ -863,9 +864,11 @@
269 }
270 }
271
272- /* If we're managing explicit relocations, LO_SUM is valid, as
273- are small data symbols. */
274- else if (TARGET_EXPLICIT_RELOCS)
275+ /* If we're managing explicit relocations, LO_SUM is valid, as are small
276+ data symbols. Avoid explicit relocations in modes larger than word
277+ mode since i.e. $LC0+8($1) can fold around +/- 32k offset. */
278+ else if (TARGET_EXPLICIT_RELOCS
279+ && GET_MODE_SIZE (mode) <= UNITS_PER_WORD)
280 {
281 if (small_symbolic_operand (x, Pmode))
282 return true;
283@@ -915,8 +918,7 @@
284 to be legitimate. If we find one, return the new, valid address. */
285
286 rtx
287-alpha_legitimize_address (rtx x, rtx scratch,
288- enum machine_mode mode ATTRIBUTE_UNUSED)
289+alpha_legitimize_address (rtx x, rtx scratch, enum machine_mode mode)
290 {
291 HOST_WIDE_INT addend;
292
293@@ -964,8 +966,12 @@
294 goto split_addend;
295 }
296
297- /* If this is a local symbol, split the address into HIGH/LO_SUM parts. */
298- if (TARGET_EXPLICIT_RELOCS && symbolic_operand (x, Pmode))
299+ /* If this is a local symbol, split the address into HIGH/LO_SUM parts.
300+ Avoid modes larger than word mode since i.e. $LC0+8($1) can fold
301+ around +/- 32k offset. */
302+ if (TARGET_EXPLICIT_RELOCS
303+ && GET_MODE_SIZE (mode) <= UNITS_PER_WORD
304+ && symbolic_operand (x, Pmode))
305 {
306 rtx r0, r16, eqv, tga, tp, insn, dest, seq;
307
308@@ -1602,18 +1608,17 @@
309 return -1;
310 }
311
312-/* Given INSN, which is an INSN list or the PATTERN of a single insn
313- generated to perform a memory operation, look for any MEMs in either
314+/* Given SEQ, which is an INSN list, look for any MEMs in either
315 a SET_DEST or a SET_SRC and copy the in-struct, unchanging, and
316 volatile flags from REF into each of the MEMs found. If REF is not
317 a MEM, don't do anything. */
318
319 void
320-alpha_set_memflags (rtx insn, rtx ref)
321+alpha_set_memflags (rtx seq, rtx ref)
322 {
323- rtx *base_ptr;
324+ rtx insn;
325
326- if (GET_CODE (ref) != MEM)
327+ if (!MEM_P (ref))
328 return;
329
330 /* This is only called from alpha.md, after having had something
331@@ -1626,11 +1631,11 @@
332 && !MEM_READONLY_P (ref))
333 return;
334
335- if (INSN_P (insn))
336- base_ptr = &PATTERN (insn);
337- else
338- base_ptr = &insn;
339- for_each_rtx (base_ptr, alpha_set_memflags_1, (void *) ref);
340+ for (insn = seq; insn; insn = NEXT_INSN (insn))
341+ if (INSN_P (insn))
342+ for_each_rtx (&PATTERN (insn), alpha_set_memflags_1, (void *) ref);
343+ else
344+ gcc_unreachable ();
345 }
346
347
348 static rtx alpha_emit_set_const (rtx, enum machine_mode, HOST_WIDE_INT,
349@@ -2452,7 +2457,7 @@
350 if (alpha_compare.fp_p)
351 {
352 cmp_mode = DFmode;
353- if (flag_unsafe_math_optimizations)
354+ if (flag_unsafe_math_optimizations && cmp_code != UNORDERED)
355 {
356 /* When we are not as concerned about non-finite values, and we
357 are comparing against zero, we can branch directly. */
358@@ -6794,7 +6799,7 @@
359 tree op0 = fold_convert (vtype, op[0]);
360 tree op1 = fold_convert (vtype, op[1]);
361 tree val = fold_build2 (code, vtype, op0, op1);
362- return fold_convert (long_integer_type_node, val);
363+ return fold_build1 (VIEW_CONVERT_EXPR, long_integer_type_node, val);
364 }
365
366 static tree
367@@ -8242,6 +8247,11 @@
368 if (GET_CODE (insn) == CALL_INSN)
369 output_asm_insn (get_insn_template (CODE_FOR_nop, NULL), NULL);
370
371+#if TARGET_ABI_OSF
372+ if (current_function_is_thunk)
373+ free_after_compilation (cfun);
374+#endif
375+
376 #if TARGET_ABI_OPEN_VMS
377 alpha_write_linkage (file, fnname, decl);
378 #endif
379@@ -8281,6 +8291,8 @@
380 HOST_WIDE_INT hi, lo;
381 rtx this, insn, funexp;
382
383+ gcc_assert (current_function_is_thunk);
384+
385 /* We always require a valid GP. */
386 emit_insn (gen_prologue_ldgp ());
387 emit_note (NOTE_INSN_PROLOGUE_END);
388@@ -9268,12 +9280,68 @@
389 i = next;
390 }
391 }
392+
393+/* Insert an unop between a noreturn function call and GP load. */
394+
395+static void
396+alpha_pad_noreturn (void)
397+{
398+ rtx insn, next;
399+
400+ for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
401+ {
402+ rtx pat;
403+
404+ if (!CALL_P (insn)
405+ || !find_reg_note (insn, REG_NORETURN, NULL_RTX))
406+ continue;
407+
408+ next = next_active_insn (insn);
409+
410+ if (next)
411+ {
412+ pat = PATTERN (next);
413+
414+ if (GET_CODE (pat) == SET
415+ && GET_CODE (SET_SRC (pat)) == UNSPEC_VOLATILE
416+ && XINT (SET_SRC (pat), 1) == UNSPECV_LDGP1)
417+ emit_insn_after (gen_unop (), insn);
418+ }
419+ }
420+}
421
422
423 /* Machine dependent reorg pass. */
424
425 static void
426 alpha_reorg (void)
427 {
428+ /* Workaround for a linker error that triggers when an
429+ exception handler immediatelly follows a noreturn function.
430+
431+ The instruction stream from an object file:
432+
433+ 54: 00 40 5b 6b jsr ra,(t12),58 <__func+0x58>
434+ 58: 00 00 ba 27 ldah gp,0(ra)
435+ 5c: 00 00 bd 23 lda gp,0(gp)
436+ 60: 00 00 7d a7 ldq t12,0(gp)
437+ 64: 00 40 5b 6b jsr ra,(t12),68 <__func+0x68>
438+
439+ was converted in the final link pass to:
440+
441+ fdb24: a0 03 40 d3 bsr ra,fe9a8 <_called_func+0x8>
442+ fdb28: 00 00 fe 2f unop
443+ fdb2c: 00 00 fe 2f unop
444+ fdb30: 30 82 7d a7 ldq t12,-32208(gp)
445+ fdb34: 00 40 5b 6b jsr ra,(t12),fdb38 <__func+0x68>
446+
447+ GP load instructions were wrongly cleared by the linker relaxation
448+ pass. This workaround prevents removal of GP loads by inserting
449+ an unop instruction between a noreturn function call and
450+ exception handler prologue. */
451+
452+ if (current_function_has_exception_handlers ())
453+ alpha_pad_noreturn ();
454+
455 if (alpha_tp != ALPHA_TP_PROG || flag_exceptions)
456 alpha_handle_trap_shadows ();
457
458diff -Naur gcc-4.3.3.orig/gcc/config/alpha/elf.h gcc-4.3.3/gcc/config/alpha/elf.h
459--- gcc-4.3.3.orig/gcc/config/alpha/elf.h 2007-08-02 03:49:31.000000000 -0700
460+++ gcc-4.3.3/gcc/config/alpha/elf.h 2009-01-27 03:39:42.241832000 -0800
461@@ -423,3 +423,13 @@
462 #if defined(HAVE_LD_EH_FRAME_HDR)
463 #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
464 #endif
465+
466+/* A C statement (sans semicolon) to output to the stdio stream STREAM
467+ any text necessary for declaring the name of an external symbol
468+ named NAME which is referenced in this compilation but not defined.
469+ It is needed to properly support non-default visibility. */
470+
471+#ifndef ASM_OUTPUT_EXTERNAL
472+#define ASM_OUTPUT_EXTERNAL(FILE, DECL, NAME) \
473+ default_elf_asm_output_external (FILE, DECL, NAME)
474+#endif
475diff -Naur gcc-4.3.3.orig/gcc/config/i386/i386.c gcc-4.3.3/gcc/config/i386/i386.c
476--- gcc-4.3.3.orig/gcc/config/i386/i386.c 2008-08-28 06:31:33.000000000 -0700
477+++ gcc-4.3.3/gcc/config/i386/i386.c 2009-01-24 07:31:13.971031000 -0800
478@@ -14773,6 +14773,22 @@
479 destexp = gen_rtx_PLUS (Pmode, destptr, countreg);
480 srcexp = gen_rtx_PLUS (Pmode, srcptr, countreg);
481 }
482+ if (CONST_INT_P (count))
483+ {
484+ count = GEN_INT (INTVAL (count)
485+ & ~((HOST_WIDE_INT) GET_MODE_SIZE (mode) - 1));
486+ destmem = shallow_copy_rtx (destmem);
487+ srcmem = shallow_copy_rtx (srcmem);
488+ set_mem_size (destmem, count);
489+ set_mem_size (srcmem, count);
490+ }
491+ else
492+ {
493+ if (MEM_SIZE (destmem))
494+ set_mem_size (destmem, NULL_RTX);
495+ if (MEM_SIZE (srcmem))
496+ set_mem_size (srcmem, NULL_RTX);
497+ }
498 emit_insn (gen_rep_mov (destptr, destmem, srcptr, srcmem, countreg,
499 destexp, srcexp));
500 }
501@@ -14781,8 +14797,8 @@
502 Arguments have same meaning as for previous function */
503 static void
504 expand_setmem_via_rep_stos (rtx destmem, rtx destptr, rtx value,
505- rtx count,
506- enum machine_mode mode)
507+ rtx count, enum machine_mode mode,
508+ rtx orig_value)
509 {
510 rtx destexp;
511 rtx countreg;
512@@ -14799,6 +14815,15 @@
513 }
514 else
515 destexp = gen_rtx_PLUS (Pmode, destptr, countreg);
516+ if (orig_value == const0_rtx && CONST_INT_P (count))
517+ {
518+ count = GEN_INT (INTVAL (count)
519+ & ~((HOST_WIDE_INT) GET_MODE_SIZE (mode) - 1));
520+ destmem = shallow_copy_rtx (destmem);
521+ set_mem_size (destmem, count);
522+ }
523+ else if (MEM_SIZE (destmem))
524+ set_mem_size (destmem, NULL_RTX);
525 emit_insn (gen_rep_stos (destptr, countreg, destmem, value, destexp));
526 }
527
528@@ -15871,15 +15896,15 @@
529 break;
530 case rep_prefix_8_byte:
531 expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp,
532- DImode);
533+ DImode, val_exp);
534 break;
535 case rep_prefix_4_byte:
536 expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp,
537- SImode);
538+ SImode, val_exp);
539 break;
540 case rep_prefix_1_byte:
541 expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp,
542- QImode);
543+ QImode, val_exp);
544 break;
545 }
546 /* Adjust properly the offset of src and dest memory for aliasing. */
547diff -Naur gcc-4.3.3.orig/gcc/config/i386/i386.md gcc-4.3.3/gcc/config/i386/i386.md
548--- gcc-4.3.3.orig/gcc/config/i386/i386.md 2009-01-11 09:29:23.000000000 -0800
549+++ gcc-4.3.3/gcc/config/i386/i386.md 2009-01-29 02:05:17.651873000 -0800
550@@ -1397,7 +1397,7 @@
551 gcc_unreachable ();
552 }
553
554- case TYPE_MMXADD:
555+ case TYPE_MMX:
556 return "pxor\t%0, %0";
557
558 case TYPE_MMXMOV:
559@@ -1415,7 +1415,7 @@
560 }
561 [(set (attr "type")
562 (cond [(eq_attr "alternative" "2")
563- (const_string "mmxadd")
564+ (const_string "mmx")
565 (eq_attr "alternative" "3,4,5")
566 (const_string "mmxmov")
567 (eq_attr "alternative" "6")
568@@ -2231,7 +2231,7 @@
569 return "movq\t{%1, %0|%0, %1}";
570
571 case TYPE_SSELOG1:
572- case TYPE_MMXADD:
573+ case TYPE_MMX:
574 return "pxor\t%0, %0";
575
576 case TYPE_MULTI:
577@@ -2252,7 +2252,7 @@
578 }
579 [(set (attr "type")
580 (cond [(eq_attr "alternative" "5")
581- (const_string "mmxadd")
582+ (const_string "mmx")
583 (eq_attr "alternative" "6,7,8,9,10")
584 (const_string "mmxmov")
585 (eq_attr "alternative" "11")
586@@ -15001,7 +15001,7 @@
587
588 (define_insn "set_rip_rex64"
589 [(set (match_operand:DI 0 "register_operand" "=r")
590- (unspec:DI [(match_operand:DI 1 "" "")] UNSPEC_SET_RIP))]
591+ (unspec:DI [(label_ref (match_operand 1 "" ""))] UNSPEC_SET_RIP))]
592 "TARGET_64BIT"
593 "lea{q}\t{%l1(%%rip), %0|%0, %l1[rip]}"
594 [(set_attr "type" "lea")
595@@ -15009,7 +15009,9 @@
596
597 (define_insn "set_got_offset_rex64"
598 [(set (match_operand:DI 0 "register_operand" "=r")
599- (unspec:DI [(match_operand:DI 1 "" "")] UNSPEC_SET_GOT_OFFSET))]
600+ (unspec:DI
601+ [(label_ref (match_operand 1 "" ""))]
602+ UNSPEC_SET_GOT_OFFSET))]
603 "TARGET_64BIT"
604 "movabs{q}\t{$_GLOBAL_OFFSET_TABLE_-%l1, %0|%0, OFFSET FLAT:_GLOBAL_OFFSET_TABLE_-%l1}"
605 [(set_attr "type" "imov")
606diff -Naur gcc-4.3.3.orig/gcc/config/mips/sde.h gcc-4.3.3/gcc/config/mips/sde.h
607--- gcc-4.3.3.orig/gcc/config/mips/sde.h 2007-09-19 10:13:33.000000000 -0700
608+++ gcc-4.3.3/gcc/config/mips/sde.h 2009-02-02 12:31:19.548659000 -0800
609@@ -56,7 +56,6 @@
610 #undef SUBTARGET_ASM_SPEC
611 #define SUBTARGET_ASM_SPEC "\
612 %{!mips1:--trap} \
613-%{fPIC|fpic|fPIE|fpie:%{!mips16*:-KPIC}} \
614 %{mips16:-no-mips16}"
615
616 #undef LINK_SPEC
617diff -Naur gcc-4.3.3.orig/gcc/config/pa/fptr.c gcc-4.3.3/gcc/config/pa/fptr.c
618--- gcc-4.3.3.orig/gcc/config/pa/fptr.c 2007-08-02 03:49:31.000000000 -0700
619+++ gcc-4.3.3/gcc/config/pa/fptr.c 2009-01-31 12:05:03.693395000 -0800
620@@ -6,7 +6,7 @@
621
622 GCC is free software; you can redistribute it and/or modify it under
623 the terms of the GNU General Public License as published by the Free
624-Software Foundation; either version 3, or (at your option) any later
625+Software Foundation; either version 2, or (at your option) any later
626 version.
627
628 In addition to the permissions in the GNU General Public License, the
629@@ -24,8 +24,9 @@
630 for more details.
631
632 You should have received a copy of the GNU General Public License
633-along with GCC; see the file COPYING3. If not see
634-<http://www.gnu.org/licenses/>. */
635+along with GCC; see the file COPYING. If not, write to the Free
636+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
637+02110-1301, USA. */
638
639 /* WARNING: The code is this function depends on internal and undocumented
640 details of the GNU linker and dynamic loader as implemented for parisc
641diff -Naur gcc-4.3.3.orig/gcc/config/pa/milli64.S gcc-4.3.3/gcc/config/pa/milli64.S
642--- gcc-4.3.3.orig/gcc/config/pa/milli64.S 2007-08-02 03:49:31.000000000 -0700
643+++ gcc-4.3.3/gcc/config/pa/milli64.S 2009-01-31 12:05:03.693395000 -0800
644@@ -8,7 +8,7 @@
645
646 GCC is free software; you can redistribute it and/or modify it under
647 the terms of the GNU General Public License as published by the Free
648-Software Foundation; either version 3, or (at your option) any later
649+Software Foundation; either version 2, or (at your option) any later
650 version.
651
652 In addition to the permissions in the GNU General Public License, the
653@@ -26,8 +26,9 @@
654 for more details.
655
656 You should have received a copy of the GNU General Public License
657- along with GCC; see the file COPYING3. If not see
658-<http://www.gnu.org/licenses/>. */
659+along with GCC; see the file COPYING. If not, write to the Free
660+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
661+02110-1301, USA. */
662
663 #ifdef pa64
664 .level 2.0w
665diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h
666--- gcc-4.3.3.orig/gcc/config/sparc/linux64.h 2007-10-18 21:29:38.000000000 -0700
667+++ gcc-4.3.3/gcc/config/sparc/linux64.h 2009-01-24 12:49:51.463535000 -0800
668@@ -285,10 +285,6 @@
669 %{mlittle-endian:-EL} \
670 %(asm_cpu) %(asm_arch) %(asm_relax)"
671
672-/* Same as sparc.h */
673-#undef DBX_REGISTER_NUMBER
674-#define DBX_REGISTER_NUMBER(REGNO) (REGNO)
675-
676 #undef ASM_OUTPUT_ALIGNED_LOCAL
677 #define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN) \
678 do { \
679diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h
680--- gcc-4.3.3.orig/gcc/config/sparc/linux.h 2007-08-02 03:49:31.000000000 -0700
681+++ gcc-4.3.3/gcc/config/sparc/linux.h 2009-01-24 12:49:51.463535000 -0800
682@@ -148,10 +148,6 @@
683 "%{V} %{v:%{!V:-V}} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Wa,*:%*} -s \
684 %{fpic|fPIC|fpie|fPIE:-K PIC} %(asm_cpu) %(asm_relax)"
685
686-/* Same as sparc.h */
687-#undef DBX_REGISTER_NUMBER
688-#define DBX_REGISTER_NUMBER(REGNO) (REGNO)
689-
690 #undef ASM_OUTPUT_ALIGNED_LOCAL
691 #define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN) \
692 do { \
693diff -Naur gcc-4.3.3.orig/gcc/config/sparc/sysv4.h gcc-4.3.3/gcc/config/sparc/sysv4.h
694--- gcc-4.3.3.orig/gcc/config/sparc/sysv4.h 2007-08-02 03:49:31.000000000 -0700
695+++ gcc-4.3.3/gcc/config/sparc/sysv4.h 2009-01-24 12:49:51.463535000 -0800
696@@ -93,22 +93,6 @@
697 fprintf (FILE, "\n"); \
698 } while (0)
699
700-/* Define how the SPARC registers should be numbered for Dwarf output.
701- The numbering provided here should be compatible with the native
702- svr4 SDB debugger in the SPARC/svr4 reference port. The numbering
703- is as follows:
704-
705- Assembly name gcc internal regno Dwarf regno
706- ----------------------------------------------------------
707- g0-g7 0-7 0-7
708- o0-o7 8-15 8-15
709- l0-l7 16-23 16-23
710- i0-i7 24-31 24-31
711- f0-f31 32-63 40-71
712-*/
713-
714-#define DBX_REGISTER_NUMBER(REGNO) ((REGNO) < 32 ? (REGNO) : (REGNO) + 8)
715-
716 /* A set of symbol definitions for assembly pseudo-ops which will
717 get us switched to various sections of interest. These are used
718 in all places where we simply want to switch to a section, and
719diff -Naur gcc-4.3.3.orig/gcc/cp/ChangeLog gcc-4.3.3/gcc/cp/ChangeLog
720--- gcc-4.3.3.orig/gcc/cp/ChangeLog 2009-01-24 02:15:39.000000000 -0800
721+++ gcc-4.3.3/gcc/cp/ChangeLog 2009-02-03 07:56:05.128711000 -0800
722@@ -1,3 +1,26 @@
723+2009-02-03 Paolo Bonzini <bonzini@gnu.org>
724+
725+ PR c++/36897
726+ * pt.c (convert_nontype_argument_function): Expect expr to be an
727+ ADDR_EXPR.
728+
729+ PR c++/37314
730+ * typeck.c (merge_types): Call resolve_typename_type if only
731+ one type is a typename.
732+
733+2009-02-02 Jason Merrill <jason@redhat.com>
734+
735+ PR c++/39054
736+ * parser.c (cp_parser_unqualified_id): Don't wrap error_mark_node
737+ in BIT_NOT_EXPR.
738+
739+2009-01-26 Jason Merrill <jason@redhat.com>
740+
741+ PR c++/23287
742+ * parser.c (cp_parser_unqualified_id): In a template,
743+ accept ~identifier.
744+ * typeck.c (lookup_destructor): Handle IDENTIFIER_NODE.
745+
746 2009-01-24 Release Manager
747
748 * GCC 4.3.3 released.
749diff -Naur gcc-4.3.3.orig/gcc/cp/parser.c gcc-4.3.3/gcc/cp/parser.c
750--- gcc-4.3.3.orig/gcc/cp/parser.c 2008-11-19 13:00:23.000000000 -0800
751+++ gcc-4.3.3/gcc/cp/parser.c 2009-02-02 11:57:29.682708000 -0800
752@@ -3791,6 +3791,8 @@
753 parser->scope = NULL_TREE;
754 parser->object_scope = NULL_TREE;
755 parser->qualifying_scope = NULL_TREE;
756+ if (processing_template_decl)
757+ cp_parser_parse_tentatively (parser);
758 type_decl
759 = cp_parser_class_name (parser,
760 /*typename_keyword_p=*/false,
761@@ -3799,6 +3801,16 @@
762 /*check_dependency=*/false,
763 /*class_head_p=*/false,
764 declarator_p);
765+ if (processing_template_decl
766+ && ! cp_parser_parse_definitely (parser))
767+ {
768+ /* We couldn't find a type with this name, so just accept
769+ it and check for a match at instantiation time. */
770+ type_decl = cp_parser_identifier (parser);
771+ if (type_decl != error_mark_node)
772+ type_decl = build_nt (BIT_NOT_EXPR, type_decl);
773+ return type_decl;
774+ }
775 }
776 /* If an error occurred, assume that the name of the
777 destructor is the same as the name of the qualifying
778diff -Naur gcc-4.3.3.orig/gcc/cp/pt.c gcc-4.3.3/gcc/cp/pt.c
779--- gcc-4.3.3.orig/gcc/cp/pt.c 2009-01-16 14:35:24.000000000 -0800
780+++ gcc-4.3.3/gcc/cp/pt.c 2009-02-03 07:56:05.128711000 -0800
781@@ -4555,6 +4555,13 @@
782 expr = convert_nontype_argument_function (type, expr);
783 if (!expr || expr == error_mark_node)
784 return expr;
785+
786+ if (TREE_CODE (expr) != ADDR_EXPR)
787+ {
788+ error ("%qE is not a valid template argument for type %qT", expr, type);
789+ error ("it must be the address of a function with external linkage");
790+ return NULL_TREE;
791+ }
792 }
793 /* [temp.arg.nontype]/5, bullet 5
794
795diff -Naur gcc-4.3.3.orig/gcc/cp/typeck.c gcc-4.3.3/gcc/cp/typeck.c
796--- gcc-4.3.3.orig/gcc/cp/typeck.c 2009-01-15 14:34:20.000000000 -0800
797+++ gcc-4.3.3/gcc/cp/typeck.c 2009-02-03 07:56:05.128711000 -0800
798@@ -608,6 +608,20 @@
799
800 code1 = TREE_CODE (t1);
801 code2 = TREE_CODE (t2);
802+ if (code1 != code2)
803+ {
804+ gcc_assert (code1 == TYPENAME_TYPE || code2 == TYPENAME_TYPE);
805+ if (code1 == TYPENAME_TYPE)
806+ {
807+ t1 = resolve_typename_type (t1, /*only_current_p=*/true);
808+ code1 = TREE_CODE (t1);
809+ }
810+ else
811+ {
812+ t2 = resolve_typename_type (t2, /*only_current_p=*/true);
813+ code2 = TREE_CODE (t2);
814+ }
815+ }
816
817 switch (code1)
818 {
819@@ -2034,8 +2048,8 @@
820 return result;
821 }
822
823-/* Return the destructor denoted by OBJECT.SCOPE::~DTOR_NAME, or, if
824- SCOPE is NULL, by OBJECT.~DTOR_NAME. */
825+/* Return the destructor denoted by OBJECT.SCOPE::DTOR_NAME, or, if
826+ SCOPE is NULL, by OBJECT.DTOR_NAME, where DTOR_NAME is ~type. */
827
828 static tree
829 lookup_destructor (tree object, tree scope, tree dtor_name)
830@@ -2050,7 +2064,21 @@
831 scope, dtor_type);
832 return error_mark_node;
833 }
834- if (!DERIVED_FROM_P (dtor_type, TYPE_MAIN_VARIANT (object_type)))
835+ if (TREE_CODE (dtor_type) == IDENTIFIER_NODE)
836+ {
837+ /* In a template, names we can't find a match for are still accepted
838+ destructor names, and we check them here. */
839+ if (check_dtor_name (object_type, dtor_type))
840+ dtor_type = object_type;
841+ else
842+ {
843+ error ("object type %qT does not match destructor name ~%qT",
844+ object_type, dtor_type);
845+ return error_mark_node;
846+ }
847+
848+ }
849+ else if (!DERIVED_FROM_P (dtor_type, TYPE_MAIN_VARIANT (object_type)))
850 {
851 error ("the type being destroyed is %qT, but the destructor refers to %qT",
852 TYPE_MAIN_VARIANT (object_type), dtor_type);
853diff -Naur gcc-4.3.3.orig/gcc/doc/invoke.texi gcc-4.3.3/gcc/doc/invoke.texi
854--- gcc-4.3.3.orig/gcc/doc/invoke.texi 2008-11-21 08:21:50.000000000 -0800
855+++ gcc-4.3.3/gcc/doc/invoke.texi 2009-01-27 10:45:49.519017000 -0800
856@@ -5406,8 +5406,9 @@
857 This option implies @option{-fmerge-constants}. In addition to
858 @option{-fmerge-constants} this considers e.g.@: even constant initialized
859 arrays or initialized constant variables with integral or floating point
860-types. Languages like C or C++ require each non-automatic variable to
861-have distinct location, so using this option will result in non-conforming
862+types. Languages like C or C++ require each variable, including multiple
863+instances of the same variable in recursive calls, to have distinct locations,
864+so using this option will result in non-conforming
865 behavior.
866
867 @item -fmodulo-sched
868diff -Naur gcc-4.3.3.orig/gcc/fold-const.c gcc-4.3.3/gcc/fold-const.c
869--- gcc-4.3.3.orig/gcc/fold-const.c 2008-10-22 13:08:01.000000000 -0700
870+++ gcc-4.3.3/gcc/fold-const.c 2009-01-26 07:54:18.800086000 -0800
871@@ -8519,6 +8519,24 @@
872 } /* switch (code) */
873 }
874
875+
876+/* If the operation was a conversion do _not_ mark a resulting constant
877+ with TREE_OVERFLOW if the original constant was not. These conversions
878+ have implementation defined behavior and retaining the TREE_OVERFLOW
879+ flag here would confuse later passes such as VRP. */
880+tree
881+fold_unary_ignore_overflow (enum tree_code code, tree type, tree op0)
882+{
883+ tree res = fold_unary (code, type, op0);
884+ if (res
885+ && TREE_CODE (res) == INTEGER_CST
886+ && TREE_CODE (op0) == INTEGER_CST
887+ && (code == NOP_EXPR || code == CONVERT_EXPR))
888+ TREE_OVERFLOW (res) = TREE_OVERFLOW (op0);
889+
890+ return res;
891+}
892+
893 /* Fold a binary expression of code CODE and type TYPE with operands
894 OP0 and OP1, containing either a MIN-MAX or a MAX-MIN combination.
895 Return the folded expression if folding is successful. Otherwise,
896@@ -11673,7 +11691,8 @@
897
898 case RSHIFT_EXPR:
899 /* Optimize -1 >> x for arithmetic right shifts. */
900- if (integer_all_onesp (arg0) && !TYPE_UNSIGNED (type))
901+ if (integer_all_onesp (arg0) && !TYPE_UNSIGNED (type)
902+ && tree_expr_nonnegative_p (arg1))
903 return omit_one_operand (type, arg0, arg1);
904 /* ... fall through ... */
905
906diff -Naur gcc-4.3.3.orig/gcc/fortran/ChangeLog gcc-4.3.3/gcc/fortran/ChangeLog
907--- gcc-4.3.3.orig/gcc/fortran/ChangeLog 2009-01-24 02:15:54.000000000 -0800
908+++ gcc-4.3.3/gcc/fortran/ChangeLog 2009-01-25 22:15:41.225652000 -0800
909@@ -1,3 +1,35 @@
910+2009-01-26 Paul Thomas <pault@gcc.gnu.org>
911+
912+ PR fortran/38907
913+ Backport from trunk
914+ * resolve.c (check_host_association): Remove the matching to
915+ correct an incorrect host association and use manipulation of
916+ the expression instead.
917+
918+2009-01-26 Mikael Morin <mikael.morin@tele2.fr>
919+
920+ PR fortran/38859
921+ Backport from trunk
922+ * simplify.c (simplify_bound): Don't use array specification
923+ if variable or component has subsequent references.
924+
925+2009-01-26 Paul Thomas <pault@gcc.gnu.org>
926+
927+ PR fortran/38657
928+ Backport from trunk.
929+ * module.c (write_common_0): Add argument 'this_module' and
930+ check that non-use associated common blocks are written first.
931+ (write_common): Call write_common_0 twice, once with true and
932+ then with false.
933+
934+2009-01-24 Thomas Koenig <tkoenig@gcc.gnu.org>
935+
936+ PR fortran/38672
937+ Backport from trunk.
938+ * resolve.c (resolve_symbol): Check for the
939+ presence of derived->ns->proc_name before
940+ accessing derived->ns->proc_name->attr.flavor .
941+
942 2009-01-24 Release Manager
943
944 * GCC 4.3.3 released.
945diff -Naur gcc-4.3.3.orig/gcc/fortran/module.c gcc-4.3.3/gcc/fortran/module.c
946--- gcc-4.3.3.orig/gcc/fortran/module.c 2009-01-17 01:28:50.000000000 -0800
947+++ gcc-4.3.3/gcc/fortran/module.c 2009-01-25 21:12:03.141287000 -0800
948@@ -3992,7 +3992,7 @@
949 /* Write a common block to the module -- recursive helper function. */
950
951 static void
952-write_common_0 (gfc_symtree *st)
953+write_common_0 (gfc_symtree *st, bool this_module)
954 {
955 gfc_common_head *p;
956 const char * name;
957@@ -4004,7 +4004,7 @@
958 if (st == NULL)
959 return;
960
961- write_common_0 (st->left);
962+ write_common_0 (st->left, this_module);
963
964 /* We will write out the binding label, or the name if no label given. */
965 name = st->n.common->name;
966@@ -4023,6 +4023,10 @@
967 w = (c < 0) ? w->left : w->right;
968 }
969
970+ /* Give priority to commons that are not use associated. */
971+ if (this_module && p->use_assoc)
972+ write_me = false;
973+
974 if (write_me)
975 {
976 /* Write the common to the module. */
977@@ -4043,12 +4047,12 @@
978
979 /* Record that we have written this common. */
980 w = gfc_getmem (sizeof (struct written_common));
981- w->name = name;
982 w->label = label;
983+ w->name = name;
984 gfc_insert_bbt (&written_commons, w, compare_written_commons);
985 }
986
987- write_common_0 (st->right);
988+ write_common_0 (st->right, this_module);
989 }
990
991
992@@ -4059,7 +4063,8 @@
993 write_common (gfc_symtree *st)
994 {
995 written_commons = NULL;
996- write_common_0 (st);
997+ write_common_0 (st, true);
998+ write_common_0 (st, false);
999 free_written_common (written_commons);
1000 written_commons = NULL;
1001 }
1002diff -Naur gcc-4.3.3.orig/gcc/fortran/resolve.c gcc-4.3.3/gcc/fortran/resolve.c
1003--- gcc-4.3.3.orig/gcc/fortran/resolve.c 2009-01-11 05:42:32.000000000 -0800
1004+++ gcc-4.3.3/gcc/fortran/resolve.c 2009-01-25 22:15:41.225652000 -0800
1005@@ -4189,15 +4189,17 @@
1006 /* Checks to see that the correct symbol has been host associated.
1007 The only situation where this arises is that in which a twice
1008 contained function is parsed after the host association is made.
1009- Therefore, on detecting this, the line is rematched, having got
1010- rid of the existing references and actual_arg_list. */
1011+ Therefore, on detecting this, change the symbol in the expression
1012+ and convert the array reference into an actual arglist if the old
1013+ symbol is a variable. */
1014 static bool
1015 check_host_association (gfc_expr *e)
1016 {
1017 gfc_symbol *sym, *old_sym;
1018- locus temp_locus;
1019- gfc_expr *expr;
1020+ gfc_symtree *st;
1021 int n;
1022+ gfc_ref *ref;
1023+ gfc_actual_arglist *arg, *tail;
1024 bool retval = e->expr_type == EXPR_FUNCTION;
1025
1026 /* If the expression is the result of substitution in
1027@@ -4213,26 +4215,16 @@
1028 if (gfc_current_ns->parent
1029 && old_sym->ns != gfc_current_ns)
1030 {
1031+ /* Use the 'USE' name so that renamed module symbols are
1032+ correctly handled. */
1033 gfc_find_symbol (e->symtree->name, gfc_current_ns, 1, &sym);
1034+
1035 if (sym && old_sym != sym
1036 && sym->ts.type == old_sym->ts.type
1037 && sym->attr.flavor == FL_PROCEDURE
1038 && sym->attr.contained)
1039 {
1040- temp_locus = gfc_current_locus;
1041- gfc_current_locus = e->where;
1042-
1043- gfc_buffer_error (1);
1044-
1045- gfc_free_ref_list (e->ref);
1046- e->ref = NULL;
1047-
1048- if (retval)
1049- {
1050- gfc_free_actual_arglist (e->value.function.actual);
1051- e->value.function.actual = NULL;
1052- }
1053-
1054+ /* Clear the shape, since it might not be valid. */
1055 if (e->shape != NULL)
1056 {
1057 for (n = 0; n < e->rank; n++)
1058@@ -4241,22 +4233,58 @@
1059 gfc_free (e->shape);
1060 }
1061
1062-/* TODO - Replace this gfc_match_rvalue with a straight replacement of
1063- actual arglists for function to function substitutions and with a
1064- conversion of the reference list to an actual arglist in the case of
1065- a variable to function replacement. This should be quite easy since
1066- only integers and vectors can be involved. */
1067- gfc_match_rvalue (&expr);
1068- gfc_clear_error ();
1069- gfc_buffer_error (0);
1070+ /* Give the symbol a symtree in the right place! */
1071+ gfc_get_sym_tree (sym->name, gfc_current_ns, &st);
1072+ st->n.sym = sym;
1073+
1074+ if (old_sym->attr.flavor == FL_PROCEDURE)
1075+ {
1076+ /* Original was function so point to the new symbol, since
1077+ the actual argument list is already attached to the
1078+ expression. */
1079+ e->value.function.esym = NULL;
1080+ e->symtree = st;
1081+ }
1082+ else
1083+ {
1084+ /* Original was variable so convert array references into
1085+ an actual arglist. This does not need any checking now
1086+ since gfc_resolve_function will take care of it. */
1087+ e->value.function.actual = NULL;
1088+ e->expr_type = EXPR_FUNCTION;
1089+ e->symtree = st;
1090+
1091+ /* Ambiguity will not arise if the array reference is not
1092+ the last reference. */
1093+ for (ref = e->ref; ref; ref = ref->next)
1094+ if (ref->type == REF_ARRAY && ref->next == NULL)
1095+ break;
1096
1097- gcc_assert (expr && sym == expr->symtree->n.sym);
1098+ gcc_assert (ref->type == REF_ARRAY);
1099
1100- *e = *expr;
1101- gfc_free (expr);
1102- sym->refs++;
1103+ /* Grab the start expressions from the array ref and
1104+ copy them into actual arguments. */
1105+ for (n = 0; n < ref->u.ar.dimen; n++)
1106+ {
1107+ arg = gfc_get_actual_arglist ();
1108+ arg->expr = gfc_copy_expr (ref->u.ar.start[n]);
1109+ if (e->value.function.actual == NULL)
1110+ tail = e->value.function.actual = arg;
1111+ else
1112+ {
1113+ tail->next = arg;
1114+ tail = arg;
1115+ }
1116+ }
1117
1118- gfc_current_locus = temp_locus;
1119+ /* Dump the reference list and set the rank. */
1120+ gfc_free_ref_list (e->ref);
1121+ e->ref = NULL;
1122+ e->rank = sym->as ? sym->as->rank : 0;
1123+ }
1124+
1125+ gfc_resolve_expr (e);
1126+ sym->refs++;
1127 }
1128 }
1129 /* This might have changed! */
1130@@ -8116,6 +8144,7 @@
1131 module function and is not PRIVATE. */
1132 if (sym->ts.type == BT_DERIVED
1133 && sym->ts.derived->attr.use_assoc
1134+ && sym->ns->proc_name
1135 && sym->ns->proc_name->attr.flavor == FL_MODULE)
1136 {
1137 gfc_symbol *ds;
1138diff -Naur gcc-4.3.3.orig/gcc/fortran/simplify.c gcc-4.3.3/gcc/fortran/simplify.c
1139--- gcc-4.3.3.orig/gcc/fortran/simplify.c 2008-11-13 22:14:46.000000000 -0800
1140+++ gcc-4.3.3/gcc/fortran/simplify.c 2009-01-25 21:43:44.109708000 -0800
1141@@ -2104,7 +2104,10 @@
1142 case AR_FULL:
1143 /* We're done because 'as' has already been set in the
1144 previous iteration. */
1145- goto done;
1146+ if (!ref->next)
1147+ goto done;
1148+
1149+ /* Fall through. */
1150
1151 case AR_SECTION:
1152 case AR_UNKNOWN:
1153diff -Naur gcc-4.3.3.orig/gcc/gimplify.c gcc-4.3.3/gcc/gimplify.c
1154--- gcc-4.3.3.orig/gcc/gimplify.c 2008-12-18 13:55:31.000000000 -0800
1155+++ gcc-4.3.3/gcc/gimplify.c 2009-01-27 10:45:49.519017000 -0800
1156@@ -3206,7 +3206,8 @@
1157 if (valid_const_initializer
1158 && num_nonzero_elements > 1
1159 && TREE_READONLY (object)
1160- && TREE_CODE (object) == VAR_DECL)
1161+ && TREE_CODE (object) == VAR_DECL
1162+ && (flag_merge_constants >= 2 || !TREE_ADDRESSABLE (object)))
1163 {
1164 if (notify_temp_creation)
1165 return GS_ERROR;
1166diff -Naur gcc-4.3.3.orig/gcc/testsuite/ChangeLog gcc-4.3.3/gcc/testsuite/ChangeLog
1167--- gcc-4.3.3.orig/gcc/testsuite/ChangeLog 2009-01-24 02:15:24.000000000 -0800
1168+++ gcc-4.3.3/gcc/testsuite/ChangeLog 2009-02-03 07:56:05.128711000 -0800
1169@@ -1,3 +1,204 @@
1170+2009-02-03 Paolo Bonzini <bonzini@gnu.org>
1171+
1172+ PR c++/36897
1173+ * g++.dg/template/func2.C: New test.
1174+
1175+ PR c++/37314
1176+ * g++.dg/template/typename15.C: New.
1177+ * g++.dg/template/typename16.C: New.
1178+
1179+2009-02-02 Jason Merrill <jason@redhat.com>
1180+
1181+ PR c++/39054
1182+ * g++.dg/parse/dtor14.C: New test.
1183+
1184+2009-01-30 H.J. Lu <hongjiu.lu@intel.com>
1185+
1186+ Backport from mainline:
1187+ 2009-01-14 Jakub Jelinek <jakub@redhat.com>
1188+
1189+ PR rtl-optimization/38245
1190+ * gcc.dg/pr38245-3.c: New test.
1191+ * gcc.dg/pr38245-3.h: New file.
1192+ * gcc.dg/pr38245-4.c: New file.
1193+ * gcc.dg/pr38364.c: New test.
1194+
1195+2009-01-30 Richard Guenther <rguenther@suse.de>
1196+
1197+ PR tree-optimization/39041
1198+ * gcc.c-torture/compile/pr39041.c: New testcase.
1199+
1200+2009-01-30 H.J. Lu <hongjiu.lu@intel.com>
1201+
1202+ Backport from mainline:
1203+ 2009-01-16 Jakub Jelinek <jakub@redhat.com>
1204+
1205+ PR tree-optimization/38789
1206+ * gcc.c-torture/compile/pr38789.c: New test.
1207+
1208+2009-01-30 H.J. Lu <hongjiu.lu@intel.com>
1209+
1210+ Backport from mainline:
1211+ 2009-01-27 Richard Guenther <rguenther@suse.de>
1212+
1213+ PR tree-optimization/38503
1214+ * g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C: New testcase.
1215+
1216+ 2009-01-26 Richard Guenther <rguenther@suse.de>
1217+
1218+ PR tree-optimization/38745
1219+ * g++.dg/torture/pr38745.C: New testcase.
1220+
1221+ 2009-01-26 Richard Guenther <rguenther@suse.de>
1222+
1223+ PR middle-end/38851
1224+ * g++.dg/warn/Wuninitialized-1.C: New testcase.
1225+
1226+ 2009-01-20 Andrew Pinski <andrew_pinski@playstation.sony.com>
1227+ Richard Guenther <rguenther@suse.de>
1228+
1229+ PR tree-optimization/38747
1230+ PR tree-optimization/38748
1231+ * gcc.dg/tree-ssa/struct-aliasing-1.c: New test.
1232+ * gcc.c-torture/execute/struct-aliasing-1.c: Likewise.
1233+
1234+2009-01-29 H.J. Lu <hongjiu.lu@intel.com>
1235+
1236+ Backport from mainline:
1237+ 2009-01-28 Richard Guenther <rguenther@suse.de>
1238+
1239+ PR middle-end/38908
1240+ * g++.dg/warn/Wuninitialized-2.C: New testcase.
1241+
1242+ 2009-01-27 Daniel Kraft <d@domob.eu>
1243+
1244+ PR fortran/38883
1245+ * gfortran.dg/mvbits_6.f90: New test.
1246+ * gfortran.dg/mvbits_7.f90: New test.
1247+ * gfortran.dg/mvbits_8.f90: New test.
1248+
1249+ 2009-01-21 Daniel Kraft <d@domob.eu>
1250+
1251+ PR fortran/38887
1252+ * gfortran.dg/mvbits_5.f90: New test.
1253+
1254+2009-01-29 H.J. Lu <hongjiu.lu@intel.com>
1255+
1256+ Backport from mainline:
1257+ 2009-01-29 Steve Ellcey <sje@cup.hp.com>
1258+
1259+ PR middle-end/38857
1260+ * gcc.c-torture/compile/pr38857.c: New test.
1261+
1262+ 2009-01-28 Richard Guenther <rguenther@suse.de>
1263+
1264+ PR tree-optimization/38926
1265+ * gcc.c-torture/compile/pr38926.c: New testcase.
1266+
1267+2009-01-29 Uros Bizjak <ubizjak@gmail.com>
1268+
1269+ Backport from mainline:
1270+ 2009-01-28 Uros Bizjak <ubizjak@gmail.com>
1271+
1272+ PR target/38988
1273+ * gcc.target/i386/pr38988.c: New test.
1274+
1275+ 2009-01-27 Uros Bizjak <ubizjak@gmail.com>
1276+
1277+ PR middle-end/38969
1278+ * gcc.c-torture/execute/pr38969.c: New test.
1279+
1280+2009-01-27 Steve Ellcey <sje@cup.hp.com>
1281+
1282+ PR middle-end/38615
1283+ * gcc.dg/pr38615.c: New test.
1284+
1285+2009-01-27 Uros Bizjak <ubizjak@gmail.com>
1286+
1287+ Backport from mainline:
1288+ 2009-01-07 Uros Bizjak <ubizjak@gmail.com>
1289+
1290+ PR target/38706
1291+ * g++.dg/other/pr38706.C: New test.
1292+
1293+2009-01-26 Jason Merrill <jason@redhat.com>
1294+
1295+ PR c++/23287
1296+ * g++.dg/template/dtor5.C: New test.
1297+
1298+2009-01-26 H.J. Lu <hongjiu.lu@intel.com>
1299+
1300+ Backport from mainline:
1301+ 2008-07-17 H.J. Lu <hongjiu.lu@intel.com>
1302+
1303+ PR testsuite/36443
1304+ * objc.dg/gnu-encoding/gnu-encoding.exp: Temporarily unset
1305+ GCC_EXEC_PREFIX from environment when running $HOSTCC.
1306+
1307+2008-01-26 Paolo Bonzini <bonzini@gnu.org>
1308+
1309+ PR tree-optimization/38932
1310+ * gcc.dg/pr38932.c: New.
1311+
1312+2009-01-26 Paul Thomas <pault@gcc.gnu.org>
1313+
1314+ PR fortran/38907
1315+ Backport from trunk
1316+ * gfortran.dg/host_assoc_function_7.f90: New test.
1317+
1318+2009-01-26 Mikael Morin <mikael.morin@tele2.fr>
1319+
1320+ PR fortran/38859
1321+ Backport from trunk
1322+ * gfortran.dg/bound_5.f90: New test.
1323+
1324+2009-01-26 Paul Thomas <pault@gcc.gnu.org>
1325+
1326+ PR fortran/38657
1327+ Backport from trunk.
1328+ * gfortran.dg/module_commons_3.f90: Reapply.
1329+
1330+2009-01-25 Uros Bizjak <ubizjak@gmail.com>
1331+
1332+ Backport from mainline:
1333+ 2009-01-22 Uros Bizjak <ubizjak@gmail.com>
1334+
1335+ PR target/38931
1336+ * gcc.target/i386/pr38931.c: New test.
1337+
1338+2009-01-25 Richard Guenther <rguenther@suse.de>
1339+
1340+ Backport from mainline:
1341+ 2008-12-02 Richard Guenther <rguenther@suse.de>
1342+
1343+ PR tree-optimization/38359
1344+ * gcc.c-torture/compile/pr38359.c: New testcase.
1345+ * gcc.c-torture/execute/shiftopt-1.c: Adjust.
1346+
1347+2009-01-24 Thomas Koenig <tkoenig@gcc.gnu.org>
1348+
1349+ PR fortran/38672
1350+ Backport from trunk.
1351+ * gfortran.dg/host_assoc_blockdata_1.f90: New test.
1352+ * gfortran.dg/host_assoc_blockdata_2.f90: New test.
1353+
1354+2009-01-24 H.J. Lu <hongjiu.lu@intel.com>
1355+
1356+ Backport from mainline:
1357+ 2009-01-20 Kees Cook <kees@ubuntu.com>
1358+ H.J. Lu <hongjiu.lu@intel.com>
1359+
1360+ PR target/38902
1361+ * gcc.dg/pr38902.c: New.
1362+
1363+2009-01-24 H.J. Lu <hongjiu.lu@intel.com>
1364+
1365+ Backport from mainline:
1366+ 2008-01-20 Paolo Bonzini <bonzini@gnu.org>
1367+
1368+ PR target/38868
1369+ * gfortran.dg/pr38868.f: New testcase.
1370+
1371 2009-01-24 Release Manager
1372
1373 * GCC 4.3.3 released.
1374@@ -89,7 +290,7 @@
1375
1376 Backport from mainline:
1377 2008-12-29 Dorit Nuzman <dorit@il.ibm.com>
1378- Ira Rosen <irar@il.ibm.com>
1379+ Ira Rosen <irar@il.ibm.com>
1380
1381 PR tree-optimization/38529
1382 * gcc.dg/vect/pr38529.c: New test.
1383@@ -426,8 +627,8 @@
1384
1385 2008-11-14 Paul Thomas <pault@gcc.gnu.org>
1386
1387- PR fortran/37836
1388- * gfortran.dg/minmaxval_1.f90: New test.
1389+ PR fortran/37836
1390+ * gfortran.dg/minmaxval_1.f90: New test.
1391
1392 2008-11-13 Jason Merrill <jason@redhat.com>
1393
1394diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38359.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38359.c
1395--- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38359.c 1969-12-31 16:00:00.000000000 -0800
1396+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38359.c 2009-01-24 15:26:56.556617000 -0800
1397@@ -0,0 +1,17 @@
1398+unsigned _ov_64_seek_lap (_Bool x1, _Bool x2, _Bool x3)
1399+{
1400+ unsigned ltmp_3978_7__PHI_TEMPORARY;
1401+ signed ltmp_4011_7;
1402+
1403+ if (!x1 || !x2)
1404+ while (1) ;
1405+
1406+ if (x3)
1407+ ltmp_3978_7__PHI_TEMPORARY = 0xffffff7e;
1408+ else
1409+ ltmp_3978_7__PHI_TEMPORARY = 1;
1410+
1411+ ltmp_4011_7 = -1;
1412+ return ltmp_4011_7 >> ltmp_3978_7__PHI_TEMPORARY;
1413+}
1414+
1415diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38789.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38789.c
1416--- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38789.c 1969-12-31 16:00:00.000000000 -0800
1417+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38789.c 2009-01-30 09:46:24.138943000 -0800
1418@@ -0,0 +1,18 @@
1419+/* PR tree-optimization/38789 */
1420+
1421+void
1422+baz (int v)
1423+{
1424+ unsigned a = (v == 1) ? 1 : 2;
1425+
1426+ if (__builtin_constant_p (a))
1427+ asm volatile ("# constant %0" :: "i" (a));
1428+ else
1429+ asm volatile ("# register %0" :: "r" (a));
1430+
1431+ a = 6;
1432+ if (__builtin_constant_p (a))
1433+ asm volatile ("# constant %0" :: "i" (a));
1434+ else
1435+ asm volatile ("# register %0" :: "r" (a));
1436+}
1437diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38857.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38857.c
1438--- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38857.c 1969-12-31 16:00:00.000000000 -0800
1439+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38857.c 2009-01-29 09:06:01.240583000 -0800
1440@@ -0,0 +1,22 @@
1441+static const int vs_total_ac_bits = 2680;
1442+typedef struct EncBlockInfo {
1443+ short mb[64];
1444+ unsigned char next[64];
1445+} EncBlockInfo;
1446+inline void dv_guess_qnos(EncBlockInfo* blks, int* qnos) {
1447+ int size[5];
1448+ int j, k, a, prev;
1449+ EncBlockInfo* b;
1450+ for(a=2; a==2 || vs_total_ac_bits < size[0]; a+=a){
1451+ for (j=0; j<6*5; j++, b++) {
1452+ for (k= b->next[prev]; k<64; k= b->next[k]) {
1453+ if(b->mb[k] < a && b->mb[k] > -a){
1454+ b->next[prev] = b->next[k];
1455+ }
1456+ else{
1457+ prev = k;
1458+ }
1459+ }
1460+ }
1461+ }
1462+}
1463diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38926.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38926.c
1464--- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38926.c 1969-12-31 16:00:00.000000000 -0800
1465+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38926.c 2009-01-29 09:06:01.240583000 -0800
1466@@ -0,0 +1,41 @@
1467+static inline int foo (unsigned _si1)
1468+{
1469+ if (_si1 != 0)
1470+ if (_si1 > 2147483647)
1471+ return 1;
1472+ return 0;
1473+}
1474+
1475+static inline unsigned bar (unsigned _left, int _right)
1476+{
1477+ return (unsigned) _right >= 8 ? 1 : _left >> _right;
1478+}
1479+
1480+unsigned g_2;
1481+unsigned g_67;
1482+volatile unsigned g_162;
1483+
1484+static inline int func_62 (unsigned p_63)
1485+{
1486+ p_63 = g_2 & g_67;
1487+ if (g_2)
1488+ ;
1489+ else if (p_63)
1490+ return 1;
1491+ g_67 = bar (p_63, g_2);
1492+ return 0;
1493+}
1494+
1495+unsigned baz (void)
1496+{
1497+ if (g_2)
1498+ for (; g_2 <= -16; g_2 = foo (g_2))
1499+ {
1500+ for (; g_162; g_162)
1501+ func_62 (func_62 (0));
1502+ if (g_67)
1503+ break;
1504+ }
1505+ return g_2;
1506+}
1507+
1508diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr39041.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr39041.c
1509--- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr39041.c 1969-12-31 16:00:00.000000000 -0800
1510+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr39041.c 2009-01-30 14:14:39.201534000 -0800
1511@@ -0,0 +1,28 @@
1512+int test_bit(int nr, void *addr)
1513+{
1514+ int *a = (int *)addr;
1515+ int mask;
1516+ a += nr;
1517+ mask = 1 << nr;
1518+ return mask & *a;
1519+}
1520+struct {
1521+ struct {
1522+ int disabled;
1523+ } *data[1];
1524+} trace;
1525+struct {
1526+ unsigned bits[1];
1527+} cpumask;
1528+void inc(int *);
1529+void dec(int *);
1530+int foo(void)
1531+{
1532+ int cpu;
1533+ for (cpu = 0; cpu < 1; cpu++) {
1534+ if (test_bit(cpu, cpumask.bits))
1535+ inc(&trace.data[cpu]->disabled);
1536+ if (!test_bit(cpu, cpumask.bits))
1537+ dec(&trace.data[cpu]->disabled);
1538+ }
1539+}
1540diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr38969.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr38969.c
1541--- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr38969.c 1969-12-31 16:00:00.000000000 -0800
1542+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr38969.c 2009-01-29 02:05:17.651873000 -0800
1543@@ -0,0 +1,25 @@
1544+__complex__ float
1545+__attribute__ ((noinline)) foo (__complex__ float x)
1546+{
1547+ return x;
1548+}
1549+
1550+__complex__ float
1551+__attribute__ ((noinline)) bar (__complex__ float x)
1552+{
1553+ return foo (x);
1554+}
1555+
1556+int main()
1557+{
1558+ __complex__ float a, b;
1559+ __real__ a = 9;
1560+ __imag__ a = 42;
1561+
1562+ b = bar (a);
1563+
1564+ if (a != b)
1565+ abort ();
1566+
1567+ return 0;
1568+}
1569diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c
1570--- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c 2002-12-16 10:23:00.000000000 -0800
1571+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c 2009-01-24 15:26:56.556617000 -0800
1572@@ -43,12 +43,6 @@
1573
1574 if (0 >> x != 0)
1575 link_error ();
1576-
1577- if (-1 >> x != -1)
1578- link_error ();
1579-
1580- if (~0 >> x != ~0)
1581- link_error ();
1582 }
1583
1584 int
1585diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c
1586--- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c 1969-12-31 16:00:00.000000000 -0800
1587+++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c 2009-01-30 09:31:24.050790000 -0800
1588@@ -0,0 +1,17 @@
1589+struct S { float f; };
1590+int __attribute__((noinline))
1591+foo (int *r, struct S *p)
1592+{
1593+ int *q = (int *)&p->f;
1594+ int i = *q;
1595+ *r = 0;
1596+ return i + *q;
1597+}
1598+extern void abort (void);
1599+int main()
1600+{
1601+ int i = 1;
1602+ if (foo (&i, (struct S *)&i) != 1)
1603+ abort ();
1604+ return (0);
1605+}
1606diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.c
1607--- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.c 1969-12-31 16:00:00.000000000 -0800
1608+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.c 2009-01-30 14:36:22.577619000 -0800
1609@@ -0,0 +1,112 @@
1610+/* PR rtl-optimization/38245 */
1611+/* { dg-do run } */
1612+/* { dg-additional-sources "pr38245-4.c" } */
1613+/* { dg-options "-O2" } */
1614+
1615+#include "pr38245-3.h"
1616+
1617+extern void abort (void);
1618+
1619+struct A { int i, j; union { short s[4]; long long l; }; char pad[512]; } a;
1620+int globv = 6;
1621+
1622+void __attribute__((noinline))
1623+f1 (void)
1624+{
1625+ a.s[2] = b1 (6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
1626+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21);
1627+ a.l = 6;
1628+}
1629+
1630+void __attribute__((noinline))
1631+f2 (void)
1632+{
1633+ a.s[2] = b2 (6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
1634+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21);
1635+ a.l = 6;
1636+}
1637+
1638+void __attribute__((noinline))
1639+f3 (void)
1640+{
1641+ struct B b = { 30, 31, { 32, 33 } };
1642+ a.s[2] = b3 (6, 7, 8, 9, 10, 11, 12, b, 14, b, 16, b, 18, 19, 20, 21,
1643+ 6, b, 8, b, 10, 11, 12, 13, 14, b, 16, b, 18, 19, 20, 21);
1644+ a.l = 6;
1645+}
1646+
1647+void __attribute__((noinline))
1648+f4 (void)
1649+{
1650+ struct B b = { 30, 31, { 32, 33 } };
1651+ a.s[2] = b4 (6, 7, 8, 9, 10, 11, 12, b, 14, b, 16, b, 18, 19, 20, 21,
1652+ 6, b, 8, b, 10, 11, 12, 13, 14, b, 16, b, 18, 19, 20, 21);
1653+ a.l = 6;
1654+}
1655+
1656+void __attribute__((noinline))
1657+f5 (void)
1658+{
1659+ a.s[2] = b5 (6.0, 7, 8, 9, 10, 11, 21.0, 22.0, 23.0);
1660+ a.l = 6;
1661+}
1662+
1663+void __attribute__((noinline))
1664+f6 (void)
1665+{
1666+ a.s[2] = b6 (6.0, 7, 8, 9, 10, 11, 21.0, 22.0, 23.0);
1667+ a.l = 6;
1668+}
1669+
1670+void __attribute__((noinline))
1671+f7 (void)
1672+{
1673+ a.s[2] = b7 (6, 7);
1674+ a.l = 6;
1675+}
1676+
1677+void __attribute__((noinline))
1678+f8 (void)
1679+{
1680+ a.s[2] = b8 (6, 7);
1681+ a.l = 6;
1682+}
1683+
1684+void __attribute__((noinline))
1685+f9 (void)
1686+{
1687+ a.s[2] = b9 (6, 7, 8, 9, 10, 11, 12);
1688+ a.l = 6;
1689+}
1690+
1691+void __attribute__((noinline))
1692+f10 (void)
1693+{
1694+ a.s[2] = b10 (6, 7, 8, 9, 10, 11, 12);
1695+ a.l = 6;
1696+}
1697+
1698+int
1699+main (void)
1700+{
1701+ char buf[256];
1702+ int i;
1703+ for (i = 0; i < (int) sizeof buf; i++)
1704+ buf[i] = i;
1705+ asm volatile ("" : : "r" (buf) : "memory");
1706+ f1 ();
1707+ f2 ();
1708+ f3 ();
1709+ f4 ();
1710+ f5 ();
1711+ f6 ();
1712+ f7 ();
1713+ f8 ();
1714+ f9 ();
1715+ f10 ();
1716+ asm volatile ("" : : "r" (buf) : "memory");
1717+ for (i = 0; i < (int) sizeof buf; i++)
1718+ if (buf[i] != (char) i)
1719+ abort ();
1720+ return 0;
1721+}
1722diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.h gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.h
1723--- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.h 1969-12-31 16:00:00.000000000 -0800
1724+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.h 2009-01-30 14:36:22.577619000 -0800
1725@@ -0,0 +1,35 @@
1726+/* PR rtl-optimization/38245 */
1727+
1728+struct B { long a, b; char p[32]; };
1729+extern int globv;
1730+
1731+extern int b1 (long long, long, long, long, long, long, long, long,
1732+ long long, long, long, long, long, long, long, long,
1733+ long long, long, long, long, long, long, long, long,
1734+ long long, long, long, long, long, long, long, long)
1735+ __attribute__((pure, noinline));
1736+extern int b2 (long long, long, long, long, long, long, long, long,
1737+ long long, long, long, long, long, long, long, long,
1738+ long long, long, long, long, long, long, long, long,
1739+ long long, long, long, long, long, long, long, long)
1740+ __attribute__((const, noinline));
1741+extern int b3 (long long, long, long, long, long, long, long, struct B,
1742+ long long, struct B, long, struct B, long, long, long, long,
1743+ long long, struct B, long, struct B, long, long, long, long,
1744+ long long, struct B, long, struct B, long, long, long, long)
1745+ __attribute__((pure, noinline));
1746+extern int b4 (long long, long, long, long, long, long, long, struct B,
1747+ long long, struct B, long, struct B, long, long, long, long,
1748+ long long, struct B, long, struct B, long, long, long, long,
1749+ long long, struct B, long, struct B, long, long, long, long)
1750+ __attribute__((const, noinline));
1751+extern int b5 () __attribute__((pure, noinline));
1752+extern int b6 () __attribute__((const, noinline));
1753+extern int b7 (int, int)
1754+ __attribute__((pure, noinline));
1755+extern int b8 (int, int)
1756+ __attribute__((const, noinline));
1757+extern int b9 (int, int, int, int, int, int, int)
1758+ __attribute__((pure, noinline));
1759+extern int b10 (int, int, int, int, int, int, int)
1760+ __attribute__((const, noinline));
1761diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-4.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-4.c
1762--- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-4.c 1969-12-31 16:00:00.000000000 -0800
1763+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-4.c 2009-01-30 14:36:22.577619000 -0800
1764@@ -0,0 +1,107 @@
1765+/* PR rtl-optimization/38245 */
1766+/* { dg-do compile } */
1767+/* { dg-options "" } */
1768+
1769+#include "pr38245-3.h"
1770+
1771+int
1772+b1 (long long a1, long a2, long a3, long a4,
1773+ long a5, long a6, long a7, long a8,
1774+ long long a9, long a10, long a11, long a12,
1775+ long a13, long a14, long a15, long a16,
1776+ long long a17, long a18, long a19, long a20,
1777+ long a21, long a22, long a23, long a24,
1778+ long long a25, long a26, long a27, long a28,
1779+ long a29, long a30, long a31, long a32)
1780+{
1781+ return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + a10
1782+ + a11 + a12 + a13 + a14 + a15 + a16 + a17 + a18 + a19 + a20
1783+ + a21 + a22 + a23 + a24 + a25 + a26 + a27 + a28 + a29 + a30
1784+ + a31 + a32 + globv;
1785+}
1786+
1787+int
1788+b2 (long long a1, long a2, long a3, long a4,
1789+ long a5, long a6, long a7, long a8,
1790+ long long a9, long a10, long a11, long a12,
1791+ long a13, long a14, long a15, long a16,
1792+ long long a17, long a18, long a19, long a20,
1793+ long a21, long a22, long a23, long a24,
1794+ long long a25, long a26, long a27, long a28,
1795+ long a29, long a30, long a31, long a32)
1796+{
1797+ return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + a10
1798+ + a11 + a12 + a13 + a14 + a15 + a16 + a17 + a18 + a19 + a20
1799+ + a21 + a22 + a23 + a24 + a25 + a26 + a27 + a28 + a29 + a30
1800+ + a31 + a32;
1801+}
1802+
1803+int
1804+b3 (long long a1, long a2, long a3, long a4,
1805+ long a5, long a6, long a7, struct B a8,
1806+ long long a9, struct B a10, long a11, struct B a12,
1807+ long a13, long a14, long a15, long a16,
1808+ long long a17, struct B a18, long a19, struct B a20,
1809+ long a21, long a22, long a23, long a24,
1810+ long long a25, struct B a26, long a27, struct B a28,
1811+ long a29, long a30, long a31, long a32)
1812+{
1813+ return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8.a + a9 + a10.a
1814+ + a11 + a12.a + a13 + a14 + a15 + a16 + a17 + a18.a + a19 + a20.a
1815+ + a21 + a22 + a23 + a24 + a25 + a26.a + a27 + a28.a + a29 + a30
1816+ + a31 + a32 + globv;
1817+}
1818+
1819+int
1820+b4 (long long a1, long a2, long a3, long a4,
1821+ long a5, long a6, long a7, struct B a8,
1822+ long long a9, struct B a10, long a11, struct B a12,
1823+ long a13, long a14, long a15, long a16,
1824+ long long a17, struct B a18, long a19, struct B a20,
1825+ long a21, long a22, long a23, long a24,
1826+ long long a25, struct B a26, long a27, struct B a28,
1827+ long a29, long a30, long a31, long a32)
1828+{
1829+ return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8.a + a9 + a10.a
1830+ + a11 + a12.a + a13 + a14 + a15 + a16 + a17 + a18.a + a19 + a20.a
1831+ + a21 + a22 + a23 + a24 + a25 + a26.a + a27 + a28.a + a29 + a30
1832+ + a31 + a32;
1833+}
1834+
1835+int
1836+b5 (double a1, int a2, int a3, int a4, int a5, int a6, double a7,
1837+ double a8, double a9)
1838+{
1839+ return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + globv;
1840+}
1841+
1842+int
1843+b6 (double a1, int a2, int a3, int a4, int a5, int a6, double a7,
1844+ double a8, double a9)
1845+{
1846+ return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9;
1847+}
1848+
1849+int
1850+b7 (int a1, int a2)
1851+{
1852+ return a1 + a2 + globv;
1853+}
1854+
1855+int
1856+b8 (int a1, int a2)
1857+{
1858+ return a1 + a2;
1859+}
1860+
1861+int
1862+b9 (int a1, int a2, int a3, int a4, int a5, int a6, int a7)
1863+{
1864+ return a1 + a2 + a3 + a4 + a5 + a6 + a7 + globv;
1865+}
1866+
1867+int
1868+b10 (int a1, int a2, int a3, int a4, int a5, int a6, int a7)
1869+{
1870+ return a1 + a2 + a3 + a4 + a5 + a6 + a7;
1871+}
1872diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38364.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38364.c
1873--- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38364.c 1969-12-31 16:00:00.000000000 -0800
1874+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38364.c 2009-01-30 14:36:22.577619000 -0800
1875@@ -0,0 +1,79 @@
1876+/* PR middle-end/38364 */
1877+/* { dg-do run } */
1878+/* { dg-options "-O2 -ftrapv" } */
1879+
1880+extern void abort (void);
1881+
1882+static inline short
1883+f1 (short x, short y)
1884+{
1885+ if (x > 0)
1886+ {
1887+ if (y > 0)
1888+ {
1889+ if (x > __SHRT_MAX__ / y)
1890+ return x;
1891+ }
1892+ else if (y < (-__SHRT_MAX__ - 1) / x)
1893+ return x;
1894+ }
1895+ else
1896+ {
1897+ if (y > 0)
1898+ {
1899+ if (x < (-__SHRT_MAX__ - 1) / y)
1900+ return x;
1901+ }
1902+ else if (x != 0 && y < __SHRT_MAX__ / x)
1903+ return x;
1904+ }
1905+ return x * y;
1906+}
1907+
1908+static inline signed char
1909+f2 (signed char x, signed char y)
1910+{
1911+ if (((x ^ y) & (((x ^ ((x ^ y) & (1 << (__CHAR_BIT__ - 1)))) - y) ^ y)) < 0)
1912+ return x;
1913+ return x - y;
1914+}
1915+
1916+unsigned int v;
1917+
1918+int
1919+f3 (int x, unsigned int y)
1920+{
1921+ f1 (1, 1);
1922+ return 1;
1923+}
1924+
1925+int
1926+f4 (unsigned short x)
1927+{
1928+ v = x;
1929+ return 1;
1930+}
1931+
1932+int
1933+f5 (int x)
1934+{
1935+ if (f2 (x, 1))
1936+ f1 (1, f4 (1));
1937+ return x;
1938+}
1939+
1940+int
1941+f6 (unsigned int x)
1942+{
1943+ f4 (x < (1 != f5 (0)));
1944+ return x;
1945+}
1946+
1947+int
1948+main (void)
1949+{
1950+ f6 (1);
1951+ if (v != 0)
1952+ abort ();
1953+ return 0;
1954+}
1955diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38615.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38615.c
1956--- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38615.c 1969-12-31 16:00:00.000000000 -0800
1957+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38615.c 2009-01-27 10:45:49.519017000 -0800
1958@@ -0,0 +1,19 @@
1959+/* { dg-do run } */
1960+
1961+int t;
1962+extern void abort (void);
1963+
1964+int f(int t, const int *a)
1965+{
1966+ const int b[] = { 1, 2, 3};
1967+ if (!t)
1968+ return f(1, b);
1969+ return b == a;
1970+}
1971+
1972+int main(void)
1973+{
1974+ if (f(0, 0))
1975+ abort ();
1976+ return 0;
1977+}
1978diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38902.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38902.c
1979--- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38902.c 1969-12-31 16:00:00.000000000 -0800
1980+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38902.c 2009-01-24 07:31:13.971031000 -0800
1981@@ -0,0 +1,131 @@
1982+/* PR target/38902 */
1983+/* { dg-do run } */
1984+/* { dg-options "-O2 -fstack-protector" } */
1985+/* { dg-require-effective-target fstack_protector } */
1986+
1987+#ifdef DEBUG
1988+#include <stdio.h>
1989+#define debug(format, args...) printf (format , ## args)
1990+#else
1991+extern int sprintf (char *, const char *, ...);
1992+#define debug(format, args...)
1993+#endif
1994+
1995+extern void abort (void);
1996+
1997+/*
1998+
1999+Copyright (C) 2009 Canonical, Ltd.
2000+Author: Kees Cook <kees@ubuntu.com>
2001+License: GPLv3
2002+
2003+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38616
2004+https://bugs.launchpad.net/ubuntu/+source/gcc-4.3/+bug/316019
2005+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38902
2006+
2007+gcc -O2 -fstack-protector truncate.c -o truncate
2008+
2009+ Broken:
2010+
2011+ Only the first operation fails, so create a new function for each test.
2012+ Source must be local (literal or stack)
2013+
2014+ __builtin_memmove
2015+ __builtin_memcpy
2016+ __builtin_strcpy (optimized to __builtin_memcpy?)
2017+ sprintf (direct) (optmized to __builtin_strcpy?)
2018+ sprintf (via %s) (optmized to __builtin_strcpy?)
2019+
2020+ OK:
2021+ __builtin_strcat
2022+ sprintf (complex format)
2023+
2024+ */
2025+
2026+char *heap = "1234567890abcdefghijklmnopqrstuvwxyz";
2027+
2028+int failed = 0;
2029+
2030+#define CHECK(count, a...) \
2031+void test##count (void) \
2032+{ \
2033+ char *local = "1234567890abcdefghijklmnopqrstuvwxyz"; \
2034+ char buffer[1024]=""; \
2035+ a; \
2036+ if (__builtin_strcmp(buffer, heap) == 0) { \
2037+ debug("Okay(%d):\n\t%s\n", count, # a); \
2038+ } \
2039+ else { \
2040+ debug("Failed(%d):\n\t%s\n", count, # a); \
2041+ failed++; \
2042+ } \
2043+}
2044+
2045+
2046+CHECK( 0, __builtin_memcpy (buffer, "1234567890abcdefghijklmnopqrstuvwxyz", __builtin_strlen("1234567890abcdefghijklmnopqrstuvwxyz")+1); );
2047+CHECK( 1, __builtin_memcpy (buffer, local, __builtin_strlen(local)+1); );
2048+CHECK( 2, __builtin_memcpy (buffer, heap, __builtin_strlen(heap)+1); );
2049+
2050+CHECK( 3, __builtin_memmove (buffer, "1234567890abcdefghijklmnopqrstuvwxyz", __builtin_strlen("1234567890abcdefghijklmnopqrstuvwxyz")+1); );
2051+CHECK( 4, __builtin_memmove (buffer, local, __builtin_strlen(local)+1); );
2052+CHECK( 5, __builtin_memmove (buffer, heap, __builtin_strlen(heap)+1); );
2053+
2054+CHECK( 6, __builtin_strcpy (buffer, "1234567890abcdefghijklmnopqrstuvwxyz"); );
2055+CHECK( 7, __builtin_strcpy (buffer, local); );
2056+CHECK( 8, __builtin_strcpy (buffer, heap); );
2057+
2058+CHECK( 9, sprintf (buffer, "1234567890abcdefghijklmnopqrstuvwxyz"); );
2059+CHECK(10, sprintf (buffer, local); );
2060+CHECK(11, sprintf (buffer, heap); );
2061+
2062+CHECK(12, sprintf (buffer, "%s", "1234567890abcdefghijklmnopqrstuvwxyz"); );
2063+CHECK(13, sprintf (buffer, "%s", local); );
2064+CHECK(14, sprintf (buffer, "%s", heap); );
2065+
2066+CHECK(15, __builtin_strcat (buffer, "1234567890abcdefghijklmnopqrstuvwxyz"); );
2067+CHECK(16, __builtin_strcat (buffer, local); );
2068+CHECK(17, __builtin_strcat (buffer, heap); );
2069+
2070+void mongoose(void)
2071+{
2072+ char buffer[1024]="";
2073+ sprintf (buffer, "%s", "1234567890abcdefghijklmnopqrstuvwxyz");;
2074+ if (__builtin_strcmp(buffer, heap) == 0) {
2075+ debug("Okay(%d):\n\t%s\n", -1, "sprintf (buffer, \"%s\", \"1234567890abcdefghijklmnopqrstuvwxyz\");");
2076+ }
2077+ else {
2078+ debug("Failed(%d):\n\t%s\n", -1, "sprintf (buffer, \"%s\", \"1234567890abcdefghijklmnopqrstuvwxyz\");");
2079+ failed++;
2080+ }
2081+}
2082+
2083+int main (int argc, char *argv[])
2084+{
2085+ test0();
2086+ test1();
2087+ test2();
2088+ test3();
2089+ test4();
2090+ test5();
2091+ test6();
2092+ test7();
2093+ test8();
2094+ test9();
2095+ test10();
2096+ test11();
2097+
2098+ // wtf, why are these different?!
2099+ test12();
2100+ mongoose();
2101+
2102+ test13();
2103+ test14();
2104+ test15();
2105+ test16();
2106+ test17();
2107+
2108+ if (failed)
2109+ abort ();
2110+
2111+ return 0;
2112+}
2113diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38932.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38932.c
2114--- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38932.c 1969-12-31 16:00:00.000000000 -0800
2115+++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38932.c 2009-01-26 07:54:18.800086000 -0800
2116@@ -0,0 +1,19 @@
2117+/* { dg-do compile } */
2118+/* { dg-options "-O2" } */
2119+
2120+/* This variable needed only to exercise FRE instead of CCP. */
2121+unsigned char g;
2122+
2123+extern void abort();
2124+
2125+void f (long long int p)
2126+{
2127+ g = 255;
2128+ if (p >= (-9223372036854775807LL - 1) - (signed char) g)
2129+ p = 1;
2130+
2131+ if (p)
2132+ abort ();
2133+}
2134+
2135+
2136diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c gcc-4.3.3/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c
2137--- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c 1969-12-31 16:00:00.000000000 -0800
2138+++ gcc-4.3.3/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c 2009-01-30 09:31:24.050790000 -0800
2139@@ -0,0 +1,15 @@
2140+/* { dg-do "compile" } */
2141+/* { dg-options "-O2 -fdump-tree-fre" } */
2142+
2143+struct S { float f; };
2144+int __attribute__((noinline))
2145+foo (float *r, struct S *p)
2146+{
2147+ int *q = (int *)&p->f;
2148+ int i = *q;
2149+ *r = 0.0;
2150+ return i + *q;
2151+}
2152+
2153+/* { dg-final { scan-tree-dump-times "\\\*q" 1 "fre" } } */
2154+/* { dg-final { cleanup-tree-dump "fre" } } */
2155diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38931.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38931.c
2156--- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38931.c 1969-12-31 16:00:00.000000000 -0800
2157+++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38931.c 2009-01-25 04:26:15.714544000 -0800
2158@@ -0,0 +1,23 @@
2159+/* { dg-do compile } */
2160+/* { dg-options "-O2 -msse" } */
2161+
2162+typedef int __m64 __attribute__ ((__vector_size__ (8)));
2163+
2164+extern __m64 foo () ;
2165+
2166+void bar (const int input_bpl, const unsigned char *input,
2167+ unsigned char *output, unsigned long x1)
2168+{
2169+ unsigned char *pix_end_ptr = output + x1 * 4;
2170+ __m64 m_original = { 0, 0 };
2171+ __m64 m_base_addr = __builtin_ia32_vec_init_v2si (0, input_bpl);
2172+ __m64 m_addr = __builtin_ia32_paddd (m_original, m_base_addr);
2173+ __m64 *a0 = (__m64 *) input;
2174+
2175+ for (; output < pix_end_ptr; output += 4)
2176+ {
2177+ a0 = (__m64 *) (input + __builtin_ia32_vec_ext_v2si (m_addr, 0));
2178+ m_addr = foo ();
2179+ __builtin_prefetch (a0, 0);
2180+ }
2181+}
2182diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38988.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38988.c
2183--- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38988.c 1969-12-31 16:00:00.000000000 -0800
2184+++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38988.c 2009-01-29 02:05:17.651873000 -0800
2185@@ -0,0 +1,24 @@
2186+/* { dg-do compile } */
2187+/* { dg-require-effective-target lp64 } */
2188+/* { dg-require-effective-target fpic } */
2189+/* { dg-options "-O2 -fpic -mcmodel=large" } */
2190+
2191+typedef long unsigned int size_t;
2192+typedef void (*func_ptr) (void);
2193+
2194+static func_ptr __DTOR_LIST__[1] = { (func_ptr) (-1) };
2195+
2196+void
2197+__do_global_dtors_aux (void)
2198+{
2199+ extern func_ptr __DTOR_END__[];
2200+ size_t dtor_idx = 0;
2201+ const size_t max_idx = __DTOR_END__ - __DTOR_LIST__ - 1;
2202+ func_ptr f;
2203+
2204+ while (dtor_idx < max_idx)
2205+ {
2206+ f = __DTOR_LIST__[++dtor_idx];
2207+ f ();
2208+ }
2209+}
2210diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/other/pr38706.C gcc-4.3.3/gcc/testsuite/g++.dg/other/pr38706.C
2211--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/other/pr38706.C 1969-12-31 16:00:00.000000000 -0800
2212+++ gcc-4.3.3/gcc/testsuite/g++.dg/other/pr38706.C 2009-01-27 03:39:42.241832000 -0800
2213@@ -0,0 +1,19 @@
2214+// PR target/38706
2215+// { dg-do compile }
2216+// { dg-options "-O2" }
2217+
2218+class ios_base
2219+{
2220+public:
2221+ virtual ~ios_base ();
2222+
2223+};
2224+
2225+class istrstream:virtual public ios_base
2226+{
2227+public:
2228+ virtual ~istrstream ();
2229+
2230+};
2231+
2232+istrstream::~istrstream () {}
2233diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor14.C gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor14.C
2234--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor14.C 1969-12-31 16:00:00.000000000 -0800
2235+++ gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor14.C 2009-02-02 11:57:29.682708000 -0800
2236@@ -0,0 +1,8 @@
2237+// PR c++/39054
2238+
2239+struct A {};
2240+
2241+template<typename> void foo()
2242+{
2243+ A().~int(); // { dg-error "expected" }
2244+}
2245diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dtor5.C gcc-4.3.3/gcc/testsuite/g++.dg/template/dtor5.C
2246--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dtor5.C 1969-12-31 16:00:00.000000000 -0800
2247+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/dtor5.C 2009-01-26 10:24:45.754928000 -0800
2248@@ -0,0 +1,21 @@
2249+// PR c++/23287
2250+
2251+template <class T> struct A
2252+{
2253+ int i;
2254+ ~A();
2255+};
2256+
2257+template <class T> void f(A<T> *ap) {
2258+ ap->~A();
2259+}
2260+
2261+template <class T> void g(A<T> *ap) {
2262+ ap->~B(); // { dg-error "destructor name" }
2263+}
2264+
2265+int main()
2266+{
2267+ f(new A<int>);
2268+ g(new A<int>);
2269+}
2270diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/func2.C gcc-4.3.3/gcc/testsuite/g++.dg/template/func2.C
2271--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/func2.C 1969-12-31 16:00:00.000000000 -0800
2272+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/func2.C 2009-02-03 07:56:05.128711000 -0800
2273@@ -0,0 +1,12 @@
2274+// { dg-do compile }
2275+
2276+typedef void (*fptr)();
2277+fptr zeroptr = 0;
2278+template<typename T, fptr F> struct foo { };
2279+template<typename T> struct foo<T,zeroptr> { };
2280+// { dg-error "not a valid template argument" "not valid" { target *-*-* } 6 }
2281+// { dg-error "must be the address" "must be the address " { target *-*-* } 6 }
2282+
2283+// The rest is needed to trigger the ICE in 4.0 to 4.3:
2284+void f() { }
2285+foo<int,&f> m_foo;
2286diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename15.C gcc-4.3.3/gcc/testsuite/g++.dg/template/typename15.C
2287--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename15.C 1969-12-31 16:00:00.000000000 -0800
2288+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/typename15.C 2009-02-03 07:56:05.128711000 -0800
2289@@ -0,0 +1,12 @@
2290+// PR37314 ice-on-valid-code, from w.doeringer
2291+template <typename T>
2292+class Cdeque {
2293+ typedef T *pointer;
2294+ class iterator {
2295+ typedef typename Cdeque<T>::pointer pointer;
2296+ pointer operator->();
2297+ };
2298+};
2299+template <typename T> T* Cdeque<T>::iterator::operator->() { }
2300+
2301+
2302diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename16.C gcc-4.3.3/gcc/testsuite/g++.dg/template/typename16.C
2303--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename16.C 1969-12-31 16:00:00.000000000 -0800
2304+++ gcc-4.3.3/gcc/testsuite/g++.dg/template/typename16.C 2009-02-03 07:56:05.128711000 -0800
2305@@ -0,0 +1,25 @@
2306+// PR37314 rejects-valid, from w.doeringer
2307+template <typename T>
2308+struct A {
2309+ typedef __PTRDIFF_TYPE__ difference_type;
2310+ struct B {
2311+ typedef typename A<T>::difference_type difference_type;
2312+ difference_type operator-(B const&) const;
2313+ T t;
2314+ };
2315+};
2316+//
2317+
2318+template <typename T>
2319+typename A<T>::B::difference_type A<T>::B::operator-(B const&) const {
2320+ return -1;
2321+}
2322+
2323+//
2324+int main() {
2325+ A<int>::B i;
2326+ ++i.t;
2327+ return 0;
2328+}
2329+
2330+
2331diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/torture/pr38745.C gcc-4.3.3/gcc/testsuite/g++.dg/torture/pr38745.C
2332--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/torture/pr38745.C 1969-12-31 16:00:00.000000000 -0800
2333+++ gcc-4.3.3/gcc/testsuite/g++.dg/torture/pr38745.C 2009-01-30 09:31:24.050790000 -0800
2334@@ -0,0 +1,36 @@
2335+/* { dg-do compile } */
2336+
2337+union u_u16
2338+{
2339+ unsigned short v;
2340+ struct
2341+ {
2342+ unsigned char lo8, hi8;
2343+ } __attribute__ ((__may_alias__)) u;
2344+} __attribute__ ((__may_alias__));
2345+union u_u32
2346+{
2347+ unsigned int v;
2348+ struct
2349+ {
2350+ u_u16 lo16, hi16;
2351+ } u;
2352+} __attribute__ ((__may_alias__));
2353+union u_u64
2354+{
2355+ struct
2356+ {
2357+ u_u32 lo32, hi32;
2358+ } u;
2359+};
2360+struct Record
2361+{
2362+};
2363+long long
2364+UnpackFullKey (Record & rec, const char *&p)
2365+{
2366+ long long c64 = 0;
2367+ (*(u_u16 *) & (*(u_u32 *) & ( *(u_u64*)&c64).u.lo32.v).u.lo16.v).u.hi8 = 1;
2368+ return c64;
2369+}
2370+
2371diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C
2372--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C 1969-12-31 16:00:00.000000000 -0800
2373+++ gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C 2009-01-30 09:31:24.050790000 -0800
2374@@ -0,0 +1,29 @@
2375+/* { dg-do compile } */
2376+/* { dg-options "-O2 -Wstrict-aliasing" } */
2377+
2378+inline void *operator new (__SIZE_TYPE__, void *__p) throw() { return __p; }
2379+
2380+struct Y {
2381+ Y() {}
2382+ int i;
2383+};
2384+
2385+struct X {
2386+ X() {}
2387+ void construct(const Y& y)
2388+ {
2389+ new (&m_data[0]) Y(y);
2390+ }
2391+ bool initialized;
2392+ char m_data[sizeof (Y)];
2393+};
2394+
2395+void bar(const X&);
2396+void foo(Y& y)
2397+{
2398+ X x;
2399+ x.construct(y);
2400+ x.initialized = true;
2401+ bar(x);
2402+}
2403+
2404diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C
2405--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C 1969-12-31 16:00:00.000000000 -0800
2406+++ gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C 2009-01-30 09:31:24.050790000 -0800
2407@@ -0,0 +1,15 @@
2408+/* { dg-options "-O2 -Wuninitialized" } */
2409+
2410+struct Empty { Empty() {} }; /* { dg-bogus "uninitialized" } */
2411+struct Other {
2412+ Other(const Empty& e_) : e(e_) {}
2413+ Empty e;
2414+};
2415+void bar(Other&);
2416+void foo()
2417+{
2418+ Empty e;
2419+ Other o(e);
2420+ bar(o);
2421+}
2422+
2423diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C
2424--- gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C 1969-12-31 16:00:00.000000000 -0800
2425+++ gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C 2009-01-29 09:43:14.166860000 -0800
2426@@ -0,0 +1,53 @@
2427+/* { dg-do compile } */
2428+/* { dg-options "-O -Wuninitialized" } */
2429+
2430+struct S8 { template<typename T> S8(T) { } };
2431+
2432+template<typename T> struct S10;
2433+template<typename T> struct S10<T()> { typedef T S12; typedef S8 S1(); };
2434+
2435+template<typename T> struct S3 { };
2436+template<typename T> struct S11 { S11(S3<T>); };
2437+
2438+struct S2
2439+{
2440+ template<typename T> operator S11<T>() { return S11<T>(S5<T>()); }
2441+ template<typename T> struct S5:public S3<T>
2442+ {
2443+ virtual typename S10<T>::S12 S13() {
2444+ return 0;
2445+ }
2446+ };
2447+};
2448+
2449+template<typename T> S11<T> S6(S3<T>) { return S11<T>(S3<T>()); }
2450+template<typename S12> struct S7 { typedef S12 S15(); };
2451+
2452+struct S4
2453+{
2454+ template<typename T> operator S11<T>()
2455+ {
2456+ struct S14:public S3<T>
2457+ {
2458+ S14(S2 x):S11_(x) { }
2459+ S11<typename S7<typename S10<T>::S12>::S15> S11_;
2460+ };
2461+ return S6(S14(S11_));
2462+ }
2463+ S2 S11_;
2464+};
2465+
2466+struct S9
2467+{
2468+ template<typename F> operator S11<F>() { return S11<F>(S14<F>(S11_)); }
2469+ template<typename F> struct S14:public S3<F>
2470+ {
2471+ S14(S4 x):S11_(x) { }
2472+ S11<typename S10<F>::S1> S11_;
2473+ };
2474+ S4 S11_;
2475+};
2476+
2477+void S15(S11<void()>);
2478+void S16() { S9 x; S15(x); }
2479+
2480diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bounds_5.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/bounds_5.f90
2481--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bounds_5.f90 1969-12-31 16:00:00.000000000 -0800
2482+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/bounds_5.f90 2009-01-25 21:43:44.109708000 -0800
2483@@ -0,0 +1,26 @@
2484+! { dg-do run }
2485+!
2486+! PR fortran/38859
2487+! Wrong bounds simplification
2488+!
2489+! Contributed by Dick Hendrickson <dick.hendrickson@gmail.com>
2490+
2491+ type x
2492+ integer I
2493+ end type x
2494+ type (x) A(0:5, 2:8)
2495+ integer ida(2)
2496+
2497+ ida = lbound(a)
2498+ if (any(ida /= (/0,2/))) call abort
2499+
2500+ ida = lbound(a%i)
2501+ if (any(ida /= (/1,1/))) call abort
2502+
2503+ ida = ubound(a)
2504+ if (any(ida /= (/5,8/))) call abort
2505+
2506+ ida = ubound(a%i)
2507+ if (any(ida /= (/6,7/))) call abort
2508+
2509+ end
2510diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90
2511--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90 1969-12-31 16:00:00.000000000 -0800
2512+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90 2009-01-24 13:49:28.036442000 -0800
2513@@ -0,0 +1,11 @@
2514+! { dg-do compile }
2515+! PR 38672 - this used to ICE.
2516+MODULE globals
2517+ TYPE :: type1
2518+ integer :: x
2519+ END TYPE type1
2520+ TYPE (type1) :: pdm_bps
2521+END module globals
2522+BLOCK DATA
2523+ use globals
2524+END BLOCK DATA
2525diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90
2526--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90 1969-12-31 16:00:00.000000000 -0800
2527+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90 2009-01-24 13:49:28.036442000 -0800
2528@@ -0,0 +1,17 @@
2529+! { dg-do compile }
2530+MODULE globals
2531+ TYPE :: type1
2532+ sequence
2533+ integer :: x
2534+ END TYPE type1
2535+ TYPE (type1) :: pdm_bps
2536+ common /co/ pdm_bps
2537+END module globals
2538+BLOCK DATA
2539+ use globals
2540+END BLOCK DATA
2541+
2542+program main
2543+ use globals
2544+ common /co/ pdm_bps ! { dg-error "already in a COMMON block" }
2545+end program main
2546diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90
2547--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90 1969-12-31 16:00:00.000000000 -0800
2548+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90 2009-01-25 22:15:41.225652000 -0800
2549@@ -0,0 +1,41 @@
2550+! { dg-do run }
2551+! Tests the fix for PR38907, in which any expressions, including unary plus,
2552+! in front of the call to S_REAL_SUM_I (marked) would throw the mechanism
2553+! for correcting invalid host association.
2554+!
2555+! Contributed by Dick Hendrickson <dick.hendrickson@gmail.com>
2556+!
2557+module sa0054_stuff
2558+ REAL :: S_REAL_SUM_2(10) = [(REAL (I), I = 1, 10)]
2559+contains
2560+ ELEMENTAL FUNCTION S_REAL_SUM_I (A)
2561+ REAL :: S_REAL_SUM_I
2562+ REAL, INTENT(IN) :: A
2563+ X = 1.0
2564+ S_REAL_SUM_I = X
2565+ END FUNCTION S_REAL_SUM_I
2566+ SUBROUTINE SA0054 (RDA)
2567+ REAL RDA(:)
2568+ RDA = + S_REAL_SUM_I (RDA) ! Reported problem => ICE
2569+ RDA = RDA + S_REAL_SUM_2 (INT (RDA)) ! Also failed
2570+ CONTAINS
2571+ ELEMENTAL FUNCTION S_REAL_SUM_I (A)
2572+ REAL :: S_REAL_SUM_I
2573+ REAL, INTENT(IN) :: A
2574+ S_REAL_SUM_I = 2.0 * A
2575+ END FUNCTION S_REAL_SUM_I
2576+ ELEMENTAL FUNCTION S_REAL_SUM_2 (A)
2577+ REAL :: S_REAL_SUM_2
2578+ INTEGER, INTENT(IN) :: A
2579+ S_REAL_SUM_2 = 2.0 * A
2580+ END FUNCTION S_REAL_SUM_2
2581+ END SUBROUTINE
2582+end module sa0054_stuff
2583+
2584+ use sa0054_stuff
2585+ REAL :: RDA(10) = [(REAL(I), I = 1, 10)]
2586+ call SA0054 (RDA)
2587+ IF (ANY (INT (RDA) .ne. [(6 * I, I = 1, 10)])) print *, rda
2588+END
2589+
2590+! { dg-final { cleanup-modules "sa0054_stuff" } }
2591diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/module_commons_3.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/module_commons_3.f90
2592--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/module_commons_3.f90 1969-12-31 16:00:00.000000000 -0800
2593+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/module_commons_3.f90 2009-01-25 21:12:03.141287000 -0800
2594@@ -0,0 +1,57 @@
2595+! { dg-do run }
2596+!
2597+! PR fortran/38657, in which the mixture of PRIVATE and
2598+! COMMON in TEST4, would mess up the association with
2599+! TESTCHAR in TEST2.
2600+!
2601+! Contributed by Paul Thomas <pault@gcc.gnu.org>
2602+! From a report in clf by Chris Bradley.
2603+!
2604+MODULE TEST4
2605+ PRIVATE
2606+ CHARACTER(LEN=80) :: T1 = &
2607+ "Mary had a little lamb, Its fleece was white as snow;"
2608+ CHARACTER(LEN=80) :: T2 = &
2609+ "And everywhere that Mary went, The lamb was sure to go."
2610+ CHARACTER(LEN=80) :: TESTCHAR
2611+ COMMON /TESTCOMMON1/ TESTCHAR
2612+ PUBLIC T1, T2, FOOBAR
2613+CONTAINS
2614+ subroutine FOOBAR (CHECK)
2615+ CHARACTER(LEN=80) :: CHECK
2616+ IF (TESTCHAR .NE. CHECK) CALL ABORT
2617+ end subroutine
2618+END MODULE TEST4
2619+
2620+MODULE TEST3
2621+ CHARACTER(LEN=80) :: TESTCHAR
2622+ COMMON /TESTCOMMON1/ TESTCHAR
2623+END MODULE TEST3
2624+
2625+MODULE TEST2
2626+ use TEST4
2627+ USE TEST3, chr => testchar
2628+ PRIVATE
2629+ CHARACTER(LEN=80) :: TESTCHAR
2630+ COMMON /TESTCOMMON1/ TESTCHAR
2631+ PUBLIC TESTCHAR, FOO, BAR, CHR, T1, T2, FOOBAR
2632+contains
2633+ subroutine FOO
2634+ TESTCHAR = T1
2635+ end subroutine
2636+ subroutine BAR (CHECK)
2637+ CHARACTER(LEN=80) :: CHECK
2638+ IF (TESTCHAR .NE. CHECK) CALL ABORT
2639+ IF (CHR .NE. CHECK) CALL ABORT
2640+ end subroutine
2641+END MODULE TEST2
2642+
2643+PROGRAM TEST1
2644+ USE TEST2
2645+ call FOO
2646+ call BAR (T1)
2647+ TESTCHAR = T2
2648+ call BAR (T2)
2649+ CALL FOOBAR (T2)
2650+END PROGRAM TEST1
2651+! { dg-final { cleanup-modules "TEST2 TEST3 TEST4" } }
2652diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_5.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_5.f90
2653--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_5.f90 1969-12-31 16:00:00.000000000 -0800
2654+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_5.f90 2009-01-29 09:43:14.166860000 -0800
2655@@ -0,0 +1,17 @@
2656+! { dg-do run }
2657+
2658+! PR fortran/38887
2659+! This aborted at runtime for the runtime zero-sized array arguments.
2660+
2661+! Contributed by Dick Hendrickson <dick.hendrickson@gmail.com>
2662+
2663+program try_ya0013
2664+ integer ida(9)
2665+ call ya0013(ida,1,5,6)
2666+end program
2667+
2668+SUBROUTINE YA0013(IDA,nf1,nf5,nf6)
2669+ INTEGER IDA(9)
2670+ IDA = 1
2671+ CALL MVBITS(IDA(NF5:NF1), 0, 1, IDA(NF6:NF1),2)
2672+END SUBROUTINE
2673diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_6.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_6.f90
2674--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_6.f90 1969-12-31 16:00:00.000000000 -0800
2675+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_6.f90 2009-01-29 09:43:14.166860000 -0800
2676@@ -0,0 +1,33 @@
2677+! { dg-do compile }
2678+
2679+! PR fortran/38883
2680+! This ICE'd because the temporary-creation in the MVBITS call was wrong.
2681+! This is the original test from the PR, the complicated version.
2682+
2683+! Contributed by Dick Hendrickson <dick.hendrickson@gmail.com>
2684+
2685+ module yg0009_stuff
2686+
2687+ type unseq
2688+ integer I
2689+ end type
2690+
2691+ contains
2692+
2693+ SUBROUTINE YG0009(TDA2L,NF4,NF3,NF1,MF1,MF4,MF3)
2694+ TYPE(UNSEQ) TDA2L(NF4,NF3)
2695+
2696+ CALL MVBITS (TDA2L(NF4:NF1:MF1,NF1:NF3)%I,2, &
2697+ 4, TDA2L(-MF4:-MF1:-NF1,-MF1:-MF3)%I, 3)
2698+
2699+ END SUBROUTINE
2700+
2701+ end module yg0009_stuff
2702+
2703+ program try_yg0009
2704+ use yg0009_stuff
2705+ type(unseq) tda2l(4,3)
2706+
2707+ call yg0009(tda2l,4,3,1,-1,-4,-3)
2708+
2709+ end
2710diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_7.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_7.f90
2711--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_7.f90 1969-12-31 16:00:00.000000000 -0800
2712+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_7.f90 2009-01-29 09:43:14.166860000 -0800
2713@@ -0,0 +1,30 @@
2714+! { dg-do run }
2715+
2716+! PR fortran/38883
2717+! This ICE'd because the temporary-creation in the MVBITS call was wrong.
2718+
2719+! Contributed by Paul Richard Thomas <paul.richard.thomas@gmail.com>
2720+
2721+ type t
2722+ integer :: I
2723+ character(9) :: chr
2724+ end type
2725+ type(t) :: x(4,3)
2726+ type(t) :: y(4,3)
2727+ x = reshape ([((t (i*j, "a"),i = 1,4), j=1,3)], [4,3])
2728+ call foo (x)
2729+ y = reshape ([((t (i*j*2, "a"),i = 1,4), j=1,3)], [4,3])
2730+ call bar(y, 4, 3, 1, -1, -4, -3)
2731+ if (any (x%i .ne. y%i)) call abort
2732+contains
2733+ SUBROUTINE foo (x)
2734+ TYPE(t) x(4, 3) ! No dependency at all
2735+ CALL MVBITS (x%i, 0, 6, x%i, 8)
2736+ x%i = x%i * 2
2737+ END SUBROUTINE
2738+ SUBROUTINE bar (x, NF4, NF3, NF1, MF1, MF4, MF3)
2739+ TYPE(t) x(NF4, NF3) ! Dependency through variable indices
2740+ CALL MVBITS (x(NF4:NF1:MF1, NF1:NF3)%i, 1, &
2741+ 6, x(-MF4:-MF1:-NF1, -MF1:-MF3)%i, 9)
2742+ END SUBROUTINE
2743+end
2744diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_8.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_8.f90
2745--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_8.f90 1969-12-31 16:00:00.000000000 -0800
2746+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_8.f90 2009-01-29 09:43:14.166860000 -0800
2747@@ -0,0 +1,36 @@
2748+! { dg-do run }
2749+
2750+! PR fortran/38883
2751+! This ICE'd because the temporary-creation in the MVBITS call was wrong.
2752+
2753+PROGRAM main
2754+ IMPLICIT NONE
2755+
2756+ TYPE inner
2757+ INTEGER :: i
2758+ INTEGER :: j
2759+ END TYPE inner
2760+
2761+ TYPE outer
2762+ TYPE(inner) :: comp(2)
2763+ END TYPE outer
2764+
2765+ TYPE(outer) :: var
2766+
2767+ var%comp%i = (/ 1, 2 /)
2768+ var%comp%j = (/ 3, 4 /)
2769+
2770+ CALL foobar (var, 1, 2)
2771+
2772+ IF (ANY (var%comp%i /= (/ 1, 2 /))) CALL abort ()
2773+ IF (ANY (var%comp%j /= (/ 3, 4 /))) CALL abort ()
2774+
2775+CONTAINS
2776+
2777+ SUBROUTINE foobar (x, lower, upper)
2778+ TYPE(outer), INTENT(INOUT) :: x
2779+ INTEGER, INTENT(IN) :: lower, upper
2780+ CALL MVBITS (x%comp%i, 1, 2, x%comp(lower:upper)%i, 1)
2781+ END SUBROUTINE foobar
2782+
2783+END PROGRAM main
2784diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/pr38868.f gcc-4.3.3/gcc/testsuite/gfortran.dg/pr38868.f
2785--- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/pr38868.f 1969-12-31 16:00:00.000000000 -0800
2786+++ gcc-4.3.3/gcc/testsuite/gfortran.dg/pr38868.f 2009-01-24 07:26:14.936448000 -0800
2787@@ -0,0 +1,17 @@
2788+! { dg-do compile }
2789+! { dg-options "-O2 -fdump-rtl-expand" }
2790+ PROGRAM testcase
2791+ IMPLICIT NONE
2792+
2793+ CHARACTER*4 ANER(18)
2794+ CHARACTER*80 LINE
2795+ aner = ''
2796+ ANER(1)='A '
2797+ ANER(2)=' '
2798+ LINE=' '
2799+ LINE(78:80)='xyz'
2800+ WRITE(*,'(A82)') "'"//LINE//"'"
2801+ END
2802+
2803+! { dg-final { scan-rtl-dump-times "line\\\+80" 0 "expand" } }
2804+! { dg-final { cleanup-rtl-dump "expand" } } */
2805diff -Naur gcc-4.3.3.orig/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp gcc-4.3.3/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp
2806--- gcc-4.3.3.orig/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp 2007-08-01 09:25:11.000000000 -0700
2807+++ gcc-4.3.3/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp 2009-01-26 10:13:58.227740000 -0800
2808@@ -37,8 +37,20 @@
2809 set generator_src "$generator_src $srcdir/$subdir/generate-random.c"
2810 set generator_src "$generator_src $srcdir/$subdir/generate-random_r.c"
2811 set generator_cmd "-o $generator $generator_src"
2812+# Temporarily unset GCC_EXEC_PREFIX from environment, as that might
2813+# confuse the $HOSTCC.
2814+set orig_gcc_exec_prefix_saved 0
2815+if [info exists env(GCC_EXEC_PREFIX)] {
2816+ set orig_gcc_exec_prefix "$env(GCC_EXEC_PREFIX)"
2817+ set orig_gcc_exec_prefix_saved 1
2818+ unsetenv GCC_EXEC_PREFIX
2819+}
2820 set status [remote_exec host "$HOSTCC $HOSTCFLAGS $generator_cmd"]
2821 set status [lindex $status 0]
2822+if { $orig_gcc_exec_prefix_saved } {
2823+ set orig_gcc_exec_prefix_saved 0
2824+ setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix"
2825+}
2826 if { $status == 0 } then {
2827 file delete -force $tstobjdir
2828 file mkdir $tstobjdir
2829diff -Naur gcc-4.3.3.orig/gcc/tree.h gcc-4.3.3/gcc/tree.h
2830--- gcc-4.3.3.orig/gcc/tree.h 2008-02-08 11:10:25.000000000 -0800
2831+++ gcc-4.3.3/gcc/tree.h 2009-01-26 07:54:18.800086000 -0800
2832@@ -4753,6 +4753,7 @@
2833
2834 extern tree fold (tree);
2835 extern tree fold_unary (enum tree_code, tree, tree);
2836+extern tree fold_unary_ignore_overflow (enum tree_code, tree, tree);
2837 extern tree fold_binary (enum tree_code, tree, tree, tree);
2838 extern tree fold_ternary (enum tree_code, tree, tree, tree, tree);
2839 extern tree fold_build1_stat (enum tree_code, tree, tree MEM_STAT_DECL);
2840diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-ccp.c gcc-4.3.3/gcc/tree-ssa-ccp.c
2841--- gcc-4.3.3.orig/gcc/tree-ssa-ccp.c 2008-05-11 11:54:15.000000000 -0700
2842+++ gcc-4.3.3/gcc/tree-ssa-ccp.c 2009-01-26 07:54:18.800086000 -0800
2843@@ -938,7 +938,7 @@
2844 if ((code == NOP_EXPR || code == CONVERT_EXPR)
2845 && useless_type_conversion_p (TREE_TYPE (rhs), TREE_TYPE (op0)))
2846 return op0;
2847- return fold_unary (code, TREE_TYPE (rhs), op0);
2848+ return fold_unary_ignore_overflow (code, TREE_TYPE (rhs), op0);
2849 }
2850
2851 /* Binary and comparison operators. We know one or both of the
2852diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-forwprop.c gcc-4.3.3/gcc/tree-ssa-forwprop.c
2853--- gcc-4.3.3.orig/gcc/tree-ssa-forwprop.c 2008-03-14 09:34:11.000000000 -0700
2854+++ gcc-4.3.3/gcc/tree-ssa-forwprop.c 2009-01-30 14:14:39.201534000 -0800
2855@@ -677,6 +677,7 @@
2856 array elements, then the result is converted into the proper
2857 type for the arithmetic. */
2858 if (TREE_CODE (TREE_OPERAND (rhs, 1)) == SSA_NAME
2859+ && useless_type_conversion_p (TREE_TYPE (name), TREE_TYPE (def_rhs))
2860 /* Avoid problems with IVopts creating PLUS_EXPRs with a
2861 different type than their operands. */
2862 && useless_type_conversion_p (TREE_TYPE (rhs), TREE_TYPE (name)))
2863diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-sccvn.c gcc-4.3.3/gcc/tree-ssa-sccvn.c
2864--- gcc-4.3.3.orig/gcc/tree-ssa-sccvn.c 2008-07-11 13:55:45.000000000 -0700
2865+++ gcc-4.3.3/gcc/tree-ssa-sccvn.c 2009-01-26 07:54:18.800086000 -0800
2866@@ -1507,7 +1507,7 @@
2867 if (op0 == TREE_OPERAND (rhs, 0))
2868 return rhs;
2869
2870- result = fold_unary (TREE_CODE (rhs), TREE_TYPE (rhs), op0);
2871+ result = fold_unary_ignore_overflow (TREE_CODE (rhs), TREE_TYPE (rhs), op0);
2872 if (result)
2873 {
2874 STRIP_USELESS_TYPE_CONVERSION (result);
2875diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/cp-tools.info gcc-4.3.3/libjava/classpath/doc/cp-tools.info
2876--- gcc-4.3.3.orig/libjava/classpath/doc/cp-tools.info 2009-01-24 04:05:54.000000000 -0800
2877+++ gcc-4.3.3/libjava/classpath/doc/cp-tools.info 1969-12-31 16:00:00.000000000 -0800
2878@@ -1,1852 +0,0 @@
2879-This is cp-tools.info, produced by makeinfo version 4.12 from
2880-/abuild/rguenther/tmp/gcc-4.3.3/gcc-4.3.3/libjava/classpath/doc/cp-tools.texinfo.
2881-
2882-This file documents the Tools included in a standard distribution of
2883-the GNU Classpath project deliverables.
2884-
2885- Copyright (C) 2006, 2007 Free Software Foundation, Inc.
2886-
2887-INFO-DIR-SECTION GNU Libraries
2888-START-INFO-DIR-ENTRY
2889-* Classpath Tools: (cp-tools). GNU Classpath Tools Guide
2890-END-INFO-DIR-ENTRY
2891-
2892-
2893-File: cp-tools.info, Node: Top, Next: Applet Tools, Prev: (dir), Up: (dir)
2894-
2895-GNU Classpath Tools Guide
2896-*************************
2897-
2898-This document contains important information you need to know in order
2899-to use the tools included in the GNU Classpath project deliverables.
2900-
2901- The Tools aim at providing a free replacement, similar in their
2902-behavior, to their counter-parts found in the Reference Implementation
2903-(RI) of the Java Software Development Kit (SDK).
2904-
2905-* Menu:
2906-
2907-* Applet Tools:: Work with applets
2908-* Security Tools:: Work securely with Java applications
2909-* Other Tools:: Other tools in classpath
2910-* I18N Issues:: How to add support for non-English languages
2911-
2912- --- The Detailed Node Listing ---
2913-
2914-Applet Tools
2915-
2916-* appletviewer Tool:: Load applets
2917-* gcjwebplugin:: Load applets in a web browser
2918-
2919-Security Tools
2920-
2921-* jarsigner Tool:: Sign and verify .JAR files
2922-* keytool Tool:: Manage private keys and public certificates
2923-
2924-jarsigner Tool
2925-
2926-* Common jarsigner Options:: Options used when signing or verifying a file
2927-* Signing Options:: Options only used when signing a .JAR file
2928-* Verification Options:: Options only used when verifying a .JAR file
2929-
2930-keytool Tool
2931-
2932-* Getting Help:: How to get help with keytool commands
2933-* Common keytool Options:: Options used in more than one command
2934-* Distinguished Names:: X.500 Distinguished Names used in certificates
2935-* Add/Update Commands:: Commands for adding data to a Key Store
2936-* Export Commands:: Commands for exporting data from a Key Store
2937-* Display Commands:: Commands for displaying data in a Key Store
2938-* Management Commands:: Commands for managing a Key Store
2939-
2940-Add/Update Commands
2941-
2942-* Command -genkey:: Generate private key and self-signed certificate
2943-* Command -import:: Import certificates and certificate replies
2944-* Command -selfcert:: Generate self-signed certificate
2945-* Command -cacert:: Import a CA Trusted Certificate
2946-* Command -identitydb:: Import JDK-1 style identities
2947-
2948-Export Commands
2949-
2950-* Command -certreq:: Generate Certificate Signing Requests (CSR)
2951-* Command -export:: Export a certificate in a Key Store
2952-
2953-Display Commands
2954-
2955-* Command -list:: Display information about one or all Aliases
2956-* Command -printcert:: Print a certificate or a certificate fingerprint
2957-
2958-Management Commands
2959-
2960-* Command -keyclone:: Clone a Key Entry in a Key Store
2961-* Command -storepasswd:: Change the password protecting a Key Store
2962-* Command -keypasswd:: Change the password protecting a Key Entry
2963-* Command -delete:: Remove an entry in a Key Store
2964-
2965-Other Tools
2966-
2967-* jar Tool:: Archive tool for Java archives
2968-* javah Tool:: A java header compiler
2969-* gcjh Tool:: A java header compiler (old version)
2970-* native2ascii Tool:: An encoding converter
2971-* orbd Tool:: An object request broker daemon
2972-* serialver Tool:: A serial version command
2973-* rmid Tool:: RMI activation daemon
2974-* rmiregistry Tool:: Remote object registry
2975-* tnameserv Tool:: Naming service
2976-
2977-I18N Issues
2978-
2979-* Language Resources:: Where resources are located
2980-* Message Formats:: How messages are internationalized
2981-
2982-
2983-File: cp-tools.info, Node: Applet Tools, Next: Security Tools, Prev: Top, Up: Top
2984-
2985-1 Applet Tools
2986-**************
2987-
2988-Two Applet Tools are available with GNU Classpath: appletviewer and
2989-gcjwebplugin.
2990-
2991- To avoid conflicts with other implementations, the appletviewer
2992-executable is called "gappletviewer".
2993-
2994-* Menu:
2995-
2996-* appletviewer Tool:: Load applets
2997-* gcjwebplugin:: Load applets in a web browser
2998-
2999- If while using these tools you think you found a bug, then please
3000-report it at classpath-bugs
3001-(http://www.gnu.org/software/classpath/bugs.html).
3002-
3003-
3004-File: cp-tools.info, Node: appletviewer Tool, Next: gcjwebplugin, Prev: Applet Tools, Up: Applet Tools
3005-
3006-1.1 The `appletviewer' Tool
3007-===========================
3008-
3009-SYNOPSIS
3010-
3011- appletviewer [OPTION]... URL...
3012-appletviewer [OPTION]... `-code' CODE
3013-appletviewer [OPTION]... `-plugin' INPUT,OUTPUT
3014-
3015- DESCRIPTION The `appletviewer' tool loads and runs an applet.
3016-
3017- Use the first form to test applets specified by tag. The URL should
3018-resolve to an HTML document from which the `appletviewer' will extract
3019-applet tags. The APPLET, EMBED and OBJECT tags are supported. If a
3020-given document contains multiple applet tags, all the applets will be
3021-loaded, with each applet appearing in its own window. Likewise, when
3022-multiple URLs are specified, each applet tag instance is given its own
3023-window. If a given document contains no recognized tags the
3024-`appletviewer' does nothing.
3025-
3026- appletviewer http://www.gnu.org/software/classpath/
3027-
3028- Use the second form to test an applet in development. This form
3029-allows applet tag attributes to be supplied on the command line. Only
3030-one applet may be specified using the `-code' option. The `-code'
3031-option overrides the URL form - any URLs specified will be ignored.
3032-
3033- appletviewer -code Test.class -param datafile,data.txt
3034-
3035- `gcjwebplugin' uses the third form to communicate with the
3036-`appletviewer' through named pipes.
3037-
3038- URL OPTIONS
3039-`-debug'
3040- This option is not yet implemented but is provided for
3041- compatibility.
3042-
3043-`-encoding CHARSET'
3044- Use this option to specify an alternate character encoding for the
3045- specified HTML page.
3046-
3047-
3048- APPLET TAG OPTIONS
3049-`-code CODE'
3050- Use the `-code' option to specify the value of the applet tag CODE
3051- attribute.
3052-
3053-`-codebase CODEBASE'
3054- Use the `-codebase' option to specify the value of the applet tag
3055- CODEBASE attribute.
3056-
3057-`-archive ARCHIVE'
3058- Use the `-archive' option to specify the value of the applet tag
3059- ARCHIVE attribute.
3060-
3061-`-width WIDTH'
3062- Use the `-width' option to specify the value of the applet tag
3063- WIDTH attribute.
3064-
3065-`-height HEIGHT'
3066- Use the `-height' option to specify the value of the applet tag
3067- HEIGHT attribute.
3068-
3069-`-param NAME,VALUE'
3070- Use the `-param' option to specify values for the NAME and VALUE
3071- attributes of an applet PARAM tag.
3072-
3073-
3074- PLUGIN OPTION
3075-`-plugin INPUT,OUTPUT'
3076- `gcjwebplugin' uses the `-plugin' option to specify the named pipe
3077- the `appletviewer' should use for receiving commands (INPUT) and
3078- the one it should use for sending commands to `gcjwebplugin'
3079- (OUTPUT).
3080-
3081-
3082- DEBUGGING OPTION
3083-`-verbose'
3084- Use the `-verbose' option to have the `appletviewer' print
3085- debugging messages.
3086-
3087-
3088- STANDARD OPTIONS
3089-
3090-`-help'
3091- Use the `-help' option to have the `appletviewer' print a usage
3092- message, then exit.
3093-
3094-`-version'
3095- Use the `-version' option to have the `appletviewer' print its
3096- version, then exit.
3097-
3098-`-JOPTION'
3099- Use the `-J' option to pass OPTION to the virtual machine that
3100- will run the `appletviewer'. Unlike other options, there must not
3101- be a space between the `-J' and OPTION.
3102-
3103-
3104-
3105-File: cp-tools.info, Node: gcjwebplugin, Prev: appletviewer Tool, Up: Applet Tools
3106-
3107-1.2 The `gcjwebplugin' Tool
3108-===========================
3109-
3110-`gcjwebplugin' is a plugin that adds applet support to web browsers.
3111-Currently `gcjwebplugin' only supports Mozilla-based browsers (e.g.,
3112-Firefox, Galeon, Mozilla).
3113-
3114-
3115-File: cp-tools.info, Node: Security Tools, Next: Other Tools, Prev: Applet Tools, Up: Top
3116-
3117-2 Security Tools
3118-****************
3119-
3120-Two Security Tools are available with GNU Classpath: `jarsigner' and
3121-`keytool'.
3122-
3123- To avoid conflicts with other implementations, the jarsigner
3124-executable is called `gjarsigner' and the keytool executable is called
3125-`gkeytool'.
3126-
3127-* Menu:
3128-
3129-* jarsigner Tool:: Sign and verify .JAR files
3130-* keytool Tool:: Manage private keys and public certificates
3131-
3132- If while using these tools you think you found a bug, then please
3133-report it at classpath-bugs
3134-(http://www.gnu.org/software/classpath/bugs.html).
3135-
3136-
3137-File: cp-tools.info, Node: jarsigner Tool, Next: keytool Tool, Prev: Security Tools, Up: Security Tools
3138-
3139-2.1 The `jarsigner' Tool
3140-========================
3141-
3142-The `jarsigner' tool is invoked from the command line, in one of two
3143-forms, as follows:
3144-
3145- jarsigner [OPTION]... FILE ALIAS
3146-
3147- jarsigner `-verify' [OPTION]... FILE
3148-
3149- When the first form is used, the tool signs the designated JAR file.
3150-The second form, on the other hand, is used to verify a previously
3151-signed JAR file.
3152-
3153- FILE is the .JAR file to process; i.e. to sign if the first syntax
3154-form is used, or to verify if the second syntax form is used instead.
3155-
3156- ALIAS must be a known Alias of a Key Entry in the designated Key
3157-Store. The private key material associated with this Alias is then used
3158-for signing the designated .JAR file.
3159-
3160-* Menu:
3161-
3162-* Common jarsigner Options:: Options used when signing or verifying a file
3163-* Signing Options:: Options only used when signing a .JAR file
3164-* Verification Options:: Options only used when verifying a .JAR file
3165-
3166-
3167-File: cp-tools.info, Node: Common jarsigner Options, Next: Signing Options, Prev: jarsigner Tool, Up: jarsigner Tool
3168-
3169-2.1.1 Common options
3170---------------------
3171-
3172-The following options may be used when the tool is used for either
3173-signing, or verifying, a .JAR file.
3174-
3175-`-verbose'
3176- Use this option to force the tool to generate more verbose
3177- messages, during its processing.
3178-
3179-`-internalsf'
3180- When present, the tool will include -which otherwise it does not-
3181- the `.SF' file in the `.DSA' generated file.
3182-
3183-`-sectionsonly'
3184- When present, the tool will include in the `.SF' generated file
3185- -which otherwise it does not- a header containing a hash of the
3186- whole manifest file. When that header is included, the tool can
3187- quickly check, during verification, if the hash (in the header)
3188- matches or not the manifest file.
3189-
3190-`-provider PROVIDER_CLASS_NAME'
3191- A fully qualified class name of a Security Provider to add to the
3192- current list of Security Providers already installed in the JVM
3193- in-use. If a provider class is specified with this option, and was
3194- successfully added to the runtime -i.e. it was not already
3195- installed- then the tool will attempt to remove this Security
3196- Provider before exiting.
3197-
3198-`-help'
3199- Prints a help text similar to this one.
3200-
3201-
3202-
3203-File: cp-tools.info, Node: Signing Options, Next: Verification Options, Prev: Common jarsigner Options, Up: jarsigner Tool
3204-
3205-2.1.2 Signing options
3206----------------------
3207-
3208-The following options may be specified when using the tool for signing
3209-purposes.
3210-
3211-`-keystore URL'
3212- Use this option to specify the location of the key store to use.
3213- The default value is a file URL referencing the file named
3214- `.keystore' located in the path returned by the call to
3215- `java.lang.System#getProperty(String)' using `user.home' as
3216- argument.
3217-
3218- If a URL was specified, but was found to be malformed -e.g.
3219- missing protocol element- the tool will attempt to use the URL
3220- value as a file-name (with absolute or relative path-name) of a
3221- key store -as if the protocol was `file:'.
3222-
3223-`-storetype STORE_TYPE'
3224- Use this option to specify the type of the key store to use. The
3225- default value, if this option is omitted, is that of the property
3226- `keystore.type' in the security properties file, which is obtained
3227- by invoking the static method call `getDefaultType()' in
3228- `java.security.KeyStore'.
3229-
3230-`-storepass PASSWORD'
3231- Use this option to specify the password which will be used to
3232- unlock the key store. If this option is missing, the User will be
3233- prompted to provide a password.
3234-
3235-`-keypass PASSWORD'
3236- Use this option to specify the password which the tool will use to
3237- unlock the Key Entry associated with the designated Alias.
3238-
3239- If this option is omitted, the tool will first attempt to unlock
3240- the Key Entry using the same password protecting the key store. If
3241- this fails, you will then be prompted to provide a password.
3242-
3243-`-sigfile NAME'
3244- Use this option to designate a literal that will be used to
3245- construct file names for both the `.SF' and `.DSA' signature
3246- files. These files will be generated, by the tool, and placed in
3247- the `META-INF' directory of the signed JAR. Permissible
3248- characters for NAME must be in the range "a-zA-Z0-9_-". All
3249- characters will be converted to upper-case ones.
3250-
3251- If this option is missing, the first eight characters of the ALIAS
3252- argument will be used. When this is the case, any character in
3253- ALIAS that is outside the permissible range of characters will be
3254- replaced by an underscore.
3255-
3256-`-signedjar FILE'
3257- Use this option to specify the file name of the signed JAR. If
3258- this option is omitted, then the signed JAR will be named the same
3259- as FILE; i.e. the input JAR file will be replaced with the signed
3260- copy.
3261-
3262-
3263-
3264-File: cp-tools.info, Node: Verification Options, Prev: Signing Options, Up: jarsigner Tool
3265-
3266-2.1.3 Verification options
3267---------------------------
3268-
3269-The following options may be specified when using the tool for
3270-verification purposes.
3271-
3272-`-verify'
3273- Use this option to indicate that the tool is to be used for
3274- verification purposes.
3275-
3276-`-certs'
3277- This option is used in conjunction with the `-verbose' option.
3278- When present, along with the `-verbose' option, the tool will
3279- print more detailed information about the certificates of the
3280- signer(s) being processed.
3281-
3282-
3283-
3284-File: cp-tools.info, Node: keytool Tool, Prev: jarsigner Tool, Up: Security Tools
3285-
3286-2.2 The `keytool' Tool
3287-======================
3288-
3289-Cryptographic credentials, in a Java environment, are usually stored in
3290-a Key Store. The Java SDK specifies a Key Store as a persistent
3291-container of two types of objects: Key Entries and Trusted
3292-Certificates. The security tool `keytool' is a Java-based application
3293-for managing those types of objects.
3294-
3295- A Key Entry represents the private key part of a key-pair used in
3296-Public-Key Cryptography, and a signed X.509 certificate which
3297-authenticates the public key part for a known entity; i.e. the owner of
3298-the key-pair. The X.509 certificate itself contains the public key part
3299-of the key-pair.
3300-
3301- A Trusted Certificate is a signed X.509 certificate issued by a
3302-trusted entity. The Trust in this context is relative to the User of
3303-the `keytool'. In other words, the existence of a Trusted Certificate
3304-in the Key Store processed by a `keytool' command implies that the User
3305-trusts the Issuer of that Trusted Certificate to also sign, and hence
3306-authenticates, other Subjects the tool may process.
3307-
3308- Trusted Certificates are important because they allow the tool to
3309-mechanically construct Chains of Trust starting from one of the Trusted
3310-Certificates in a Key Store and ending with a certificate whose Issuer
3311-is potentially unknown. A valid chain is an ordered list, starting with
3312-a Trusted Certificate (also called the anchor), ending with the target
3313-certificate, and satisfying the condition that the Subject of
3314-certificate `#i' is the Issuer of certificate `#i + 1'.
3315-
3316- The `keytool' is invoked from the command line as follows:
3317-
3318- keytool [COMMAND] ...
3319-
3320- Multiple COMMANDs may be specified at once, each complete with its
3321-own options. `keytool' will parse all the arguments, before processing,
3322-and executing, each `COMMAND'. If an exception occurs while executing
3323-one COMMAND `keytool' will abort. Note however that because the
3324-implementation of the tool uses code to parse command line options that
3325-also supports GNU-style options, you have to separate each command
3326-group with a double-hyphen; e.g
3327-
3328- keytool -list -- -printcert -alias mykey
3329-
3330- Here is a summary of the commands supported by the tool:
3331-
3332- 1. Add/Update commands
3333- `-genkey [OPTION]...'
3334- Generate a new Key Entry, eventually creating a new key store.
3335-
3336- `-import [OPTION]...'
3337- Add, to a key store, Key Entries (private keys and
3338- certificate chains authenticating the public keys) and
3339- Trusted Certificates (3rd party certificates which can be
3340- used as Trust Anchors when building chains-of-trust).
3341-
3342- `-selfcert [OPTION]...'
3343- Generate a new self-signed Trusted Certificate.
3344-
3345- `-cacert [OPTION]...'
3346- Import a CA Trusted Certificate.
3347-
3348- `-identitydb [OPTION]...'
3349- NOT IMPLEMENTED YET.
3350- Import a JDK 1.1 style Identity Database.
3351-
3352- 2. Export commands
3353- `-certreq [OPTION]...'
3354- Issue a Certificate Signing Request (CSR) which can be then
3355- sent to a Certification Authority (CA) to issue a certificate
3356- signed (by the CA) and authenticating the Subject of the
3357- request.
3358-
3359- `-export [OPTION]...'
3360- Export a certificate from a key store.
3361-
3362- 3. Display commands
3363- `-list [OPTION]...'
3364- Print one or all certificates in a key store to `STDOUT'.
3365-
3366- `-printcert [OPTION]...'
3367- Print a human-readable form of a certificate, in a designated
3368- file, to `STDOUT'.
3369-
3370- 4. Management commands
3371- `-keyclone [OPTION]...'
3372- Clone a Key Entry in a key store.
3373-
3374- `-storepasswd [OPTION]...'
3375- Change the password protecting a key store.
3376-
3377- `-keypasswd [OPTION]...'
3378- Change the password protecting a Key Entry in a key store.
3379-
3380- `-delete [OPTION]...'
3381- Delete a Key Entry or a Trusted Certificate from a key store.
3382-
3383-* Menu:
3384-
3385-* Getting Help:: How to get help with keytool commands
3386-* Common keytool Options:: Options used in more than one command
3387-* Distinguished Names:: X.500 Distinguished Names used in certificates
3388-* Add/Update Commands:: Commands for adding data to a Key Store
3389-* Export Commands:: Commands for exporting data from a Key Store
3390-* Display Commands:: Commands for displaying data in a Key Store
3391-* Management Commands:: Commands for managing a Key Store
3392-
3393-
3394-File: cp-tools.info, Node: Getting Help, Next: Common keytool Options, Prev: keytool Tool, Up: keytool Tool
3395-
3396-2.2.1 Getting help
3397-------------------
3398-
3399-To get a general help text about the tool, use the `-help' option; e.g.
3400-
3401- `keytool -help'
3402-
3403- To get more specific help text about one of the tool's command use
3404-the `-help' option for that command; e.g.
3405-
3406- `keytool -genkey -help'
3407-
3408- In both instances, the tool will print a help text and then will
3409-exit the running JVM.
3410-
3411- It is worth noting here that the help messages printed by the tool
3412-are I18N-ready. This means that if/when the contents of the tool's
3413-Message Bundle properties file are available in languages other than
3414-English, you may see those messages in that language.
3415-
3416-
3417-File: cp-tools.info, Node: Common keytool Options, Next: Distinguished Names, Prev: Getting Help, Up: keytool Tool
3418-
3419-2.2.2 Common options
3420---------------------
3421-
3422-The following `OPTION's are used in more than one `COMMAND'. They are
3423-described here to reduce redundancy.
3424-
3425-`-alias ALIAS'
3426- Every entry, be it a Key Entry or a Trusted Certificate, in a key
3427- store is uniquely identified by a user-defined ALIAS string. Use
3428- this option to specify the ALIAS to use when referring to an entry
3429- in the key store. Unless specified otherwise, a default value of
3430- `mykey' shall be used when this option is omitted from the command
3431- line.
3432-
3433-`-keyalg ALGORITHM'
3434- Use this option to specify the canonical name of the key-pair
3435- generation algorithm. The default value for this option is `DSS'
3436- (a synonym for the Digital Signature Algorithm also known as DSA).
3437-
3438-`-keysize SIZE'
3439- Use this option to specify the number of bits of the shared
3440- modulus (for both the public and private keys) to use when
3441- generating new keys. A default value of `1024' will be used if
3442- this option is omitted from the command line.
3443-
3444-`-validity DAY_COUNT'
3445- Use this option to specify the number of days a newly generated
3446- certificate will be valid for. The default value is `90' (days) if
3447- this option is omitted from the command line.
3448-
3449-`-storetype STORE_TYPE'
3450- Use this option to specify the type of the key store to use. The
3451- default value, if this option is omitted, is that of the property
3452- `keystore.type' in the security properties file, which is obtained
3453- by invoking the static method call `getDefaultType()' in
3454- `java.security.KeyStore'.
3455-
3456-`-storepass PASSWORD'
3457- Use this option to specify the password protecting the key store.
3458- If this option is omitted from the command line, you will be
3459- prompted to provide a password.
3460-
3461-`-keystore URL'
3462- Use this option to specify the location of the key store to use.
3463- The default value is a file URL referencing the file named
3464- `.keystore' located in the path returned by the call to
3465- `java.lang.System#getProperty(String)' using `user.home' as
3466- argument.
3467-
3468- If a URL was specified, but was found to be malformed -e.g.
3469- missing protocol element- the tool will attempt to use the URL
3470- value as a file-name (with absolute or relative path-name) of a
3471- key store -as if the protocol was `file:'.
3472-
3473-`-provider PROVIDER_CLASS_NAME'
3474- A fully qualified class name of a Security Provider to add to the
3475- current list of Security Providers already installed in the JVM
3476- in-use. If a provider class is specified with this option, and was
3477- successfully added to the runtime -i.e. it was not already
3478- installed- then the tool will attempt to removed this Security
3479- Provider before exiting.
3480-
3481-`-file FILE'
3482- Use this option to designate a file to use with a command. When
3483- specified with this option, the value is expected to be the fully
3484- qualified path of a file accessible by the File System. Depending
3485- on the command, the file may be used as input or as output. When
3486- this option is omitted from the command line, `STDIN' will be used
3487- instead, as the source of input, and `STDOUT' will be used instead
3488- as the output destination.
3489-
3490-`-v'
3491- Unless specified otherwise, use this option to enable more verbose
3492- output.
3493-
3494-
3495-
3496-File: cp-tools.info, Node: Distinguished Names, Next: Add/Update Commands, Prev: Common keytool Options, Up: keytool Tool
3497-
3498-2.2.3 X.500 Distinguished Names
3499--------------------------------
3500-
3501-A Distinguished Name (or DN) MUST be supplied with some of the
3502-`COMMAND's using a `-dname' option. The syntax of a valid value for
3503-this option MUST follow RFC-2253 specifications. Namely the following
3504-components (with their accepted meaning) will be recognized. Note that
3505-the component name is case-insensitive:
3506-
3507-CN
3508- The Common Name; e.g. `host.domain.com'
3509-
3510-OU
3511- The Organizational Unit; e.g. `IT Department'
3512-
3513-O
3514- The Organization Name; e.g. `The Sample Company'
3515-
3516-L
3517- The Locality Name; e.g. `Sydney'
3518-
3519-ST
3520- The State Name; e.g. `New South Wales'
3521-
3522-C
3523- The 2-letter Country identifier; e.g. `AU'
3524-
3525- When specified with a `-dname' option, each pair of component/value
3526-will be separated from the other with a comma. Each component and value
3527-pair MUST be separated by an equal sign. For example, the following is
3528-a valid DN value:
3529-CN=host.domain.com, O=The Sample Company, L=Sydney, ST=NSW, C=AU
3530-
3531-If the Distinguished Name is required, and no valid default value can
3532-be used, the tool will prompt you to enter the information through the
3533-console.
3534-
3535-
3536-File: cp-tools.info, Node: Add/Update Commands, Next: Export Commands, Prev: Distinguished Names, Up: keytool Tool
3537-
3538-2.2.4 Add/Update commands
3539--------------------------
3540-
3541-* Menu:
3542-
3543-* Command -genkey:: Generate private key and self-signed certificate
3544-* Command -import:: Import certificates and certificate replies
3545-* Command -selfcert:: Generate self-signed certificate
3546-* Command -cacert:: Import a CA Trusted Certificate
3547-* Command -identitydb:: Import JDK-1 style identities
3548-
3549-
3550-File: cp-tools.info, Node: Command -genkey, Next: Command -import, Prev: Add/Update Commands, Up: Add/Update Commands
3551-
3552-2.2.4.1 The `-genkey' command
3553-.............................
3554-
3555-Use this command to generate a new key-pair (both private and public
3556-keys), and save these credentials in the key store as a Key Entry,
3557-associated with the designated (if was specified with the `-alias'
3558-option) or default (if the `-alias' option is omitted) Alias.
3559-
3560- The private key material will be protected with a user-defined
3561-password (see `-keypass' option). The public key on the other hand will
3562-be part of a self-signed X.509 certificate, which will form a 1-element
3563-chain and will be saved in the key store.
3564-
3565-`-alias ALIAS'
3566- For more details *note ALIAS: alias.
3567-
3568-`-keyalg ALGORITHM'
3569- For more details *note ALGORITHM: keyalg.
3570-
3571-`-keysize KEY_SIZE'
3572- For more details *note KEY_SIZE: keysize.
3573-
3574-`-sigalg ALGORITHM'
3575- The canonical name of the digital signature algorithm to use for
3576- signing certificates. If this option is omitted, a default value
3577- will be chosen based on the type of the key-pair; i.e. the
3578- algorithm that ends up being used by the -keyalg option. If the
3579- key-pair generation algorithm is `DSA', the value for the
3580- signature algorithm will be `SHA1withDSA'. If on the other hand
3581- the key-pair generation algorithm is `RSA', then the tool will use
3582- `MD5withRSA' as the signature algorithm.
3583-
3584-`-dname NAME'
3585- This a mandatory value for the command. If no value is specified
3586- -i.e. the `-dname' option is omitted- the tool will prompt you to
3587- enter a Distinguished Name to use as both the Owner and Issuer of
3588- the generated self-signed certificate.
3589-
3590- For more details *note X.500 DISTINGUISHED NAME: dn.
3591-
3592-`-keypass PASSWORD'
3593- Use this option to specify the password which the tool will use to
3594- protect the newly created Key Entry.
3595-
3596- If this option is omitted, you will be prompted to provide a
3597- password.
3598-
3599-`-validity DAY_COUNT'
3600- For more details *note DAY_COUNT: validity.
3601-
3602-`-storetype STORE_TYPE'
3603- For more details *note STORE_TYPE: storetype.
3604-
3605-`-keystore URL'
3606- For more details *note URL: keystore.
3607-
3608-`-storepass PASSWORD'
3609- For more details *note PASSWORD: storepass.
3610-
3611-`-provider PROVIDER_CLASS_NAME'
3612- For more details *note PROVIDER_CLASS_NAME: provider.
3613-
3614-`-v'
3615- For more details *note verbose::.
3616-
3617-
3618-
3619-File: cp-tools.info, Node: Command -import, Next: Command -selfcert, Prev: Command -genkey, Up: Add/Update Commands
3620-
3621-2.2.4.2 The `-import' command
3622-.............................
3623-
3624-Use this command to read an X.509 certificate, or a PKCS#7 Certificate
3625-Reply from a designated input source and incorporate the certificates
3626-into the key store.
3627-
3628- If the Alias does not already exist in the key store, the tool
3629-treats the certificate read from the input source as a new Trusted
3630-Certificate. It then attempts to discover a chain-of-trust, starting
3631-from that certificate and ending at another Trusted Certificate,
3632-already stored in the key store. If the `-trustcacerts' option is
3633-present, an additional key store, of type `JKS' named `cacerts', and
3634-assumed to be present in `${JAVA_HOME}/lib/security' will also be
3635-consulted if found -`${JAVA_HOME}' refers to the location of an
3636-installed Java Runtime Environment (JRE). If no chain-of-trust can be
3637-established, and unless the `-noprompt' option has been specified, the
3638-certificate is printed to `STDOUT' and the user is prompted for a
3639-confirmation.
3640-
3641- If Alias exists in the key store, the tool will treat the
3642-certificate(s) read from the input source as a Certificate Reply, which
3643-can be a chain of certificates, that eventually would replace the chain
3644-of certificates associated with the Key Entry of that Alias. The
3645-substitution of the certificates only occurs if a chain-of-trust can be
3646-established between the bottom certificate of the chain read from the
3647-input file and the Trusted Certificates already present in the key
3648-store. Again, if the `-trustcacerts' option is specified, additional
3649-Trusted Certificates in the same `cacerts' key store will be
3650-considered. If no chain-of-trust can be established, the operation will
3651-abort.
3652-
3653-`-alias ALIAS'
3654- For more details *note ALIAS: alias.
3655-
3656-`-file FILE'
3657- For more details *note FILE: file.
3658-
3659-`-keypass PASSWORD'
3660- Use this option to specify the password which the tool will use to
3661- protect the Key Entry associated with the designated Alias, when
3662- replacing this Alias' chain of certificates with that found in the
3663- certificate reply.
3664-
3665- If this option is omitted, and the chain-of-trust for the
3666- certificate reply has been established, the tool will first
3667- attempt to unlock the Key Entry using the same password protecting
3668- the key store. If this fails, you will then be prompted to provide
3669- a password.
3670-
3671-`-noprompt'
3672- Use this option to prevent the tool from prompting the user.
3673-
3674-`-trustcacerts'
3675- Use this option to indicate to the tool that a key store, of type
3676- `JKS', named `cacerts', and usually located in `lib/security' in
3677- an installed Java Runtime Environment should be considered when
3678- trying to establish chain-of-trusts.
3679-
3680-`-storetype STORE_TYPE'
3681- For more details *note STORE_TYPE: storetype.
3682-
3683-`-keystore URL'
3684- For more details *note URL: keystore.
3685-
3686-`-storepass PASSWORD'
3687- For more details *note PASSWORD: storepass.
3688-
3689-`-provider PROVIDER_CLASS_NAME'
3690- For more details *note PROVIDER_CLASS_NAME: provider.
3691-
3692-`-v'
3693- For more details *note verbose::.
3694-
3695-
3696-
3697-File: cp-tools.info, Node: Command -selfcert, Next: Command -cacert, Prev: Command -import, Up: Add/Update Commands
3698-
3699-2.2.4.3 The `-selfcert' command
3700-...............................
3701-
3702-Use this command to generate a self-signed X.509 version 1 certificate.
3703-The newly generated certificate will form a chain of one element which
3704-will replace the previous chain associated with the designated Alias
3705-(if `-alias' option was specified), or the default Alias (if `-alias'
3706-option was omitted).
3707-
3708-`-alias ALIAS'
3709- For more details *note ALIAS: alias.
3710-
3711-`-sigalg ALGORITHM'
3712- The canonical name of the digital signature algorithm to use for
3713- signing the certificate. If this option is omitted, a default
3714- value will be chosen based on the type of the private key
3715- associated with the designated Alias. If the private key is a
3716- `DSA' one, the value for the signature algorithm will be
3717- `SHA1withDSA'. If on the other hand the private key is an `RSA'
3718- one, then the tool will use `MD5withRSA' as the signature
3719- algorithm.
3720-
3721-`-dname NAME'
3722- Use this option to specify the Distinguished Name of the newly
3723- generated self-signed certificate. If this option is omitted, the
3724- existing Distinguished Name of the base certificate in the chain
3725- associated with the designated Alias will be used instead.
3726-
3727- For more details *note X.500 DISTINGUISHED NAME: dn.
3728-
3729-`-validity DAY_COUNT'
3730- For more details *note DAY_COUNT: validity.
3731-
3732-`-keypass PASSWORD'
3733- Use this option to specify the password which the tool will use to
3734- unlock the Key Entry associated with the designated Alias.
3735-
3736- If this option is omitted, the tool will first attempt to unlock
3737- the Key Entry using the same password protecting the key store. If
3738- this fails, you will then be prompted to provide a password.
3739-
3740-`-storetype STORE_TYPE'
3741- For more details *note STORE_TYPE: storetype.
3742-
3743-`-keystore URL'
3744- For more details *note URL: keystore.
3745-
3746-`-storepass PASSWORD'
3747- For more details *note PASSWORD: storepass.
3748-
3749-`-provider PROVIDER_CLASS_NAME'
3750- For more details *note PROVIDER_CLASS_NAME: provider.
3751-
3752-`-v'
3753- For more details *note verbose::.
3754-
3755-
3756-
3757-File: cp-tools.info, Node: Command -cacert, Next: Command -identitydb, Prev: Command -selfcert, Up: Add/Update Commands
3758-
3759-2.2.4.4 The `-cacert' command
3760-.............................
3761-
3762-Use this command to import, a CA certificate and add it to the key
3763-store as a Trusted Certificate. The Alias for this new entry will be
3764-constructed from the FILE's base-name after replacing hyphens and dots
3765-with underscores.
3766-
3767- This command is useful when used in a script that recursively visits
3768-a directory of CA certificates to populate a `cacerts.gkr' Key Store of
3769-trusted certificates which can then be used commands that specify the
3770-`-trustcacerts' option.
3771-
3772-`-file FILE'
3773- For more details *note FILE: file.
3774-
3775-`-storetype STORE_TYPE'
3776- For more details *note STORE_TYPE: storetype.
3777-
3778-`-keystore URL'
3779- For more details *note URL: keystore.
3780-
3781-`-storepass PASSWORD'
3782- For more details *note PASSWORD: storepass.
3783-
3784-`-provider PROVIDER_CLASS_NAME'
3785- For more details *note PROVIDER_CLASS_NAME: provider.
3786-
3787-`-v'
3788- For more details *note verbose::.
3789-
3790-
3791-
3792-File: cp-tools.info, Node: Command -identitydb, Prev: Command -cacert, Up: Add/Update Commands
3793-
3794-2.2.4.5 The `-identitydb' command
3795-.................................
3796-
3797-NOT IMPLEMENTED YET.
3798-
3799- Use this command to import a JDK 1.1 style Identity Database.
3800-
3801-`-file FILE'
3802- For more details *note FILE: file.
3803-
3804-`-storetype STORE_TYPE'
3805- For more details *note STORE_TYPE: storetype.
3806-
3807-`-keystore URL'
3808- For more details *note URL: keystore.
3809-
3810-`-storepass PASSWORD'
3811- For more details *note PASSWORD: storepass.
3812-
3813-`-provider PROVIDER_CLASS_NAME'
3814- For more details *note PROVIDER_CLASS_NAME: provider.
3815-
3816-`-v'
3817- For more details *note verbose::.
3818-
3819-
3820-
3821-File: cp-tools.info, Node: Export Commands, Next: Display Commands, Prev: Add/Update Commands, Up: keytool Tool
3822-
3823-2.2.5 Export commands
3824----------------------
3825-
3826-* Menu:
3827-
3828-* Command -certreq:: Generate Certificate Signing Requests (CSR)
3829-* Command -export:: Export a certificate in a Key Store
3830-
3831-
3832-File: cp-tools.info, Node: Command -certreq, Next: Command -export, Prev: Export Commands, Up: Export Commands
3833-
3834-2.2.5.1 The `-certreq' command
3835-..............................
3836-
3837-Use this command to generate a PKCS#10 Certificate Signing Request
3838-(CSR) and write it to a designated output destination. The contents of
3839-the destination should look something like the following:
3840-
3841- -----BEGIN NEW CERTIFICATE REQUEST-----
3842- MI...QAwXzEUMBIGA1UEAwwLcnNuQGdudS5vcmcxGzAZBgNVBAoMElUg
3843- Q2...A0GA1UEBwwGU3lkbmV5MQwwCgYDVQQIDANOU1cxCzAJBgNVBACC
3844- ...
3845- FC...IVwNVOfQLRX+O5kAhQ/a4RTZme2L8PnpvgRwrf7Eg8D6w==
3846- -----END NEW CERTIFICATE REQUEST-----
3847-
3848- IMPORTANT: Some documentation (e.g. RSA examples) claims that the
3849-`Attributes' field, in the CSR is `OPTIONAL' while RFC-2986 implies the
3850-opposite. This implementation considers this field, by default, as
3851-`OPTIONAL', unless the option `-attributes' is specified on the command
3852-line.
3853-
3854-`-alias ALIAS'
3855- For more details *note ALIAS: alias.
3856-
3857-`-sigalg ALGORITHM'
3858- The canonical name of the digital signature algorithm to use for
3859- signing the certificate. If this option is omitted, a default
3860- value will be chosen based on the type of the private key
3861- associated with the designated Alias. If the private key is a
3862- `DSA' one, the value for the signature algorithm will be
3863- `SHA1withDSA'. If on the other hand the private key is an `RSA'
3864- one, then the tool will use `MD5withRSA' as the signature
3865- algorithm.
3866-
3867-`-file FILE'
3868- For more details *note FILE: file.
3869-
3870-`-keypass PASSWORD'
3871- Use this option to specify the password which the tool will use to
3872- unlock the Key Entry associated with the designated Alias.
3873-
3874- If this option is omitted, the tool will first attempt to unlock
3875- the Key Entry using the same password protecting the key store. If
3876- this fails, you will then be prompted to provide a password.
3877-
3878-`-storetype STORE_TYPE'
3879- For more details *note STORE_TYPE: storetype.
3880-
3881-`-keystore URL'
3882- For more details *note URL: keystore.
3883-
3884-`-storepass PASSWORD'
3885- For more details *note PASSWORD: storepass.
3886-
3887-`-provider PROVIDER_CLASS_NAME'
3888- For more details *note PROVIDER_CLASS_NAME: provider.
3889-
3890-`-v'
3891- For more details *note verbose::.
3892-
3893-`-attributes'
3894- Use this option to force the tool to encode a `NULL' DER value in
3895- the CSR as the value of the `Attributes' field.
3896-
3897-
3898-
3899-File: cp-tools.info, Node: Command -export, Prev: Command -certreq, Up: Export Commands
3900-
3901-2.2.5.2 The `-export' command
3902-.............................
3903-
3904-Use this command to export a certificate stored in a key store to a
3905-designated output destination, either in binary format (if the `-v'
3906-option is specified), or in RFC-1421 compliant encoding (if the `-rfc'
3907-option is specified instead).
3908-
3909-`-alias ALIAS'
3910- For more details *note ALIAS: alias.
3911-
3912-`-file FILE'
3913- For more details *note FILE: file.
3914-
3915-`-storetype STORE_TYPE'
3916- For more details *note STORE_TYPE: storetype.
3917-
3918-`-keystore URL'
3919- For more details *note URL: keystore.
3920-
3921-`-storepass PASSWORD'
3922- For more details *note PASSWORD: storepass.
3923-
3924-`-provider PROVIDER_CLASS_NAME'
3925- For more details *note PROVIDER_CLASS_NAME: provider.
3926-
3927-`-rfc'
3928- Use RFC-1421 specifications when encoding the output.
3929-
3930-`-v'
3931- Output the certificate in binary DER encoding. This is the default
3932- output format of the command if neither `-rfc' nor `-v' options
3933- were detected on the command line. If both this option and the
3934- `-rfc' option are detected on the command line, the tool will opt
3935- for the RFC-1421 style encoding.
3936-
3937-
3938-
3939-File: cp-tools.info, Node: Display Commands, Next: Management Commands, Prev: Export Commands, Up: keytool Tool
3940-
3941-2.2.6 Display commands
3942-----------------------
3943-
3944-* Menu:
3945-
3946-* Command -list:: Display information about one or all Aliases
3947-* Command -printcert:: Print a certificate or a certificate fingerprint
3948-
3949-
3950-File: cp-tools.info, Node: Command -list, Next: Command -printcert, Prev: Display Commands, Up: Display Commands
3951-
3952-2.2.6.1 The `-list' command
3953-...........................
3954-
3955-Use this command to print one or all of a key store entries to
3956-`STDOUT'. Usually this command will only print a fingerprint of the
3957-certificate, unless either the `-rfc' or the `-v' option is specified.
3958-
3959-`-alias ALIAS'
3960- If this option is omitted, the tool will print ALL the entries
3961- found in the key store.
3962-
3963- For more details *note ALIAS: alias.
3964-
3965-`-storetype STORE_TYPE'
3966- For more details *note STORE_TYPE: storetype.
3967-
3968-`-keystore URL'
3969- For more details *note URL: keystore.
3970-
3971-`-storepass PASSWORD'
3972- For more details *note PASSWORD: storepass.
3973-
3974-`-provider PROVIDER_CLASS_NAME'
3975- For more details *note PROVIDER_CLASS_NAME: provider.
3976-
3977-`-rfc'
3978- Use RFC-1421 specifications when encoding the output.
3979-
3980-`-v'
3981- Output the certificate in human-readable format. If both this
3982- option and the `-rfc' option are detected on the command line, the
3983- tool will opt for the human-readable form and will not abort the
3984- command.
3985-
3986-
3987-
3988-File: cp-tools.info, Node: Command -printcert, Prev: Command -list, Up: Display Commands
3989-
3990-2.2.6.2 The `-printcert' command
3991-................................
3992-
3993-Use this command to read a certificate from a designated input source
3994-and print it to `STDOUT' in a human-readable form.
3995-
3996-`-file FILE'
3997- For more details *note FILE: file.
3998-
3999-`-v'
4000- For more details *note verbose::.
4001-
4002-
4003-
4004-File: cp-tools.info, Node: Management Commands, Prev: Display Commands, Up: keytool Tool
4005-
4006-2.2.7 Management commands
4007--------------------------
4008-
4009-* Menu:
4010-
4011-* Command -keyclone:: Clone a Key Entry in a Key Store
4012-* Command -storepasswd:: Change the password protecting a Key Store
4013-* Command -keypasswd:: Change the password protecting a Key Entry
4014-* Command -delete:: Remove an entry in a Key Store
4015-
4016-
4017-File: cp-tools.info, Node: Command -keyclone, Next: Command -storepasswd, Prev: Management Commands, Up: Management Commands
4018-
4019-2.2.7.1 The `-keyclone' command
4020-...............................
4021-
4022-Use this command to clone an existing Key Entry and store it under a
4023-new (different) Alias protecting, its private key material with
4024-possibly a new password.
4025-
4026-`-alias ALIAS'
4027- For more details *note ALIAS: alias.
4028-
4029-`-dest ALIAS'
4030- Use this option to specify the new Alias which will be used to
4031- identify the cloned copy of the Key Entry.
4032-
4033-`-keypass PASSWORD'
4034- Use this option to specify the password which the tool will use to
4035- unlock the Key Entry associated with the designated Alias.
4036-
4037- If this option is omitted, the tool will first attempt to unlock
4038- the Key Entry using the same password protecting the key store. If
4039- this fails, you will then be prompted to provide a password.
4040-
4041-`-new PASSWORD'
4042- Use this option to specify the password protecting the private key
4043- material of the newly cloned copy of the Key Entry.
4044-
4045-`-storetype STORE_TYPE'
4046- For more details *note STORE_TYPE: storetype.
4047-
4048-`-keystore URL'
4049- For more details *note URL: keystore.
4050-
4051-`-storepass PASSWORD'
4052- For more details *note PASSWORD: storepass.
4053-
4054-`-provider PROVIDER_CLASS_NAME'
4055- For more details *note PROVIDER_CLASS_NAME: provider.
4056-
4057-`-v'
4058- For more details *note verbose::.
4059-
4060-
4061-
4062-File: cp-tools.info, Node: Command -storepasswd, Next: Command -keypasswd, Prev: Command -keyclone, Up: Management Commands
4063-
4064-2.2.7.2 The `-storepasswd' command
4065-..................................
4066-
4067-Use this command to change the password protecting a key store.
4068-
4069-`-new PASSWORD'
4070- The new, and different, password which will be used to protect the
4071- designated key store.
4072-
4073-`-storetype STORE_TYPE'
4074- For more details *note STORE_TYPE: storetype.
4075-
4076-`-keystore URL'
4077- For more details *note URL: keystore.
4078-
4079-`-storepass PASSWORD'
4080- For more details *note PASSWORD: storepass.
4081-
4082-`-provider PROVIDER_CLASS_NAME'
4083- For more details *note PROVIDER_CLASS_NAME: provider.
4084-
4085-`-v'
4086- For more details *note verbose::.
4087-
4088-
4089-
4090-File: cp-tools.info, Node: Command -keypasswd, Next: Command -delete, Prev: Command -storepasswd, Up: Management Commands
4091-
4092-2.2.7.3 The `-keypasswd' command
4093-................................
4094-
4095-Use this command to change the password protecting the private key
4096-material of a designated Key Entry.
4097-
4098-`-alias ALIAS'
4099- For more details *note ALIAS: alias.
4100-
4101- Use this option to specify the password which the tool will use to
4102- unlock the Key Entry associated with the designated Alias.
4103-
4104- If this option is omitted, the tool will first attempt to unlock
4105- the Key Entry using the same password protecting the key store. If
4106- this fails, you will then be prompted to provide a password.
4107-
4108-`-new PASSWORD'
4109- The new, and different, password which will be used to protect the
4110- private key material of the designated Key Entry.
4111-
4112-`-storetype STORE_TYPE'
4113- For more details *note STORE_TYPE: storetype.
4114-
4115-`-keystore URL'
4116- For more details *note URL: keystore.
4117-
4118-`-storepass PASSWORD'
4119- For more details *note PASSWORD: storepass.
4120-
4121-`-provider PROVIDER_CLASS_NAME'
4122- For more details *note PROVIDER_CLASS_NAME: provider.
4123-
4124-`-v'
4125- For more details *note verbose::.
4126-
4127-
4128-
4129-File: cp-tools.info, Node: Command -delete, Prev: Command -keypasswd, Up: Management Commands
4130-
4131-2.2.7.4 The `-delete' command
4132-.............................
4133-
4134-Use this command to delete a designated key store entry.
4135-
4136-`-alias ALIAS'
4137- For more details *note ALIAS: alias.
4138-
4139-`-storetype STORE_TYPE'
4140- For more details *note STORE_TYPE: storetype.
4141-
4142-`-keystore URL'
4143- For more details *note URL: keystore.
4144-
4145-`-storepass PASSWORD'
4146- For more details *note PASSWORD: storepass.
4147-
4148-`-provider PROVIDER_CLASS_NAME'
4149- For more details *note PROVIDER_CLASS_NAME: provider.
4150-
4151-`-v'
4152- For more details *note verbose::.
4153-
4154-
4155-
4156-File: cp-tools.info, Node: Other Tools, Next: I18N Issues, Prev: Security Tools, Up: Top
4157-
4158-3 Other Tools
4159-*************
4160-
4161-This is a list of currently undocumented classpath tools: jar, javah,
4162-gcjh, native2ascii, orbd, serialver, rmid, rmiregistry and tnameserv.
4163-
4164-* Menu:
4165-
4166-* jar Tool:: Archive tool for Java archives
4167-* javah Tool:: A java header compiler
4168-* gcjh Tool:: A java header compiler (old version)
4169-* native2ascii Tool:: An encoding converter
4170-* orbd Tool:: An object request broker daemon
4171-* serialver Tool:: A serial version command
4172-* rmid Tool:: RMI activation daemon
4173-* rmiregistry Tool:: Remote object registry
4174-* tnameserv Tool:: Naming service
4175-
4176-
4177-File: cp-tools.info, Node: jar Tool, Next: javah Tool, Up: Other Tools
4178-
4179-3.1 The `jar' Tool
4180-==================
4181-
4182-`gjar' is an implementation of Sun's jar utility that comes with the
4183-JDK.
4184-
4185- If any file is a directory then it is processed recursively. The
4186-manifest file name and the archive file name needs to be specified in
4187-the same order the `-m' and `-f' flags are specified.
4188-
4189- Operation mode:
4190-
4191-`-c'
4192- Create new archive.
4193-
4194-`-t'
4195- List table of contents for archive.
4196-
4197-`-x'
4198- Extract named (or all) files from archive.
4199-
4200-`-u'
4201- Update existing archive.
4202-
4203-`-i FILE'
4204- Compute archive index.
4205-
4206- Operation modifiers:
4207-
4208-`-f FILE'
4209- Specify archive file name.
4210-
4211-`-0'
4212- Store only; use no ZIP compression.
4213-
4214-`-v'
4215- Generate verbose output on standard output.
4216-
4217-`-M'
4218- Do not create a manifest file for the entries.
4219-
4220-`-m MANIFEST'
4221- Include manifest information from specified MANIFEST file.
4222-
4223- File name selection:
4224-
4225-`-C DIR FILE'
4226- Change to the DIR and include the following FILE.
4227-
4228-`-@'
4229- Read the names of the files to add to the archive from stdin. This
4230- option is supported only in combination with `-c' or `-u'. Non
4231- standard option added in the GCC version.
4232-
4233- Standard options:
4234-
4235-`-help'
4236- Print help text, then exit.
4237-
4238-`-version'
4239- Print version number, then exit.
4240-
4241-`-JOPTION'
4242- Pass argument to the Java runtime.
4243-
4244- java(1), ...
4245-
4246-
4247-File: cp-tools.info, Node: javah Tool, Next: gcjh Tool, Prev: jar Tool, Up: Other Tools
4248-
4249-3.2 The `javah' Tool
4250-====================
4251-
4252-The `gjavah' program is used to generate header files from class files.
4253-It can generate both CNI and JNI header files, as well as stub
4254-implementation files which can be used as a basis for implementing the
4255-required native methods.
4256-
4257-`-d DIR'
4258- Set output directory.
4259-
4260-`-o FILE'
4261- Set output file (only one of `-d' or `-o' may be used).
4262-
4263-`-cmdfile FILE'
4264- Read command file.
4265-
4266-`-all DIR'
4267- Operate on all class files under directory DIR.
4268-
4269-`-stubs'
4270- Emit stub implementation.
4271-
4272-`-jni'
4273- Emit JNI stubs or header (default).
4274-
4275-`-cni'
4276- Emit CNI stubs or header (default JNI).
4277-
4278-`-verbose'
4279- Set verbose mode.
4280-
4281-`-force'
4282- Output files should always be written.
4283-
4284- Class path options:
4285-`-classpath PATH'
4286- Set the class path.
4287-
4288-`-IDIR'
4289- Add directory to class path.
4290-
4291-`-bootclasspath PATH'
4292- Set the boot class path.
4293-
4294-`-extdirs PATH'
4295- Set the extension directory path.
4296-
4297- Standard options:
4298-`-help'
4299- Print help text, then exit.
4300-
4301-`-version'
4302- Print version number, then exit.
4303-
4304-`-JOPTION'
4305- Pass argument to the Java runtime.
4306-
4307- javac(1), ...
4308-
4309-
4310-File: cp-tools.info, Node: gcjh Tool, Next: native2ascii Tool, Prev: javah Tool, Up: Other Tools
4311-
4312-3.3 The `gcjh' Tool
4313-===================
4314-
4315-The `gcjh' program is used to generate header files from class files.
4316-It can generate both CNI and JNI header files, as well as stub
4317-implementation files which can be used as a basis for implementing the
4318-required native methods. It is similar to `javah' but has slightly
4319-different command line options, and defaults to CNI.
4320-
4321- See `javah' for a full description; this page only lists the
4322-additional options provided by `gcjh'.
4323-
4324- CNI text options
4325-`-add TEXT'
4326- Insert TEXT into class body.
4327-
4328-`-append TEXT'
4329- Append TEXT after class declaration.
4330-
4331-`-friend TEXT'
4332- Insert TEXT as a `friend' declaration.
4333-
4334-`-prepend TEXT'
4335- Insert TEXT before start of class.
4336-
4337- Compatibility options (unused)
4338-`-td DIR'
4339-`-M'
4340-`-MM'
4341-`-MD'
4342-`-MMD'
4343- Unused compatibility option.
4344-
4345- Standard options:
4346-`-help'
4347- Print help text, then exit.
4348-
4349-`-version'
4350- Print version number, then exit.
4351-
4352-`-JOPTION'
4353- Pass argument to the Java runtime.
4354-
4355- javac(1), javah(1), ...
4356-
4357-
4358-File: cp-tools.info, Node: native2ascii Tool, Next: orbd Tool, Prev: gcjh Tool, Up: Other Tools
4359-
4360-3.4 The `native2ascii' Tool
4361-===========================
4362-
4363-To be written ...
4364-
4365-`-encoding NAME'
4366- Set the encoding to use.
4367-
4368-`-reversed'
4369- Convert from encoding to native.
4370-
4371- Standard options:
4372-`-help'
4373- Print help text, then exit.
4374-
4375-`-version'
4376- Print version number, then exit.
4377-
4378-`-JOPTION'
4379- Pass argument to the Java runtime.
4380-
4381- javac(1), ...
4382-
4383-
4384-File: cp-tools.info, Node: orbd Tool, Next: serialver Tool, Prev: native2ascii Tool, Up: Other Tools
4385-
4386-3.5 The `orbd' object request broker daemon
4387-===========================================
4388-
4389-To be written ...
4390-
4391-`-ORBInitialPort PORT'
4392- Port on which persistent naming service is to be started.
4393-
4394-`-ior FILE'
4395- File in which to store persistent naming service's IOR reference
4396-
4397-`-directory DIR'
4398- Directory in which to store persistent data.
4399-
4400-`-restart'
4401- Restart persistent naming service, clearing persistent naming
4402- database.
4403-
4404- Standard options:
4405-`-help'
4406- Print help text, then exit.
4407-
4408-`-version'
4409- Print version number, then exit.
4410-
4411-`-JOPTION'
4412- Pass argument to the Java runtime.
4413-
4414- java(1), ...
4415-
4416-
4417-File: cp-tools.info, Node: serialver Tool, Next: rmid Tool, Prev: orbd Tool, Up: Other Tools
4418-
4419-3.6 The `serialver' version command
4420-===================================
4421-
4422-Print the serialVersionUID of the specified classes.
4423-
4424-`-classpath PATH'
4425- Class path to use to find classes.
4426-
4427- Standard options:
4428-`-help'
4429- Print help text, then exit.
4430-
4431-`-version'
4432- Print version number, then exit.
4433-
4434-`-JOPTION'
4435- Pass argument to the Java runtime.
4436-
4437- javac(1), ...
4438-
4439-
4440-File: cp-tools.info, Node: rmid Tool, Next: rmiregistry Tool, Prev: serialver Tool, Up: Other Tools
4441-
4442-3.7 The `rmid' RMI activation system daemon
4443-===========================================
4444-
4445-`rmiregistry' starts a remote object registry on the current host. If
4446-no port number is specified, then port 1099 is used.
4447-
4448- Activation process control:
4449-`-port PORT'
4450- Port on which activation system is to be started.
4451-
4452-`-restart'
4453- Restart activation system, clearing persistent naming database, if
4454- any.
4455-
4456-`-stop'
4457- Stop activation system.
4458-
4459- Persistence:
4460-`-persistent'
4461- Make activation system persistent.
4462-
4463-`-directory DIR'
4464- Directory in which to store persistent data.
4465-
4466- Debugging:
4467-`-verbose'
4468- Log binding events to standard out.
4469-
4470- Standard options:
4471-`-help'
4472- Print help text, then exit.
4473-
4474-`-version'
4475- Print version number, then exit.
4476-
4477-`-JOPTION'
4478- Pass argument to the Java runtime.
4479-
4480- java(1), ...
4481-
4482-
4483-File: cp-tools.info, Node: rmiregistry Tool, Next: tnameserv Tool, Prev: rmid Tool, Up: Other Tools
4484-
4485-3.8 The `rmiregistry' Tool
4486-==========================
4487-
4488-`grmiregistry' starts a remote object registry on the current host. If
4489-no port number is specified, then port 1099 is used.
4490-
4491- Registry process control:
4492-`-restart'
4493- Restart RMI naming service, clearing persistent naming database, if
4494- any.
4495-
4496-`-stop'
4497- Stop RMI naming service.
4498-
4499- Persistence:
4500-`-persistent'
4501- Make RMI naming service persistent.
4502-
4503-`-directory DIR'
4504- Directory in which to store persistent data.
4505-
4506- Debugging:
4507-`-verbose'
4508- Log binding events to standard out.
4509-
4510- Standard options:
4511-`-help'
4512- Print help text, then exit.
4513-
4514-`-version'
4515- Print version number, then exit.
4516-
4517-`-JOPTION'
4518- Pass argument to the Java runtime.
4519-
4520- java(1), ...
4521-
4522-
4523-File: cp-tools.info, Node: tnameserv Tool, Prev: rmiregistry Tool, Up: Other Tools
4524-
4525-3.9 The `tnameserv' Tool
4526-========================
4527-
4528-To be written ...
4529-
4530-`-ORBInitialPort PORT'
4531- Port on which naming service is to be started.
4532-
4533-`-ior FILE'
4534- File in which to store naming service's IOR reference.
4535-
4536- Standard options:
4537-`-help'
4538- Print help text, then exit.
4539-
4540-`-version'
4541- Print version number, then exit.
4542-
4543-`-JOPTION'
4544- Pass argument to the Java runtime.
4545-
4546- java(1), ...
4547-
4548-
4549-File: cp-tools.info, Node: I18N Issues, Prev: Other Tools, Up: Top
4550-
4551-4 I18N Issues
4552-*************
4553-
4554-Some tools -*note Security Tools::- allow using other than the English
4555-language when prompting the User for input, and outputing messages.
4556-This chapter describes the elements used to offer this support and how
4557-they can be adapted for use with specific languages.
4558-
4559-* Menu:
4560-
4561-* Language Resources:: Where resources are located
4562-* Message Formats:: How messages are internationalized
4563-
4564-
4565-File: cp-tools.info, Node: Language Resources, Next: Message Formats, Prev: I18N Issues, Up: I18N Issues
4566-
4567-4.1 Language-specific resources
4568-===============================
4569-
4570-The Tools use Java `ResourceBundle's to store messages, and message
4571-templates they use at runtime to generate the message text itself,
4572-depending on the locale in use at the time.
4573-
4574- The Resource Bundles these tools use are essentially Java Properties
4575-files consisting of a set of Name/Value pairs. The Name is the Propery
4576-Name and the Value is a substitution string that is used when the code
4577-references the associated Name. For example the following is a line in
4578-a Resource Bundle used by the `keytool' Tool:
4579-
4580- Command.23=A correct key password MUST be provided
4581-
4582- When the tool needs to signal a mandatory but missing key password,
4583-it would reference the property named `Command.23' and the message "`A
4584-correct key password MUST be provided'" will be used instead. This
4585-indirect referencing of "resources" permits replacing, as late as
4586-possible, the English strings with strings in other languages, provided
4587-of course Resource Bundles in those languages are provided.
4588-
4589- For the GNU Classpath Tools described in this Guide, the Resource
4590-Bundles are files named `messages[_ll[_CC[_VV]]].properties' where:
4591-
4592-LL
4593- Is the 2-letter code for the Language,
4594-
4595-CC
4596- Is the 2-letter code for the Region, and
4597-
4598-VV
4599- Is the 2-letter code for the Variant of the language.
4600-
4601- The complete list of language codes can be found at Code for the
4602-representation of names of languages
4603-(http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt). A similar
4604-list for the region codes can be found at ISO 3166 Codes (Countries)
4605-(http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html).
4606-
4607- The location of the Resource Bundles for the GNU Classpath Tools is
4608-specific to each tool. The next table shows where these files are found
4609-in a standard GNU Classpath distribution:
4610-
4611-`jarsigner'
4612- `gnu/classpath/tools/jarsigner'
4613-
4614-`keytool'
4615- `gnu/classpath/tools/keytool'
4616-
4617- The collection of Resource Bundles in a location act as an inverted
4618-tree with a parent-child relationship. For example suppose in the
4619-`gnu/classpath/tools/keytool' there are 3 message bundles named:
4620-
4621- 1. `messages.properties'
4622-
4623- 2. `messages_fr.properties'
4624-
4625- 3. `messages_fr_FR.properties'
4626-
4627- In the above example, bundle #1 will act as the parent of bundle #2,
4628-which in turn will act as the parent for bundle #3. This ordering is
4629-used by the Java runtime to choose which file to load based on the set
4630-Locale. For example if the Locale is `fr_CH', `messages_fr.properties'
4631-will be used because (a) `messages_fr_CH.properties' does not exist,
4632-but (b) `messages_fr.properties' is the parent for the required bundle,
4633-and it exists. As another example, suppose the Locale was set to
4634-`en_AU'; then the tool will end up using `messages.properties' because
4635-(a) `messages_en_AU.properties' does not exist, (b)
4636-`messages_en.properties' which is the parent for the required bundle
4637-does not exist, but (c) `messages.properties' exists and is the root of
4638-the hierarchy.
4639-
4640- You can see from the examples above that `messages.properties' is
4641-the safety net that the Java runtime falls back to when failing to find
4642-a specific bunlde and its parent(s). This file is always provided with
4643-the Tool. In time, more localized versions will be included to cater
4644-for other languages.
4645-
4646- In the meantime, if you are willing to contribute localized versions
4647-of these resources, grab the `messages.properties' for a specific tool;
4648-translate it; save it with the appropriate language and region suffix
4649-and mail it to `classpath@gnu.org'.
4650-
4651-
4652-File: cp-tools.info, Node: Message Formats, Prev: Language Resources, Up: I18N Issues
4653-
4654-4.2 Message formats
4655-===================
4656-
4657-If you open any of the `messages.properties' described in the previous
4658-section, you may see properties that look like so:
4659-
4660- Command.67=Issuer: {0}
4661- Command.68=Serial number: {0,number}
4662- Command.69=Valid from: {0,date,full} - {0,time,full}
4663- Command.70=\ \ \ \ \ until: {0,date,full} - {0,time,full}
4664-
4665- These are Message Formats used by the tools to customize a text
4666-string that will then be used either as a prompt for User input or as
4667-output.
4668-
4669- If you are translating a `messages.properties' be careful not to
4670-alter text between curly braces.
4671-
4672-
4673-
4674-Tag Table:
4675-Node: Top445
4676-Node: Applet Tools3894
4677-Node: appletviewer Tool4467
4678-Node: gcjwebplugin7582
4679-Node: Security Tools7894
4680-Node: jarsigner Tool8547
4681-Node: Common jarsigner Options9594
4682-Node: Signing Options10909
4683-Node: Verification Options13491
4684-Node: keytool Tool14079
4685-Node: Getting Help18507
4686-Node: Common keytool Options19251
4687-Ref: alias19524
4688-Ref: keyalg19906
4689-Ref: keysize20136
4690-Ref: validity20401
4691-Ref: storetype20616
4692-Ref: storepass20947
4693-Ref: keystore21144
4694-Ref: provider21687
4695-Ref: file22094
4696-Ref: verbose22565
4697-Node: Distinguished Names22657
4698-Ref: dn22851
4699-Node: Add/Update Commands23914
4700-Node: Command -genkey24442
4701-Node: Command -import26850
4702-Node: Command -selfcert29994
4703-Node: Command -cacert32173
4704-Node: Command -identitydb33226
4705-Node: Export Commands33884
4706-Node: Command -certreq34200
4707-Node: Command -export36606
4708-Node: Display Commands37803
4709-Node: Command -list38135
4710-Node: Command -printcert39268
4711-Node: Management Commands39652
4712-Node: Command -keyclone40084
4713-Node: Command -storepasswd41487
4714-Node: Command -keypasswd42216
4715-Node: Command -delete43410
4716-Node: Other Tools44033
4717-Node: jar Tool44818
4718-Node: javah Tool46210
4719-Node: gcjh Tool47429
4720-Node: native2ascii Tool48542
4721-Node: orbd Tool49003
4722-Node: serialver Tool49733
4723-Node: rmid Tool50202
4724-Node: rmiregistry Tool51143
4725-Node: tnameserv Tool51983
4726-Node: I18N Issues52473
4727-Node: Language Resources52974
4728-Node: Message Formats56637
4729-
4730-End Tag Table
4731diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gappletviewer.1 gcc-4.3.3/libjava/classpath/doc/gappletviewer.1
4732--- gcc-4.3.3.orig/libjava/classpath/doc/gappletviewer.1 2009-01-24 04:05:54.000000000 -0800
4733+++ gcc-4.3.3/libjava/classpath/doc/gappletviewer.1 1969-12-31 16:00:00.000000000 -0800
4734@@ -1,244 +0,0 @@
4735-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
4736-.\"
4737-.\" Standard preamble:
4738-.\" ========================================================================
4739-.de Sh \" Subsection heading
4740-.br
4741-.if t .Sp
4742-.ne 5
4743-.PP
4744-\fB\\$1\fR
4745-.PP
4746-..
4747-.de Sp \" Vertical space (when we can't use .PP)
4748-.if t .sp .5v
4749-.if n .sp
4750-..
4751-.de Vb \" Begin verbatim text
4752-.ft CW
4753-.nf
4754-.ne \\$1
4755-..
4756-.de Ve \" End verbatim text
4757-.ft R
4758-.fi
4759-..
4760-.\" Set up some character translations and predefined strings. \*(-- will
4761-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
4762-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
4763-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
4764-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
4765-.\" nothing in troff, for use with C<>.
4766-.tr \(*W-
4767-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
4768-.ie n \{\
4769-. ds -- \(*W-
4770-. ds PI pi
4771-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
4772-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
4773-. ds L" ""
4774-. ds R" ""
4775-. ds C` ""
4776-. ds C' ""
4777-'br\}
4778-.el\{\
4779-. ds -- \|\(em\|
4780-. ds PI \(*p
4781-. ds L" ``
4782-. ds R" ''
4783-'br\}
4784-.\"
4785-.\" Escape single quotes in literal strings from groff's Unicode transform.
4786-.ie \n(.g .ds Aq \(aq
4787-.el .ds Aq '
4788-.\"
4789-.\" If the F register is turned on, we'll generate index entries on stderr for
4790-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
4791-.\" entries marked with X<> in POD. Of course, you'll have to process the
4792-.\" output yourself in some meaningful fashion.
4793-.ie \nF \{\
4794-. de IX
4795-. tm Index:\\$1\t\\n%\t"\\$2"
4796-..
4797-. nr % 0
4798-. rr F
4799-.\}
4800-.el \{\
4801-. de IX
4802-..
4803-.\}
4804-.\"
4805-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
4806-.\" Fear. Run. Save yourself. No user-serviceable parts.
4807-. \" fudge factors for nroff and troff
4808-.if n \{\
4809-. ds #H 0
4810-. ds #V .8m
4811-. ds #F .3m
4812-. ds #[ \f1
4813-. ds #] \fP
4814-.\}
4815-.if t \{\
4816-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
4817-. ds #V .6m
4818-. ds #F 0
4819-. ds #[ \&
4820-. ds #] \&
4821-.\}
4822-. \" simple accents for nroff and troff
4823-.if n \{\
4824-. ds ' \&
4825-. ds ` \&
4826-. ds ^ \&
4827-. ds , \&
4828-. ds ~ ~
4829-. ds /
4830-.\}
4831-.if t \{\
4832-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
4833-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
4834-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
4835-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
4836-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
4837-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
4838-.\}
4839-. \" troff and (daisy-wheel) nroff accents
4840-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
4841-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
4842-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
4843-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
4844-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
4845-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
4846-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
4847-.ds ae a\h'-(\w'a'u*4/10)'e
4848-.ds Ae A\h'-(\w'A'u*4/10)'E
4849-. \" corrections for vroff
4850-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
4851-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
4852-. \" for low resolution devices (crt and lpr)
4853-.if \n(.H>23 .if \n(.V>19 \
4854-\{\
4855-. ds : e
4856-. ds 8 ss
4857-. ds o a
4858-. ds d- d\h'-1'\(ga
4859-. ds D- D\h'-1'\(hy
4860-. ds th \o'bp'
4861-. ds Th \o'LP'
4862-. ds ae ae
4863-. ds Ae AE
4864-.\}
4865-.rm #[ #] #H #V #F C
4866-.\" ========================================================================
4867-.\"
4868-.IX Title "GAPPLETVIEWER 1"
4869-.TH GAPPLETVIEWER 1 "2009-01-24" "0.96-pre" "GNU"
4870-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
4871-.\" way too many mistakes in technical documents.
4872-.if n .ad l
4873-.nh
4874-.SH "NAME"
4875-gappletviewer \- Load and runs an applet
4876-.SH "SYNOPSIS"
4877-.IX Header "SYNOPSIS"
4878-appletviewer [\fI\s-1OPTION\s0\fR]... \fI\s-1URL\s0\fR...
4879-.PP
4880-appletviewer [\fI\s-1OPTION\s0\fR]... \fB\-code\fR \fI\s-1CODE\s0\fR
4881-.PP
4882-appletviewer [\fI\s-1OPTION\s0\fR]... \fB\-plugin\fR \fI\s-1INPUT\s0\fR,\fI\s-1OUTPUT\s0\fR
4883-.SH "DESCRIPTION"
4884-.IX Header "DESCRIPTION"
4885-The \fBappletviewer\fR tool loads and runs an applet.
4886-.PP
4887-Use the first form to test applets specified by tag. The \s-1URL\s0 should
4888-resolve to an \s-1HTML\s0 document from which the \fBappletviewer\fR will
4889-extract applet tags. The \s-1APPLET\s0, \s-1EMBED\s0 and \s-1OBJECT\s0 tags are supported.
4890-If a given document contains multiple applet tags, all the applets
4891-will be loaded, with each applet appearing in its own window.
4892-Likewise, when multiple URLs are specified, each applet tag instance
4893-is given its own window. If a given document contains no recognized
4894-tags the \fBappletviewer\fR does nothing.
4895-.PP
4896-.Vb 1
4897-\& appletviewer http://www.gnu.org/software/classpath/
4898-.Ve
4899-.PP
4900-Use the second form to test an applet in development. This form
4901-allows applet tag attributes to be supplied on the command line. Only
4902-one applet may be specified using the \fB\-code\fR option. The
4903-\&\fB\-code\fR option overrides the \s-1URL\s0 form \*(-- any URLs specified will
4904-be ignored.
4905-.PP
4906-.Vb 1
4907-\& appletviewer \-code Test.class \-param datafile,data.txt
4908-.Ve
4909-.PP
4910-\&\fBgcjwebplugin\fR uses the third form to communicate with the
4911-\&\fBappletviewer\fR through named pipes.
4912-.SH "OPTIONS"
4913-.IX Header "OPTIONS"
4914-\&\s-1URL\s0 \s-1OPTIONS\s0
4915-.IP "\fB\-debug\fR" 4
4916-.IX Item "-debug"
4917-This option is not yet implemented but is provided for compatibility.
4918-.IP "\fB\-encoding\fR \fI\s-1CHARSET\s0\fR" 4
4919-.IX Item "-encoding CHARSET"
4920-Use this option to specify an alternate character encoding for the
4921-specified \s-1HTML\s0 page.
4922-.PP
4923-\&\s-1APPLET\s0 \s-1TAG\s0 \s-1OPTIONS\s0
4924-.IP "\fB\-code\fR \fI\s-1CODE\s0\fR" 4
4925-.IX Item "-code CODE"
4926-Use the \fB\-code\fR option to specify the value of the applet tag
4927-\&\fI\s-1CODE\s0\fR attribute.
4928-.IP "\fB\-codebase\fR \fI\s-1CODEBASE\s0\fR" 4
4929-.IX Item "-codebase CODEBASE"
4930-Use the \fB\-codebase\fR option to specify the value of the applet tag
4931-\&\fI\s-1CODEBASE\s0\fR attribute.
4932-.IP "\fB\-archive\fR \fI\s-1ARCHIVE\s0\fR" 4
4933-.IX Item "-archive ARCHIVE"
4934-Use the \fB\-archive\fR option to specify the value of the applet tag
4935-\&\fI\s-1ARCHIVE\s0\fR attribute.
4936-.IP "\fB\-width\fR \fI\s-1WIDTH\s0\fR" 4
4937-.IX Item "-width WIDTH"
4938-Use the \fB\-width\fR option to specify the value of the applet tag
4939-\&\fI\s-1WIDTH\s0\fR attribute.
4940-.IP "\fB\-height\fR \fI\s-1HEIGHT\s0\fR" 4
4941-.IX Item "-height HEIGHT"
4942-Use the \fB\-height\fR option to specify the value of the applet tag
4943-\&\fI\s-1HEIGHT\s0\fR attribute.
4944-.IP "\fB\-param\fR \fI\s-1NAME\s0\fR\fB,\fR\fI\s-1VALUE\s0\fR" 4
4945-.IX Item "-param NAME,VALUE"
4946-Use the \fB\-param\fR option to specify values for the \fI\s-1NAME\s0\fR
4947-and \fI\s-1VALUE\s0\fR attributes of an applet \s-1PARAM\s0 tag.
4948-.PP
4949-\&\s-1PLUGIN\s0 \s-1OPTION\s0
4950-.IP "\fB\-plugin\fR \fI\s-1INPUT\s0\fR\fB,\fR\fI\s-1OUTPUT\s0\fR" 4
4951-.IX Item "-plugin INPUT,OUTPUT"
4952-\&\fBgcjwebplugin\fR uses the \fB\-plugin\fR option to specify the
4953-named pipe the \fBappletviewer\fR should use for receiving commands
4954-(\fI\s-1INPUT\s0\fR) and the one it should use for sending commands to
4955-\&\fBgcjwebplugin\fR (\fI\s-1OUTPUT\s0\fR).
4956-.PP
4957-\&\s-1DEBUGGING\s0 \s-1OPTION\s0
4958-.IP "\fB\-verbose\fR" 4
4959-.IX Item "-verbose"
4960-Use the \fB\-verbose\fR option to have the \fBappletviewer\fR print
4961-debugging messages.
4962-.PP
4963-\&\s-1STANDARD\s0 \s-1OPTIONS\s0
4964-.IP "\fB\-help\fR" 4
4965-.IX Item "-help"
4966-Use the \fB\-help\fR option to have the \fBappletviewer\fR print a
4967-usage message, then exit.
4968-.IP "\fB\-version\fR" 4
4969-.IX Item "-version"
4970-Use the \fB\-version\fR option to have the \fBappletviewer\fR print
4971-its version, then exit.
4972-.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
4973-.IX Item "-JOPTION"
4974-Use the \fB\-J\fR option to pass \fI\s-1OPTION\s0\fR to the virtual machine that
4975-will run the \fBappletviewer\fR. Unlike other options, there must
4976-not be a space between the \fB\-J\fR and \fI\s-1OPTION\s0\fR.
4977-.SH "SEE ALSO"
4978-.IX Header "SEE ALSO"
4979diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gjar.1 gcc-4.3.3/libjava/classpath/doc/gjar.1
4980--- gcc-4.3.3.orig/libjava/classpath/doc/gjar.1 2009-01-24 04:05:54.000000000 -0800
4981+++ gcc-4.3.3/libjava/classpath/doc/gjar.1 1969-12-31 16:00:00.000000000 -0800
4982@@ -1,211 +0,0 @@
4983-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
4984-.\"
4985-.\" Standard preamble:
4986-.\" ========================================================================
4987-.de Sh \" Subsection heading
4988-.br
4989-.if t .Sp
4990-.ne 5
4991-.PP
4992-\fB\\$1\fR
4993-.PP
4994-..
4995-.de Sp \" Vertical space (when we can't use .PP)
4996-.if t .sp .5v
4997-.if n .sp
4998-..
4999-.de Vb \" Begin verbatim text
5000-.ft CW
5001-.nf
5002-.ne \\$1
5003-..
5004-.de Ve \" End verbatim text
5005-.ft R
5006-.fi
5007-..
5008-.\" Set up some character translations and predefined strings. \*(-- will
5009-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
5010-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
5011-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
5012-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
5013-.\" nothing in troff, for use with C<>.
5014-.tr \(*W-
5015-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
5016-.ie n \{\
5017-. ds -- \(*W-
5018-. ds PI pi
5019-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
5020-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
5021-. ds L" ""
5022-. ds R" ""
5023-. ds C` ""
5024-. ds C' ""
5025-'br\}
5026-.el\{\
5027-. ds -- \|\(em\|
5028-. ds PI \(*p
5029-. ds L" ``
5030-. ds R" ''
5031-'br\}
5032-.\"
5033-.\" Escape single quotes in literal strings from groff's Unicode transform.
5034-.ie \n(.g .ds Aq \(aq
5035-.el .ds Aq '
5036-.\"
5037-.\" If the F register is turned on, we'll generate index entries on stderr for
5038-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
5039-.\" entries marked with X<> in POD. Of course, you'll have to process the
5040-.\" output yourself in some meaningful fashion.
5041-.ie \nF \{\
5042-. de IX
5043-. tm Index:\\$1\t\\n%\t"\\$2"
5044-..
5045-. nr % 0
5046-. rr F
5047-.\}
5048-.el \{\
5049-. de IX
5050-..
5051-.\}
5052-.\"
5053-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
5054-.\" Fear. Run. Save yourself. No user-serviceable parts.
5055-. \" fudge factors for nroff and troff
5056-.if n \{\
5057-. ds #H 0
5058-. ds #V .8m
5059-. ds #F .3m
5060-. ds #[ \f1
5061-. ds #] \fP
5062-.\}
5063-.if t \{\
5064-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
5065-. ds #V .6m
5066-. ds #F 0
5067-. ds #[ \&
5068-. ds #] \&
5069-.\}
5070-. \" simple accents for nroff and troff
5071-.if n \{\
5072-. ds ' \&
5073-. ds ` \&
5074-. ds ^ \&
5075-. ds , \&
5076-. ds ~ ~
5077-. ds /
5078-.\}
5079-.if t \{\
5080-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
5081-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
5082-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
5083-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
5084-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
5085-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
5086-.\}
5087-. \" troff and (daisy-wheel) nroff accents
5088-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
5089-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
5090-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
5091-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
5092-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
5093-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
5094-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
5095-.ds ae a\h'-(\w'a'u*4/10)'e
5096-.ds Ae A\h'-(\w'A'u*4/10)'E
5097-. \" corrections for vroff
5098-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
5099-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
5100-. \" for low resolution devices (crt and lpr)
5101-.if \n(.H>23 .if \n(.V>19 \
5102-\{\
5103-. ds : e
5104-. ds 8 ss
5105-. ds o a
5106-. ds d- d\h'-1'\(ga
5107-. ds D- D\h'-1'\(hy
5108-. ds th \o'bp'
5109-. ds Th \o'LP'
5110-. ds ae ae
5111-. ds Ae AE
5112-.\}
5113-.rm #[ #] #H #V #F C
5114-.\" ========================================================================
5115-.\"
5116-.IX Title "GJAR 1"
5117-.TH GJAR 1 "2009-01-24" "0.96-pre" "GNU"
5118-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
5119-.\" way too many mistakes in technical documents.
5120-.if n .ad l
5121-.nh
5122-.SH "NAME"
5123-gjar \- \- Archive tool for Java archives
5124-.SH "SYNOPSIS"
5125-.IX Header "SYNOPSIS"
5126-gjar \fB\-ctxui\fR [\fI\s-1OPTIONS\s0\fR] \fIjar-file\fR [\fB\-C\fR \fI\s-1DIR\s0\fR \fI\s-1FILE\s0\fR] \fI\s-1FILE\s0\fR...
5127-.SH "DESCRIPTION"
5128-.IX Header "DESCRIPTION"
5129-\&\fBgjar\fR is an implementation of Sun's jar utility that comes with
5130-the \s-1JDK\s0.
5131-.PP
5132-If any file is a directory then it is processed recursively. The
5133-manifest file name and the archive file name needs to be specified in
5134-the same order the \fB\-m\fR and \fB\-f\fR flags are specified.
5135-.SH "OPTIONS"
5136-.IX Header "OPTIONS"
5137-Operation mode:
5138-.IP "\fB\-c\fR" 4
5139-.IX Item "-c"
5140-Create new archive.
5141-.IP "\fB\-t\fR" 4
5142-.IX Item "-t"
5143-List table of contents for archive.
5144-.IP "\fB\-x\fR" 4
5145-.IX Item "-x"
5146-Extract named (or all) files from archive.
5147-.IP "\fB\-u\fR" 4
5148-.IX Item "-u"
5149-Update existing archive.
5150-.IP "\fB\-i\fR \fI\s-1FILE\s0\fR" 4
5151-.IX Item "-i FILE"
5152-Compute archive index.
5153-.PP
5154-Operation modifiers:
5155-.IP "\fB\-f\fR \fI\s-1FILE\s0\fR" 4
5156-.IX Item "-f FILE"
5157-Specify archive file name.
5158-.IP "\fB\-0\fR" 4
5159-.IX Item "-0"
5160-Store only; use no \s-1ZIP\s0 compression.
5161-.IP "\fB\-v\fR" 4
5162-.IX Item "-v"
5163-Generate verbose output on standard output.
5164-.IP "\fB\-M\fR" 4
5165-.IX Item "-M"
5166-Do not create a manifest file for the entries.
5167-.IP "\fB\-m\fR \fImanifest\fR" 4
5168-.IX Item "-m manifest"
5169-Include manifest information from specified \fImanifest\fR file.
5170-.PP
5171-File name selection:
5172-.IP "\fB\-C\fR \fI\s-1DIR\s0\fR\fB \fR\fI\s-1FILE\s0\fR" 4
5173-.IX Item "-C DIR FILE"
5174-Change to the \fI\s-1DIR\s0\fR and include the following \fI\s-1FILE\s0\fR.
5175-.IP "\fB\-@\fR" 4
5176-.IX Item "-@"
5177-Read the names of the files to add to the archive from stdin. This
5178-option is supported only in combination with \fB\-c\fR or \fB\-u\fR.
5179-Non standard option added in the \s-1GCC\s0 version.
5180-.PP
5181-Standard options:
5182-.IP "\fB\-help\fR" 4
5183-.IX Item "-help"
5184-Print help text, then exit.
5185-.IP "\fB\-version\fR" 4
5186-.IX Item "-version"
5187-Print version number, then exit.
5188-.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
5189-.IX Item "-JOPTION"
5190-Pass argument to the Java runtime.
5191-.SH "SEE ALSO"
5192-.IX Header "SEE ALSO"
5193-\&\fIjava\fR\|(1), ...
5194diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gjarsigner.1 gcc-4.3.3/libjava/classpath/doc/gjarsigner.1
5195--- gcc-4.3.3.orig/libjava/classpath/doc/gjarsigner.1 2009-01-24 04:05:55.000000000 -0800
5196+++ gcc-4.3.3/libjava/classpath/doc/gjarsigner.1 1969-12-31 16:00:00.000000000 -0800
5197@@ -1,216 +0,0 @@
5198-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
5199-.\"
5200-.\" Standard preamble:
5201-.\" ========================================================================
5202-.de Sh \" Subsection heading
5203-.br
5204-.if t .Sp
5205-.ne 5
5206-.PP
5207-\fB\\$1\fR
5208-.PP
5209-..
5210-.de Sp \" Vertical space (when we can't use .PP)
5211-.if t .sp .5v
5212-.if n .sp
5213-..
5214-.de Vb \" Begin verbatim text
5215-.ft CW
5216-.nf
5217-.ne \\$1
5218-..
5219-.de Ve \" End verbatim text
5220-.ft R
5221-.fi
5222-..
5223-.\" Set up some character translations and predefined strings. \*(-- will
5224-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
5225-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
5226-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
5227-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
5228-.\" nothing in troff, for use with C<>.
5229-.tr \(*W-
5230-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
5231-.ie n \{\
5232-. ds -- \(*W-
5233-. ds PI pi
5234-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
5235-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
5236-. ds L" ""
5237-. ds R" ""
5238-. ds C` ""
5239-. ds C' ""
5240-'br\}
5241-.el\{\
5242-. ds -- \|\(em\|
5243-. ds PI \(*p
5244-. ds L" ``
5245-. ds R" ''
5246-'br\}
5247-.\"
5248-.\" Escape single quotes in literal strings from groff's Unicode transform.
5249-.ie \n(.g .ds Aq \(aq
5250-.el .ds Aq '
5251-.\"
5252-.\" If the F register is turned on, we'll generate index entries on stderr for
5253-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
5254-.\" entries marked with X<> in POD. Of course, you'll have to process the
5255-.\" output yourself in some meaningful fashion.
5256-.ie \nF \{\
5257-. de IX
5258-. tm Index:\\$1\t\\n%\t"\\$2"
5259-..
5260-. nr % 0
5261-. rr F
5262-.\}
5263-.el \{\
5264-. de IX
5265-..
5266-.\}
5267-.\"
5268-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
5269-.\" Fear. Run. Save yourself. No user-serviceable parts.
5270-. \" fudge factors for nroff and troff
5271-.if n \{\
5272-. ds #H 0
5273-. ds #V .8m
5274-. ds #F .3m
5275-. ds #[ \f1
5276-. ds #] \fP
5277-.\}
5278-.if t \{\
5279-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
5280-. ds #V .6m
5281-. ds #F 0
5282-. ds #[ \&
5283-. ds #] \&
5284-.\}
5285-. \" simple accents for nroff and troff
5286-.if n \{\
5287-. ds ' \&
5288-. ds ` \&
5289-. ds ^ \&
5290-. ds , \&
5291-. ds ~ ~
5292-. ds /
5293-.\}
5294-.if t \{\
5295-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
5296-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
5297-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
5298-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
5299-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
5300-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
5301-.\}
5302-. \" troff and (daisy-wheel) nroff accents
5303-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
5304-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
5305-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
5306-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
5307-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
5308-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
5309-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
5310-.ds ae a\h'-(\w'a'u*4/10)'e
5311-.ds Ae A\h'-(\w'A'u*4/10)'E
5312-. \" corrections for vroff
5313-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
5314-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
5315-. \" for low resolution devices (crt and lpr)
5316-.if \n(.H>23 .if \n(.V>19 \
5317-\{\
5318-. ds : e
5319-. ds 8 ss
5320-. ds o a
5321-. ds d- d\h'-1'\(ga
5322-. ds D- D\h'-1'\(hy
5323-. ds th \o'bp'
5324-. ds Th \o'LP'
5325-. ds ae ae
5326-. ds Ae AE
5327-.\}
5328-.rm #[ #] #H #V #F C
5329-.\" ========================================================================
5330-.\"
5331-.IX Title "GJARSIGNER 1"
5332-.TH GJARSIGNER 1 "2009-01-24" "0.96-pre" "GNU"
5333-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
5334-.\" way too many mistakes in technical documents.
5335-.if n .ad l
5336-.nh
5337-.SH "NAME"
5338-gjarsigner \- Java ARchive (JAR) file signing and verification tool
5339-.SH "SYNOPSIS"
5340-.IX Header "SYNOPSIS"
5341-jarsigner [\fI\s-1OPTION\s0\fR]... \fI\s-1FILE\s0\fR \fI\s-1ALIAS\s0\fR
5342-.PP
5343-jarsigner \fB\-verify\fR [\fI\s-1OPTION\s0\fR]... \fI\s-1FILE\s0\fR
5344-.SH "DESCRIPTION"
5345-.IX Header "DESCRIPTION"
5346-When the first form is used, the tool signs the designated \s-1JAR\s0 file. The second form, on the other hand, is used to verify a previously signed \s-1JAR\s0 file.
5347-.PP
5348-\&\fI\s-1FILE\s0\fR is the .JAR file to process; i.e. to sign if the first syntax form is used, or to verify if the second syntax form is used instead.
5349-.PP
5350-\&\fI\s-1ALIAS\s0\fR must be a known \fIAlias\fR of a \fIKey Entry\fR in the designated \fIKey Store\fR. The private key material associated with this \fIAlias\fR is then used for signing the designated .JAR file.
5351-.SH "OPTIONS"
5352-.IX Header "OPTIONS"
5353-\fICommon options\fR
5354-.IX Subsection "Common options"
5355-.PP
5356-The following options may be used when the tool is used for either signing, or verifying, a .JAR file.
5357-.IP "\fB\-verbose\fR" 4
5358-.IX Item "-verbose"
5359-Use this option to force the tool to generate more verbose messages, during its processing.
5360-.IP "\fB\-internalsf\fR" 4
5361-.IX Item "-internalsf"
5362-When present, the tool will include \-\-which otherwise it does not\*(-- the \f(CW\*(C`.SF\*(C'\fR file in the \f(CW\*(C`.DSA\*(C'\fR generated file.
5363-.IP "\fB\-sectionsonly\fR" 4
5364-.IX Item "-sectionsonly"
5365-When present, the tool will include in the \f(CW\*(C`.SF\*(C'\fR generated file \-\-which otherwise it does not\*(-- a header containing a hash of the whole manifest file. When that header is included, the tool can quickly check, during verification, if the hash (in the header) matches or not the manifest file.
5366-.IP "\fB\-provider \s-1PROVIDER_CLASS_NAME\s0\fR" 4
5367-.IX Item "-provider PROVIDER_CLASS_NAME"
5368-A fully qualified class name of a \fISecurity Provider\fR to add to the current list of \fISecurity Providers\fR already installed in the \s-1JVM\s0 in-use. If a provider class is specified with this option, and was successfully added to the runtime \-\-i.e. it was not already installed\*(-- then the tool will attempt to remove this \fISecurity Provider\fR before exiting.
5369-.IP "\fB\-help\fR" 4
5370-.IX Item "-help"
5371-Prints a help text similar to this one.
5372-.PP
5373-\fISigning options\fR
5374-.IX Subsection "Signing options"
5375-.PP
5376-The following options may be specified when using the tool for signing purposes.
5377-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
5378-.IX Item "-keystore URL"
5379-Use this option to specify the location of the key store to use. The default value is a file \s-1URL\s0 referencing the file named \fI.keystore\fR located in the path returned by the call to \f(CW\*(C`java.lang.System#getProperty(String)\*(C'\fR using \f(CW\*(C`user.home\*(C'\fR as argument.
5380-.Sp
5381-If a \s-1URL\s0 was specified, but was found to be malformed \-\-e.g. missing protocol element\*(-- the tool will attempt to use the \s-1URL\s0 value as a file-name (with absolute or relative path-name) of a key store \-\-as if the protocol was \f(CW\*(C`file:\*(C'\fR.
5382-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
5383-.IX Item "-storetype STORE_TYPE"
5384-Use this option to specify the type of the key store to use. The default value, if this option is omitted, is that of the property \f(CW\*(C`keystore.type\*(C'\fR in the security properties file, which is obtained by invoking the static method call \f(CW\*(C`getDefaultType()\*(C'\fR in \f(CW\*(C`java.security.KeyStore\*(C'\fR.
5385-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
5386-.IX Item "-storepass PASSWORD"
5387-Use this option to specify the password which will be used to unlock the key store. If this option is missing, the User will be prompted to provide a password.
5388-.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
5389-.IX Item "-keypass PASSWORD"
5390-Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
5391-.Sp
5392-If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
5393-.IP "\fB\-sigfile\fR \fI\s-1NAME\s0\fR" 4
5394-.IX Item "-sigfile NAME"
5395-Use this option to designate a literal that will be used to construct file names for both the \f(CW\*(C`.SF\*(C'\fR and \f(CW\*(C`.DSA\*(C'\fR signature files. These files will be generated, by the tool, and placed in the \fIMETA-INF\fR directory of the signed \s-1JAR\s0. Permissible characters for \fI\s-1NAME\s0\fR must be in the range \*(L"a\-zA\-Z0\-9_\-\*(R". All characters will be converted to upper-case ones.
5396-.Sp
5397-If this option is missing, the first eight characters of the \fI\s-1ALIAS\s0\fR argument will be used. When this is the case, any character in \fI\s-1ALIAS\s0\fR that is outside the permissible range of characters will be replaced by an underscore.
5398-.IP "\fB\-signedjar\fR \fI\s-1FILE\s0\fR" 4
5399-.IX Item "-signedjar FILE"
5400-Use this option to specify the file name of the signed \s-1JAR\s0. If this option is omitted, then the signed \s-1JAR\s0 will be named the same as \fI\s-1FILE\s0\fR; i.e. the input \s-1JAR\s0 file will be replaced with the signed copy.
5401-.PP
5402-\fIVerification options\fR
5403-.IX Subsection "Verification options"
5404-.PP
5405-The following options may be specified when using the tool for verification purposes.
5406-.IP "\fB\-verify\fR" 4
5407-.IX Item "-verify"
5408-Use this option to indicate that the tool is to be used for verification purposes.
5409-.IP "\fB\-certs\fR" 4
5410-.IX Item "-certs"
5411-This option is used in conjunction with the \fB\-verbose\fR option. When present, along with the \fB\-verbose\fR option, the tool will print more detailed information about the certificates of the signer(s) being processed.
5412-.SH "SEE ALSO"
5413-.IX Header "SEE ALSO"
5414diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gjavah.1 gcc-4.3.3/libjava/classpath/doc/gjavah.1
5415--- gcc-4.3.3.orig/libjava/classpath/doc/gjavah.1 2009-01-24 04:05:55.000000000 -0800
5416+++ gcc-4.3.3/libjava/classpath/doc/gjavah.1 1969-12-31 16:00:00.000000000 -0800
5417@@ -1,207 +0,0 @@
5418-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
5419-.\"
5420-.\" Standard preamble:
5421-.\" ========================================================================
5422-.de Sh \" Subsection heading
5423-.br
5424-.if t .Sp
5425-.ne 5
5426-.PP
5427-\fB\\$1\fR
5428-.PP
5429-..
5430-.de Sp \" Vertical space (when we can't use .PP)
5431-.if t .sp .5v
5432-.if n .sp
5433-..
5434-.de Vb \" Begin verbatim text
5435-.ft CW
5436-.nf
5437-.ne \\$1
5438-..
5439-.de Ve \" End verbatim text
5440-.ft R
5441-.fi
5442-..
5443-.\" Set up some character translations and predefined strings. \*(-- will
5444-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
5445-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
5446-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
5447-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
5448-.\" nothing in troff, for use with C<>.
5449-.tr \(*W-
5450-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
5451-.ie n \{\
5452-. ds -- \(*W-
5453-. ds PI pi
5454-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
5455-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
5456-. ds L" ""
5457-. ds R" ""
5458-. ds C` ""
5459-. ds C' ""
5460-'br\}
5461-.el\{\
5462-. ds -- \|\(em\|
5463-. ds PI \(*p
5464-. ds L" ``
5465-. ds R" ''
5466-'br\}
5467-.\"
5468-.\" Escape single quotes in literal strings from groff's Unicode transform.
5469-.ie \n(.g .ds Aq \(aq
5470-.el .ds Aq '
5471-.\"
5472-.\" If the F register is turned on, we'll generate index entries on stderr for
5473-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
5474-.\" entries marked with X<> in POD. Of course, you'll have to process the
5475-.\" output yourself in some meaningful fashion.
5476-.ie \nF \{\
5477-. de IX
5478-. tm Index:\\$1\t\\n%\t"\\$2"
5479-..
5480-. nr % 0
5481-. rr F
5482-.\}
5483-.el \{\
5484-. de IX
5485-..
5486-.\}
5487-.\"
5488-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
5489-.\" Fear. Run. Save yourself. No user-serviceable parts.
5490-. \" fudge factors for nroff and troff
5491-.if n \{\
5492-. ds #H 0
5493-. ds #V .8m
5494-. ds #F .3m
5495-. ds #[ \f1
5496-. ds #] \fP
5497-.\}
5498-.if t \{\
5499-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
5500-. ds #V .6m
5501-. ds #F 0
5502-. ds #[ \&
5503-. ds #] \&
5504-.\}
5505-. \" simple accents for nroff and troff
5506-.if n \{\
5507-. ds ' \&
5508-. ds ` \&
5509-. ds ^ \&
5510-. ds , \&
5511-. ds ~ ~
5512-. ds /
5513-.\}
5514-.if t \{\
5515-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
5516-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
5517-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
5518-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
5519-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
5520-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
5521-.\}
5522-. \" troff and (daisy-wheel) nroff accents
5523-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
5524-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
5525-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
5526-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
5527-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
5528-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
5529-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
5530-.ds ae a\h'-(\w'a'u*4/10)'e
5531-.ds Ae A\h'-(\w'A'u*4/10)'E
5532-. \" corrections for vroff
5533-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
5534-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
5535-. \" for low resolution devices (crt and lpr)
5536-.if \n(.H>23 .if \n(.V>19 \
5537-\{\
5538-. ds : e
5539-. ds 8 ss
5540-. ds o a
5541-. ds d- d\h'-1'\(ga
5542-. ds D- D\h'-1'\(hy
5543-. ds th \o'bp'
5544-. ds Th \o'LP'
5545-. ds ae ae
5546-. ds Ae AE
5547-.\}
5548-.rm #[ #] #H #V #F C
5549-.\" ========================================================================
5550-.\"
5551-.IX Title "GJAVAH 1"
5552-.TH GJAVAH 1 "2009-01-24" "0.96-pre" "GNU"
5553-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
5554-.\" way too many mistakes in technical documents.
5555-.if n .ad l
5556-.nh
5557-.SH "NAME"
5558-gjavah \- \- generate header files from Java class files
5559-.SH "SYNOPSIS"
5560-.IX Header "SYNOPSIS"
5561-gjavah ...
5562-.SH "DESCRIPTION"
5563-.IX Header "DESCRIPTION"
5564-The \fBgjavah\fR program is used to generate header files from class
5565-files. It can generate both \s-1CNI\s0 and \s-1JNI\s0 header files, as well as stub
5566-implementation files which can be used as a basis for implementing the
5567-required native methods.
5568-.SH "OPTIONS"
5569-.IX Header "OPTIONS"
5570-.IP "\fB\-d\fR \fI\s-1DIR\s0\fR" 4
5571-.IX Item "-d DIR"
5572-Set output directory.
5573-.IP "\fB\-o\fR \fI\s-1FILE\s0\fR" 4
5574-.IX Item "-o FILE"
5575-Set output file (only one of \fB\-d\fR or \fB\-o\fR may be used).
5576-.IP "\fB\-cmdfile\fR \fI\s-1FILE\s0\fR" 4
5577-.IX Item "-cmdfile FILE"
5578-Read command file.
5579-.IP "\fB\-all\fR \fI\s-1DIR\s0\fR" 4
5580-.IX Item "-all DIR"
5581-Operate on all class files under directory \fI\s-1DIR\s0\fR.
5582-.IP "\fB\-stubs\fR" 4
5583-.IX Item "-stubs"
5584-Emit stub implementation.
5585-.IP "\fB\-jni\fR" 4
5586-.IX Item "-jni"
5587-Emit \s-1JNI\s0 stubs or header (default).
5588-.IP "\fB\-cni\fR" 4
5589-.IX Item "-cni"
5590-Emit \s-1CNI\s0 stubs or header (default \s-1JNI\s0).
5591-.IP "\fB\-verbose\fR" 4
5592-.IX Item "-verbose"
5593-Set verbose mode.
5594-.IP "\fB\-force\fR" 4
5595-.IX Item "-force"
5596-Output files should always be written.
5597-.PP
5598-Class path options:
5599-.IP "\fB\-classpath\fR \fI\s-1PATH\s0\fR" 4
5600-.IX Item "-classpath PATH"
5601-Set the class path.
5602-.IP "\fB\-I\fR\fI\s-1DIR\s0\fR" 4
5603-.IX Item "-IDIR"
5604-Add directory to class path.
5605-.IP "\fB\-bootclasspath\fR \fI\s-1PATH\s0\fR" 4
5606-.IX Item "-bootclasspath PATH"
5607-Set the boot class path.
5608-.IP "\fB\-extdirs\fR \fI\s-1PATH\s0\fR" 4
5609-.IX Item "-extdirs PATH"
5610-Set the extension directory path.
5611-.PP
5612-Standard options:
5613-.IP "\fB\-help\fR" 4
5614-.IX Item "-help"
5615-Print help text, then exit.
5616-.IP "\fB\-version\fR" 4
5617-.IX Item "-version"
5618-Print version number, then exit.
5619-.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
5620-.IX Item "-JOPTION"
5621-Pass argument to the Java runtime.
5622-.SH "SEE ALSO"
5623-.IX Header "SEE ALSO"
5624-\&\fIjavac\fR\|(1), ...
5625diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gkeytool.1 gcc-4.3.3/libjava/classpath/doc/gkeytool.1
5626--- gcc-4.3.3.orig/libjava/classpath/doc/gkeytool.1 2009-01-24 04:05:55.000000000 -0800
5627+++ gcc-4.3.3/libjava/classpath/doc/gkeytool.1 1969-12-31 16:00:00.000000000 -0800
5628@@ -1,692 +0,0 @@
5629-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
5630-.\"
5631-.\" Standard preamble:
5632-.\" ========================================================================
5633-.de Sh \" Subsection heading
5634-.br
5635-.if t .Sp
5636-.ne 5
5637-.PP
5638-\fB\\$1\fR
5639-.PP
5640-..
5641-.de Sp \" Vertical space (when we can't use .PP)
5642-.if t .sp .5v
5643-.if n .sp
5644-..
5645-.de Vb \" Begin verbatim text
5646-.ft CW
5647-.nf
5648-.ne \\$1
5649-..
5650-.de Ve \" End verbatim text
5651-.ft R
5652-.fi
5653-..
5654-.\" Set up some character translations and predefined strings. \*(-- will
5655-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
5656-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
5657-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
5658-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
5659-.\" nothing in troff, for use with C<>.
5660-.tr \(*W-
5661-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
5662-.ie n \{\
5663-. ds -- \(*W-
5664-. ds PI pi
5665-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
5666-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
5667-. ds L" ""
5668-. ds R" ""
5669-. ds C` ""
5670-. ds C' ""
5671-'br\}
5672-.el\{\
5673-. ds -- \|\(em\|
5674-. ds PI \(*p
5675-. ds L" ``
5676-. ds R" ''
5677-'br\}
5678-.\"
5679-.\" Escape single quotes in literal strings from groff's Unicode transform.
5680-.ie \n(.g .ds Aq \(aq
5681-.el .ds Aq '
5682-.\"
5683-.\" If the F register is turned on, we'll generate index entries on stderr for
5684-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
5685-.\" entries marked with X<> in POD. Of course, you'll have to process the
5686-.\" output yourself in some meaningful fashion.
5687-.ie \nF \{\
5688-. de IX
5689-. tm Index:\\$1\t\\n%\t"\\$2"
5690-..
5691-. nr % 0
5692-. rr F
5693-.\}
5694-.el \{\
5695-. de IX
5696-..
5697-.\}
5698-.\"
5699-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
5700-.\" Fear. Run. Save yourself. No user-serviceable parts.
5701-. \" fudge factors for nroff and troff
5702-.if n \{\
5703-. ds #H 0
5704-. ds #V .8m
5705-. ds #F .3m
5706-. ds #[ \f1
5707-. ds #] \fP
5708-.\}
5709-.if t \{\
5710-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
5711-. ds #V .6m
5712-. ds #F 0
5713-. ds #[ \&
5714-. ds #] \&
5715-.\}
5716-. \" simple accents for nroff and troff
5717-.if n \{\
5718-. ds ' \&
5719-. ds ` \&
5720-. ds ^ \&
5721-. ds , \&
5722-. ds ~ ~
5723-. ds /
5724-.\}
5725-.if t \{\
5726-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
5727-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
5728-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
5729-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
5730-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
5731-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
5732-.\}
5733-. \" troff and (daisy-wheel) nroff accents
5734-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
5735-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
5736-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
5737-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
5738-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
5739-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
5740-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
5741-.ds ae a\h'-(\w'a'u*4/10)'e
5742-.ds Ae A\h'-(\w'A'u*4/10)'E
5743-. \" corrections for vroff
5744-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
5745-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
5746-. \" for low resolution devices (crt and lpr)
5747-.if \n(.H>23 .if \n(.V>19 \
5748-\{\
5749-. ds : e
5750-. ds 8 ss
5751-. ds o a
5752-. ds d- d\h'-1'\(ga
5753-. ds D- D\h'-1'\(hy
5754-. ds th \o'bp'
5755-. ds Th \o'LP'
5756-. ds ae ae
5757-. ds Ae AE
5758-.\}
5759-.rm #[ #] #H #V #F C
5760-.\" ========================================================================
5761-.\"
5762-.IX Title "GKEYTOOL 1"
5763-.TH GKEYTOOL 1 "2009-01-24" "0.96-pre" "GNU"
5764-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
5765-.\" way too many mistakes in technical documents.
5766-.if n .ad l
5767-.nh
5768-.SH "NAME"
5769-gkeytool \- Manage private keys and public certificates
5770-.SH "SYNOPSIS"
5771-.IX Header "SYNOPSIS"
5772-keytool [\fI\s-1COMMAND\s0\fR] ...
5773-.SH "DESCRIPTION"
5774-.IX Header "DESCRIPTION"
5775-Cryptographic credentials, in a Java environment, are usually stored in a \fIKey Store\fR. The Java \s-1SDK\s0 specifies a \fIKey Store\fR as a persistent container of two types of objects: \fIKey Entries\fR and \fITrusted Certificates\fR. The security tool \fBkeytool\fR is a Java-based application for managing those types of objects.
5776-.PP
5777-A \fIKey Entry\fR represents the private key part of a key-pair used in Public-Key Cryptography, and a signed X.509 certificate which authenticates the public key part for a known entity; i.e. the owner of the key-pair. The X.509 certificate itself contains the public key part of the key-pair.
5778-.PP
5779-A \fITrusted Certificate\fR is a signed X.509 certificate issued by a trusted entity. The \fITrust\fR in this context is relative to the User of the \fBkeytool\fR. In other words, the existence of a \fITrusted Certificate\fR in the \fIKey Store\fR processed by a \fBkeytool\fR command implies that the User trusts the \fIIssuer\fR of that \fITrusted Certificate\fR to also sign, and hence authenticates, other \fISubjects\fR the tool may process.
5780-.PP
5781-\&\fITrusted Certificates\fR are important because they allow the tool to mechanically construct \fIChains of Trust\fR starting from one of the \fITrusted Certificates\fR in a \fIKey Store\fR and ending with a certificate whose \fIIssuer\fR is potentially unknown. A valid chain is an ordered list, starting with a \fITrusted Certificate\fR (also called the \fIanchor\fR), ending with the target certificate, and satisfying the condition that the \fISubject\fR of certificate \f(CW\*(C`#i\*(C'\fR is the \fIIssuer\fR of certificate \f(CW\*(C`#i + 1\*(C'\fR.
5782-.PP
5783-The \fBkeytool\fR is invoked from the command line as follows:
5784-.PP
5785-.Vb 1
5786-\& keytool [COMMAND] ...
5787-.Ve
5788-.PP
5789-Multiple \fI\s-1COMMAND\s0\fRs may be specified at once, each complete with its own options. \fBkeytool\fR will parse all the arguments, before processing, and executing, each \f(CW\*(C`COMMAND\*(C'\fR. If an exception occurs while executing one \fI\s-1COMMAND\s0\fR \fBkeytool\fR will abort. Note however that because the implementation of the tool uses code to parse command line options that also supports GNU-style options, you have to separate each command group with a double-hyphen; e.g
5790-.PP
5791-.Vb 1
5792-\& keytool \-list \-\- \-printcert \-alias mykey
5793-.Ve
5794-.SH "OPTIONS"
5795-.IX Header "OPTIONS"
5796-.IP "\- Add/Update commands" 4
5797-.IX Item "- Add/Update commands"
5798-.RS 4
5799-.PD 0
5800-.IP "\fB\-genkey [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5801-.IX Item "-genkey [OPTION]..."
5802-.PD
5803-Generate a new \fIKey Entry\fR, eventually creating a new key store.
5804-.IP "\fB\-import [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5805-.IX Item "-import [OPTION]..."
5806-Add, to a key store, \fIKey Entries\fR (private keys and certificate chains authenticating the public keys) and \fITrusted Certificates\fR (3rd party certificates which can be used as \fITrust Anchors\fR when building chains-of-trust).
5807-.IP "\fB\-selfcert [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5808-.IX Item "-selfcert [OPTION]..."
5809-Generate a new self-signed \fITrusted Certificate\fR.
5810-.IP "\fB\-cacert [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5811-.IX Item "-cacert [OPTION]..."
5812-Import a \s-1CA\s0 \fITrusted Certificate\fR.
5813-.IP "\fB\-identitydb [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5814-.IX Item "-identitydb [OPTION]..."
5815-\&\fB\s-1NOT\s0 \s-1IMPLEMENTED\s0 \s-1YET\s0\fR.Import a \s-1JDK\s0 1.1 style Identity Database.
5816-.RE
5817-.RS 4
5818-.RE
5819-.IP "\- Export commands" 4
5820-.IX Item "- Export commands"
5821-.RS 4
5822-.PD 0
5823-.IP "\fB\-certreq [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5824-.IX Item "-certreq [OPTION]..."
5825-.PD
5826-Issue a \fICertificate Signing Request\fR (\s-1CSR\s0) which can be then sent to a \fICertification Authority\fR (\s-1CA\s0) to issue a certificate signed (by the \s-1CA\s0) and authenticating the \fISubject\fR of the request.
5827-.IP "\fB\-export [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5828-.IX Item "-export [OPTION]..."
5829-Export a certificate from a key store.
5830-.RE
5831-.RS 4
5832-.RE
5833-.IP "\- Display commands" 4
5834-.IX Item "- Display commands"
5835-.RS 4
5836-.PD 0
5837-.IP "\fB\-list [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5838-.IX Item "-list [OPTION]..."
5839-.PD
5840-Print one or all certificates in a key store to \f(CW\*(C`STDOUT\*(C'\fR.
5841-.IP "\fB\-printcert [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5842-.IX Item "-printcert [OPTION]..."
5843-Print a human-readable form of a certificate, in a designated file, to \f(CW\*(C`STDOUT\*(C'\fR.
5844-.RE
5845-.RS 4
5846-.RE
5847-.IP "\- Management commands" 4
5848-.IX Item "- Management commands"
5849-.RS 4
5850-.PD 0
5851-.IP "\fB\-keyclone [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5852-.IX Item "-keyclone [OPTION]..."
5853-.PD
5854-Clone a \fIKey Entry\fR in a key store.
5855-.IP "\fB\-storepasswd [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5856-.IX Item "-storepasswd [OPTION]..."
5857-Change the password protecting a key store.
5858-.IP "\fB\-keypasswd [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5859-.IX Item "-keypasswd [OPTION]..."
5860-Change the password protecting a \fIKey Entry\fR in a key store.
5861-.IP "\fB\-delete [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4
5862-.IX Item "-delete [OPTION]..."
5863-Delete a \fIKey Entry\fR or a \fITrusted Certificate\fR from a key store.
5864-.RE
5865-.RS 4
5866-.RE
5867-.PP
5868-\fICommon options\fR
5869-.IX Subsection "Common options"
5870-.PP
5871-The following \fB\s-1OPTION\s0\fRs are used in more than one \fB\s-1COMMAND\s0\fR. They are described here to reduce redundancy.
5872-.IP "\fB\-alias\fR \fIAlias\fR" 4
5873-.IX Item "-alias Alias"
5874-Every entry, be it a \fIKey Entry\fR or a \fITrusted Certificate\fR, in a key store is uniquely identified by a user-defined \fIAlias\fR string. Use this option to specify the \fIAlias\fR to use when referring to an entry in the key store. Unless specified otherwise, a default value of \f(CW\*(C`mykey\*(C'\fR shall be used when this option is omitted from the command line.
5875-.IP "\fB\-keyalg\fR \fI\s-1ALGORITHM\s0\fR" 4
5876-.IX Item "-keyalg ALGORITHM"
5877-Use this option to specify the canonical name of the key-pair generation algorithm. The default value for this option is \f(CW\*(C`DSS\*(C'\fR (a synonym for the Digital Signature Algorithm also known as \s-1DSA\s0).
5878-.IP "\fB\-keysize\fR \fI\s-1SIZE\s0\fR" 4
5879-.IX Item "-keysize SIZE"
5880-Use this option to specify the number of bits of the shared modulus (for both the public and private keys) to use when generating new keys. A default value of \f(CW1024\fR will be used if this option is omitted from the command line.
5881-.IP "\fB\-validity\fR \fI\s-1DAY_COUNT\s0\fR" 4
5882-.IX Item "-validity DAY_COUNT"
5883-Use this option to specify the number of days a newly generated certificate will be valid for. The default value is \f(CW90\fR (days) if this option is omitted from the command line.
5884-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
5885-.IX Item "-storetype STORE_TYPE"
5886-Use this option to specify the type of the key store to use. The default value, if this option is omitted, is that of the property \f(CW\*(C`keystore.type\*(C'\fR in the security properties file, which is obtained by invoking the static method call \f(CW\*(C`getDefaultType()\*(C'\fR in \f(CW\*(C`java.security.KeyStore\*(C'\fR.
5887-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
5888-.IX Item "-storepass PASSWORD"
5889-Use this option to specify the password protecting the key store. If this option is omitted from the command line, you will be prompted to provide a password.
5890-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
5891-.IX Item "-keystore URL"
5892-Use this option to specify the location of the key store to use. The default value is a file \s-1URL\s0 referencing the file named \fI.keystore\fR located in the path returned by the call to \f(CW\*(C`java.lang.System#getProperty(String)\*(C'\fR using \f(CW\*(C`user.home\*(C'\fR as argument.
5893-.Sp
5894-If a \s-1URL\s0 was specified, but was found to be malformed \-\-e.g. missing protocol element\*(-- the tool will attempt to use the \s-1URL\s0 value as a file-name (with absolute or relative path-name) of a key store \-\-as if the protocol was \f(CW\*(C`file:\*(C'\fR.
5895-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
5896-.IX Item "-provider PROVIDER_CLASS_NAME"
5897-A fully qualified class name of a \fISecurity Provider\fR to add to the current list of \fISecurity Providers\fR already installed in the \s-1JVM\s0 in-use. If a provider class is specified with this option, and was successfully added to the runtime \-\-i.e. it was not already installed\*(-- then the tool will attempt to removed this \fISecurity Provider\fR before exiting.
5898-.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
5899-.IX Item "-file FILE"
5900-Use this option to designate a file to use with a command. When specified with this option, the value is expected to be the fully qualified path of a file accessible by the File System. Depending on the command, the file may be used as input or as output. When this option is omitted from the command line, \f(CW\*(C`STDIN\*(C'\fR will be used instead, as the source of input, and \f(CW\*(C`STDOUT\*(C'\fR will be used instead as the output destination.
5901-.IP "\fB\-v\fR" 4
5902-.IX Item "-v"
5903-Unless specified otherwise, use this option to enable more verbose output.
5904-.PP
5905-\fIAdd/Update commands\fR
5906-.IX Subsection "Add/Update commands"
5907-.PP
5908-The \fB\-genkey\fR command
5909-.IX Subsection "The -genkey command"
5910-.PP
5911-Use this command to generate a new key-pair (both private and public keys), and save these credentials in the key store as a \fIKey Entry\fR, associated with the designated (if was specified with the \fB\-alias\fR option) or default (if the \fB\-alias\fR option is omitted) \fIAlias\fR.
5912-.PP
5913-The private key material will be protected with a user-defined password (see \fB\-keypass\fR option). The public key on the other hand will be part of a self-signed X.509 certificate, which will form a 1\-element chain and will be saved in the key store.
5914-.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
5915-.IX Item "-alias ALIAS"
5916-See \fICommon Options\fR for more details.
5917-.IP "\fB\-keyalg\fR \fI\s-1ALGORITHM\s0\fR" 4
5918-.IX Item "-keyalg ALGORITHM"
5919-See \fICommon Options\fR for more details.
5920-.IP "\fB\-keysize\fR \fI\s-1KEY_SIZE\s0\fR" 4
5921-.IX Item "-keysize KEY_SIZE"
5922-See \fICommon Options\fR for more details.
5923-.IP "\fB\-sigalg\fR \fI\s-1ALGORITHM\s0\fR" 4
5924-.IX Item "-sigalg ALGORITHM"
5925-The canonical name of the digital signature algorithm to use for signing certificates. If this option is omitted, a default value will be chosen based on the type of the key-pair; i.e. the algorithm that ends up being used by the \-keyalg option. If the key-pair generation algorithm is \f(CW\*(C`DSA\*(C'\fR, the value for the signature algorithm will be \f(CW\*(C`SHA1withDSA\*(C'\fR. If on the other hand the key-pair generation algorithm is \f(CW\*(C`RSA\*(C'\fR, then the tool will use \f(CW\*(C`MD5withRSA\*(C'\fR as the signature algorithm.
5926-.IP "\fB\-dname\fR \fI\s-1NAME\s0\fR" 4
5927-.IX Item "-dname NAME"
5928-This a mandatory value for the command. If no value is specified \-\-i.e. the \fB\-dname\fR option is omitted\*(-- the tool will prompt you to enter a \fIDistinguished Name\fR to use as both the \fIOwner\fR and \fIIssuer\fR of the generated self-signed certificate.
5929-.Sp
5930-See \fICommon Options\fR for more details.
5931-.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
5932-.IX Item "-keypass PASSWORD"
5933-Use this option to specify the password which the tool will use to protect the newly created \fIKey Entry\fR.
5934-.Sp
5935-If this option is omitted, you will be prompted to provide a password.
5936-.IP "\fB\-validity\fR \fI\s-1DAY_COUNT\s0\fR" 4
5937-.IX Item "-validity DAY_COUNT"
5938-See \fICommon Options\fR for more details.
5939-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
5940-.IX Item "-storetype STORE_TYPE"
5941-See \fICommon Options\fR for more details.
5942-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
5943-.IX Item "-keystore URL"
5944-See \fICommon Options\fR for more details.
5945-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
5946-.IX Item "-storepass PASSWORD"
5947-See \fICommon Options\fR for more details.
5948-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
5949-.IX Item "-provider PROVIDER_CLASS_NAME"
5950-See \fICommon Options\fR for more details.
5951-.IP "\fB\-v\fR" 4
5952-.IX Item "-v"
5953-See \fICommon Options\fR for more details.
5954-.PP
5955-The \fB\-import\fR command
5956-.IX Subsection "The -import command"
5957-.PP
5958-Use this command to read an X.509 certificate, or a PKCS#7 \fICertificate Reply\fR from a designated input source and incorporate the certificates into the key store.
5959-.PP
5960-If the \fIAlias\fR does not already exist in the key store, the tool treats the certificate read from the input source as a new \fITrusted Certificate\fR. It then attempts to discover a chain-of-trust, starting from that certificate and ending at another \fITrusted Certificate\fR, already stored in the key store. If the \fB\-trustcacerts\fR option is present, an additional key store, of type \f(CW\*(C`JKS\*(C'\fR named \fIcacerts\fR, and assumed to be present in \fI${\s-1JAVA_HOME\s0}/lib/security\fR will also be consulted if found \-\-\f(CW\*(C`${JAVA_HOME}\*(C'\fR refers to the location of an installed \fIJava Runtime Environment\fR (\s-1JRE\s0). If no chain-of-trust can be established, and unless the \f(CW\*(C`\-noprompt\*(C'\fR option has been specified, the certificate is printed to \f(CW\*(C`STDOUT\*(C'\fR and the user is prompted for a confirmation.
5961-.PP
5962-If \fIAlias\fR exists in the key store, the tool will treat the certificate(s) read from the input source as a \fICertificate Reply\fR, which can be a chain of certificates, that eventually would replace the chain of certificates associated with the \fIKey Entry\fR of that \fIAlias\fR. The substitution of the certificates only occurs if a chain-of-trust can be established between the bottom certificate of the chain read from the input file and the \fITrusted Certificates\fR already present in the key store. Again, if the \fB\-trustcacerts\fR option is specified, additional \fITrusted Certificates\fR in the same \fIcacerts\fR key store will be considered. If no chain-of-trust can be established, the operation will abort.
5963-.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
5964-.IX Item "-alias ALIAS"
5965-See \fICommon Options\fR for more details.
5966-.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
5967-.IX Item "-file FILE"
5968-See \fICommon Options\fR for more details.
5969-.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
5970-.IX Item "-keypass PASSWORD"
5971-Use this option to specify the password which the tool will use to protect the \fIKey Entry\fR associated with the designated \fIAlias\fR, when replacing this \fIAlias\fR' chain of certificates with that found in the certificate reply.
5972-.Sp
5973-If this option is omitted, and the chain-of-trust for the certificate reply has been established, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
5974-.IP "\fB\-noprompt\fR" 4
5975-.IX Item "-noprompt"
5976-Use this option to prevent the tool from prompting the user.
5977-.IP "\fB\-trustcacerts\fR" 4
5978-.IX Item "-trustcacerts"
5979-Use this option to indicate to the tool that a key store, of type \f(CW\*(C`JKS\*(C'\fR, named \fIcacerts\fR, and usually located in \fIlib/security\fR in an installed \fIJava Runtime Environment\fR should be considered when trying to establish chain-of-trusts.
5980-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
5981-.IX Item "-storetype STORE_TYPE"
5982-See \fICommon Options\fR for more details.
5983-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
5984-.IX Item "-keystore URL"
5985-See \fICommon Options\fR for more details.
5986-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
5987-.IX Item "-storepass PASSWORD"
5988-See \fICommon Options\fR for more details.
5989-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
5990-.IX Item "-provider PROVIDER_CLASS_NAME"
5991-See \fICommon Options\fR for more details.
5992-.IP "\fB\-v\fR" 4
5993-.IX Item "-v"
5994-See \fICommon Options\fR for more details.
5995-.PP
5996-The \fB\-selfcert\fR command
5997-.IX Subsection "The -selfcert command"
5998-.PP
5999-Use this command to generate a self-signed X.509 version 1 certificate. The newly generated certificate will form a chain of one element which will replace the previous chain associated with the designated \fIAlias\fR (if \fB\-alias\fR option was specified), or the default \fIAlias\fR (if \fB\-alias\fR option was omitted).
6000-.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
6001-.IX Item "-alias ALIAS"
6002-See \fICommon Options\fR for more details.
6003-.IP "\fB\-sigalg\fR \fI\s-1ALGORITHM\s0\fR" 4
6004-.IX Item "-sigalg ALGORITHM"
6005-The canonical name of the digital signature algorithm to use for signing the certificate. If this option is omitted, a default value will be chosen based on the type of the private key associated with the designated \fIAlias\fR. If the private key is a \f(CW\*(C`DSA\*(C'\fR one, the value for the signature algorithm will be \f(CW\*(C`SHA1withDSA\*(C'\fR. If on the other hand the private key is an \f(CW\*(C`RSA\*(C'\fR one, then the tool will use \f(CW\*(C`MD5withRSA\*(C'\fR as the signature algorithm.
6006-.IP "\fB\-dname\fR \fI\s-1NAME\s0\fR" 4
6007-.IX Item "-dname NAME"
6008-Use this option to specify the \fIDistinguished Name\fR of the newly generated self-signed certificate. If this option is omitted, the existing \fIDistinguished Name\fR of the base certificate in the chain associated with the designated \fIAlias\fR will be used instead.
6009-.Sp
6010-See \fICommon Options\fR for more details.
6011-.IP "\fB\-validity\fR \fI\s-1DAY_COUNT\s0\fR" 4
6012-.IX Item "-validity DAY_COUNT"
6013-See \fICommon Options\fR for more details.
6014-.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
6015-.IX Item "-keypass PASSWORD"
6016-Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
6017-.Sp
6018-If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
6019-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6020-.IX Item "-storetype STORE_TYPE"
6021-See \fICommon Options\fR for more details.
6022-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6023-.IX Item "-keystore URL"
6024-See \fICommon Options\fR for more details.
6025-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6026-.IX Item "-storepass PASSWORD"
6027-See \fICommon Options\fR for more details.
6028-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6029-.IX Item "-provider PROVIDER_CLASS_NAME"
6030-See \fICommon Options\fR for more details.
6031-.IP "\fB\-v\fR" 4
6032-.IX Item "-v"
6033-See \fICommon Options\fR for more details.
6034-.PP
6035-The \fB\-cacert\fR command
6036-.IX Subsection "The -cacert command"
6037-.PP
6038-Use this command to import, a \s-1CA\s0 certificate and add it to the key store as a \fITrusted Certificate\fR. The \fIAlias\fR for this new entry will be constructed from the \s-1FILE\s0's base-name after replacing hyphens and dots with underscores.
6039-.PP
6040-This command is useful when used in a script that recursively visits a directory of \s-1CA\s0 certificates to populate a \f(CW\*(C`cacerts.gkr\*(C'\fR \fIKey Store\fR of trusted certificates which can then be used commands that specify the \fB\-trustcacerts\fR option.
6041-.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
6042-.IX Item "-file FILE"
6043-See \fICommon Options\fR for more details.
6044-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6045-.IX Item "-storetype STORE_TYPE"
6046-See \fICommon Options\fR for more details.
6047-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6048-.IX Item "-keystore URL"
6049-See \fICommon Options\fR for more details.
6050-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6051-.IX Item "-storepass PASSWORD"
6052-See \fICommon Options\fR for more details.
6053-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6054-.IX Item "-provider PROVIDER_CLASS_NAME"
6055-See \fICommon Options\fR for more details.
6056-.IP "\fB\-v\fR" 4
6057-.IX Item "-v"
6058-See \fICommon Options\fR for more details.
6059-.PP
6060-The \fB\-identitydb\fR command
6061-.IX Subsection "The -identitydb command"
6062-.PP
6063-\&\fB\s-1NOT\s0 \s-1IMPLEMENTED\s0 \s-1YET\s0\fR.
6064-.PP
6065-Use this command to import a \s-1JDK\s0 1.1 style Identity Database.
6066-.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
6067-.IX Item "-file FILE"
6068-See \fICommon Options\fR for more details.
6069-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6070-.IX Item "-storetype STORE_TYPE"
6071-See \fICommon Options\fR for more details.
6072-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6073-.IX Item "-keystore URL"
6074-See \fICommon Options\fR for more details.
6075-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6076-.IX Item "-storepass PASSWORD"
6077-See \fICommon Options\fR for more details.
6078-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6079-.IX Item "-provider PROVIDER_CLASS_NAME"
6080-See \fICommon Options\fR for more details.
6081-.IP "\fB\-v\fR" 4
6082-.IX Item "-v"
6083-See \fICommon Options\fR for more details.
6084-.PP
6085-\fIExport commands\fR
6086-.IX Subsection "Export commands"
6087-.PP
6088-The \fB\-certreq\fR command
6089-.IX Subsection "The -certreq command"
6090-.PP
6091-Use this command to generate a PKCS#10 \fICertificate Signing Request\fR (\s-1CSR\s0) and write it to a designated output destination. The contents of the destination should look something like the following:
6092-.PP
6093-.Vb 6
6094-\& \-\-\-\-\-BEGIN NEW CERTIFICATE REQUEST\-\-\-\-\-
6095-\& MI...QAwXzEUMBIGA1UEAwwLcnNuQGdudS5vcmcxGzAZBgNVBAoMElUg
6096-\& Q2...A0GA1UEBwwGU3lkbmV5MQwwCgYDVQQIDANOU1cxCzAJBgNVBACC
6097-\& ...
6098-\& FC...IVwNVOfQLRX+O5kAhQ/a4RTZme2L8PnpvgRwrf7Eg8D6w==
6099-\& \-\-\-\-\-END NEW CERTIFICATE REQUEST\-\-\-\-\-
6100-.Ve
6101-.PP
6102-\&\fB\s-1IMPORTANT\s0\fR: Some documentation (e.g. \s-1RSA\s0 examples) claims that the \f(CW\*(C`Attributes\*(C'\fR field, in the \s-1CSR\s0 is \f(CW\*(C`OPTIONAL\*(C'\fR while \s-1RFC\-2986\s0 implies the opposite. This implementation considers this field, by default, as \f(CW\*(C`OPTIONAL\*(C'\fR, unless the option \fB\-attributes\fR is specified on the command line.
6103-.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
6104-.IX Item "-alias ALIAS"
6105-See \fICommon Options\fR for more details.
6106-.IP "\fB\-sigalg\fR \fI\s-1ALGORITHM\s0\fR" 4
6107-.IX Item "-sigalg ALGORITHM"
6108-The canonical name of the digital signature algorithm to use for signing the certificate. If this option is omitted, a default value will be chosen based on the type of the private key associated with the designated \fIAlias\fR. If the private key is a \f(CW\*(C`DSA\*(C'\fR one, the value for the signature algorithm will be \f(CW\*(C`SHA1withDSA\*(C'\fR. If on the other hand the private key is an \f(CW\*(C`RSA\*(C'\fR one, then the tool will use \f(CW\*(C`MD5withRSA\*(C'\fR as the signature algorithm.
6109-.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
6110-.IX Item "-file FILE"
6111-See \fICommon Options\fR for more details.
6112-.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
6113-.IX Item "-keypass PASSWORD"
6114-Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
6115-.Sp
6116-If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
6117-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6118-.IX Item "-storetype STORE_TYPE"
6119-See \fICommon Options\fR for more details.
6120-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6121-.IX Item "-keystore URL"
6122-See \fICommon Options\fR for more details.
6123-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6124-.IX Item "-storepass PASSWORD"
6125-See \fICommon Options\fR for more details.
6126-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6127-.IX Item "-provider PROVIDER_CLASS_NAME"
6128-See \fICommon Options\fR for more details.
6129-.IP "\fB\-v\fR" 4
6130-.IX Item "-v"
6131-See \fICommon Options\fR for more details.
6132-.IP "\fB\-attributes\fR" 4
6133-.IX Item "-attributes"
6134-Use this option to force the tool to encode a \f(CW\*(C`NULL\*(C'\fR \s-1DER\s0 value in the \s-1CSR\s0 as the value of the \f(CW\*(C`Attributes\*(C'\fR field.
6135-.PP
6136-The \fB\-export\fR command
6137-.IX Subsection "The -export command"
6138-.PP
6139-Use this command to export a certificate stored in a key store to a designated output destination, either in binary format (if the \fB\-v\fR option is specified), or in \s-1RFC\-1421\s0 compliant encoding (if the \fB\-rfc\fR option is specified instead).
6140-.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
6141-.IX Item "-alias ALIAS"
6142-See \fICommon Options\fR for more details.
6143-.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
6144-.IX Item "-file FILE"
6145-See \fICommon Options\fR for more details.
6146-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6147-.IX Item "-storetype STORE_TYPE"
6148-See \fICommon Options\fR for more details.
6149-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6150-.IX Item "-keystore URL"
6151-See \fICommon Options\fR for more details.
6152-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6153-.IX Item "-storepass PASSWORD"
6154-See \fICommon Options\fR for more details.
6155-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6156-.IX Item "-provider PROVIDER_CLASS_NAME"
6157-See \fICommon Options\fR for more details.
6158-.IP "\fB\-rfc\fR" 4
6159-.IX Item "-rfc"
6160-Use \s-1RFC\-1421\s0 specifications when encoding the output.
6161-.IP "\fB\-v\fR" 4
6162-.IX Item "-v"
6163-Output the certificate in binary \s-1DER\s0 encoding. This is the default output format of the command if neither \fB\-rfc\fR nor \f(CW\*(C`\-v\*(C'\fR options were detected on the command line. If both this option and the \fB\-rfc\fR option are detected on the command line, the tool will opt for the \s-1RFC\-1421\s0 style encoding.
6164-.PP
6165-\fIDisplay commands\fR
6166-.IX Subsection "Display commands"
6167-.PP
6168-The \fB\-list\fR command
6169-.IX Subsection "The -list command"
6170-.PP
6171-Use this command to print one or all of a key store entries to \f(CW\*(C`STDOUT\*(C'\fR. Usually this command will only print a \fIfingerprint\fR of the certificate, unless either the \fB\-rfc\fR or the \fB\-v\fR option is specified.
6172-.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
6173-.IX Item "-alias ALIAS"
6174-If this option is omitted, the tool will print \s-1ALL\s0 the entries found in the key store.
6175-.Sp
6176-See \fICommon Options\fR for more details.
6177-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6178-.IX Item "-storetype STORE_TYPE"
6179-See \fICommon Options\fR for more details.
6180-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6181-.IX Item "-keystore URL"
6182-See \fICommon Options\fR for more details.
6183-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6184-.IX Item "-storepass PASSWORD"
6185-See \fICommon Options\fR for more details.
6186-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6187-.IX Item "-provider PROVIDER_CLASS_NAME"
6188-See \fICommon Options\fR for more details.
6189-.IP "\fB\-rfc\fR" 4
6190-.IX Item "-rfc"
6191-Use \s-1RFC\-1421\s0 specifications when encoding the output.
6192-.IP "\fB\-v\fR" 4
6193-.IX Item "-v"
6194-Output the certificate in human-readable format. If both this option and the \fB\-rfc\fR option are detected on the command line, the tool will opt for the human-readable form and will not abort the command.
6195-.PP
6196-The \fB\-printcert\fR command
6197-.IX Subsection "The -printcert command"
6198-.PP
6199-Use this command to read a certificate from a designated input source and print it to \f(CW\*(C`STDOUT\*(C'\fR in a human-readable form.
6200-.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4
6201-.IX Item "-file FILE"
6202-See \fICommon Options\fR for more details.
6203-.IP "\fB\-v\fR" 4
6204-.IX Item "-v"
6205-See \fICommon Options\fR for more details.
6206-.PP
6207-\fIManagement commands\fR
6208-.IX Subsection "Management commands"
6209-.PP
6210-The \fB\-keyclone\fR command
6211-.IX Subsection "The -keyclone command"
6212-.PP
6213-Use this command to clone an existing \fIKey Entry\fR and store it under a new (different) \fIAlias\fR protecting, its private key material with possibly a new password.
6214-.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
6215-.IX Item "-alias ALIAS"
6216-See \fICommon Options\fR for more details.
6217-.IP "\fB\-dest\fR \fI\s-1ALIAS\s0\fR" 4
6218-.IX Item "-dest ALIAS"
6219-Use this option to specify the new \fIAlias\fR which will be used to identify the cloned copy of the \fIKey Entry\fR.
6220-.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4
6221-.IX Item "-keypass PASSWORD"
6222-Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
6223-.Sp
6224-If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
6225-.IP "\fB\-new\fR \fI\s-1PASSWORD\s0\fR" 4
6226-.IX Item "-new PASSWORD"
6227-Use this option to specify the password protecting the private key material of the newly cloned copy of the \fIKey Entry\fR.
6228-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6229-.IX Item "-storetype STORE_TYPE"
6230-See \fICommon Options\fR for more details.
6231-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6232-.IX Item "-keystore URL"
6233-See \fICommon Options\fR for more details.
6234-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6235-.IX Item "-storepass PASSWORD"
6236-See \fICommon Options\fR for more details.
6237-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6238-.IX Item "-provider PROVIDER_CLASS_NAME"
6239-See \fICommon Options\fR for more details.
6240-.IP "\fB\-v\fR" 4
6241-.IX Item "-v"
6242-See \fICommon Options\fR for more details.
6243-.PP
6244-The \fB\-storepasswd\fR command
6245-.IX Subsection "The -storepasswd command"
6246-.PP
6247-Use this command to change the password protecting a key store.
6248-.IP "\fB\-new\fR \fI\s-1PASSWORD\s0\fR" 4
6249-.IX Item "-new PASSWORD"
6250-The new, and different, password which will be used to protect the designated key store.
6251-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6252-.IX Item "-storetype STORE_TYPE"
6253-See \fICommon Options\fR for more details.
6254-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6255-.IX Item "-keystore URL"
6256-See \fICommon Options\fR for more details.
6257-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6258-.IX Item "-storepass PASSWORD"
6259-See \fICommon Options\fR for more details.
6260-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6261-.IX Item "-provider PROVIDER_CLASS_NAME"
6262-See \fICommon Options\fR for more details.
6263-.IP "\fB\-v\fR" 4
6264-.IX Item "-v"
6265-See \fICommon Options\fR for more details.
6266-.PP
6267-The \fB\-keypasswd\fR command
6268-.IX Subsection "The -keypasswd command"
6269-.PP
6270-Use this command to change the password protecting the private key material of a designated \fIKey Entry\fR.
6271-.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
6272-.IX Item "-alias ALIAS"
6273-See \fICommon Options\fR for more details.
6274-.Sp
6275-Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR.
6276-.Sp
6277-If this option is omitted, the tool will first attempt to unlock the \fIKey Entry\fR using the same password protecting the key store. If this fails, you will then be prompted to provide a password.
6278-.IP "\fB\-new\fR \fI\s-1PASSWORD\s0\fR" 4
6279-.IX Item "-new PASSWORD"
6280-The new, and different, password which will be used to protect the private key material of the designated \fIKey Entry\fR.
6281-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6282-.IX Item "-storetype STORE_TYPE"
6283-See \fICommon Options\fR for more details.
6284-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6285-.IX Item "-keystore URL"
6286-See \fICommon Options\fR for more details.
6287-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6288-.IX Item "-storepass PASSWORD"
6289-See \fICommon Options\fR for more details.
6290-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6291-.IX Item "-provider PROVIDER_CLASS_NAME"
6292-See \fICommon Options\fR for more details.
6293-.IP "\fB\-v\fR" 4
6294-.IX Item "-v"
6295-See \fICommon Options\fR for more details.
6296-.PP
6297-The \fB\-delete\fR command
6298-.IX Subsection "The -delete command"
6299-.PP
6300-Use this command to delete a designated key store entry.
6301-.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4
6302-.IX Item "-alias ALIAS"
6303-See \fICommon Options\fR for more details.
6304-.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4
6305-.IX Item "-storetype STORE_TYPE"
6306-See \fICommon Options\fR for more details.
6307-.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4
6308-.IX Item "-keystore URL"
6309-See \fICommon Options\fR for more details.
6310-.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4
6311-.IX Item "-storepass PASSWORD"
6312-See \fICommon Options\fR for more details.
6313-.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4
6314-.IX Item "-provider PROVIDER_CLASS_NAME"
6315-See \fICommon Options\fR for more details.
6316-.IP "\fB\-v\fR" 4
6317-.IX Item "-v"
6318-See \fICommon Options\fR for more details.
6319-.SH "SEE ALSO"
6320-.IX Header "SEE ALSO"
6321diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gnative2ascii.1 gcc-4.3.3/libjava/classpath/doc/gnative2ascii.1
6322--- gcc-4.3.3.orig/libjava/classpath/doc/gnative2ascii.1 2009-01-24 04:05:55.000000000 -0800
6323+++ gcc-4.3.3/libjava/classpath/doc/gnative2ascii.1 1969-12-31 16:00:00.000000000 -0800
6324@@ -1,169 +0,0 @@
6325-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
6326-.\"
6327-.\" Standard preamble:
6328-.\" ========================================================================
6329-.de Sh \" Subsection heading
6330-.br
6331-.if t .Sp
6332-.ne 5
6333-.PP
6334-\fB\\$1\fR
6335-.PP
6336-..
6337-.de Sp \" Vertical space (when we can't use .PP)
6338-.if t .sp .5v
6339-.if n .sp
6340-..
6341-.de Vb \" Begin verbatim text
6342-.ft CW
6343-.nf
6344-.ne \\$1
6345-..
6346-.de Ve \" End verbatim text
6347-.ft R
6348-.fi
6349-..
6350-.\" Set up some character translations and predefined strings. \*(-- will
6351-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
6352-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
6353-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
6354-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
6355-.\" nothing in troff, for use with C<>.
6356-.tr \(*W-
6357-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
6358-.ie n \{\
6359-. ds -- \(*W-
6360-. ds PI pi
6361-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
6362-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
6363-. ds L" ""
6364-. ds R" ""
6365-. ds C` ""
6366-. ds C' ""
6367-'br\}
6368-.el\{\
6369-. ds -- \|\(em\|
6370-. ds PI \(*p
6371-. ds L" ``
6372-. ds R" ''
6373-'br\}
6374-.\"
6375-.\" Escape single quotes in literal strings from groff's Unicode transform.
6376-.ie \n(.g .ds Aq \(aq
6377-.el .ds Aq '
6378-.\"
6379-.\" If the F register is turned on, we'll generate index entries on stderr for
6380-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
6381-.\" entries marked with X<> in POD. Of course, you'll have to process the
6382-.\" output yourself in some meaningful fashion.
6383-.ie \nF \{\
6384-. de IX
6385-. tm Index:\\$1\t\\n%\t"\\$2"
6386-..
6387-. nr % 0
6388-. rr F
6389-.\}
6390-.el \{\
6391-. de IX
6392-..
6393-.\}
6394-.\"
6395-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
6396-.\" Fear. Run. Save yourself. No user-serviceable parts.
6397-. \" fudge factors for nroff and troff
6398-.if n \{\
6399-. ds #H 0
6400-. ds #V .8m
6401-. ds #F .3m
6402-. ds #[ \f1
6403-. ds #] \fP
6404-.\}
6405-.if t \{\
6406-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
6407-. ds #V .6m
6408-. ds #F 0
6409-. ds #[ \&
6410-. ds #] \&
6411-.\}
6412-. \" simple accents for nroff and troff
6413-.if n \{\
6414-. ds ' \&
6415-. ds ` \&
6416-. ds ^ \&
6417-. ds , \&
6418-. ds ~ ~
6419-. ds /
6420-.\}
6421-.if t \{\
6422-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
6423-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
6424-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
6425-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
6426-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
6427-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
6428-.\}
6429-. \" troff and (daisy-wheel) nroff accents
6430-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
6431-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
6432-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
6433-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
6434-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
6435-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
6436-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
6437-.ds ae a\h'-(\w'a'u*4/10)'e
6438-.ds Ae A\h'-(\w'A'u*4/10)'E
6439-. \" corrections for vroff
6440-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
6441-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
6442-. \" for low resolution devices (crt and lpr)
6443-.if \n(.H>23 .if \n(.V>19 \
6444-\{\
6445-. ds : e
6446-. ds 8 ss
6447-. ds o a
6448-. ds d- d\h'-1'\(ga
6449-. ds D- D\h'-1'\(hy
6450-. ds th \o'bp'
6451-. ds Th \o'LP'
6452-. ds ae ae
6453-. ds Ae AE
6454-.\}
6455-.rm #[ #] #H #V #F C
6456-.\" ========================================================================
6457-.\"
6458-.IX Title "GNATIVE2ASCII 1"
6459-.TH GNATIVE2ASCII 1 "2009-01-24" "0.96-pre" "GNU"
6460-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6461-.\" way too many mistakes in technical documents.
6462-.if n .ad l
6463-.nh
6464-.SH "NAME"
6465-gnative2ascii \- \- An encoding converter
6466-.SH "SYNOPSIS"
6467-.IX Header "SYNOPSIS"
6468-gnative2ascii [\fI\s-1OPTIONS\s0\fR]... [\fI\s-1INPUTFILE\s0\fR [\fI\s-1OUTPUTFILE\s0\fR]]
6469-.SH "DESCRIPTION"
6470-.IX Header "DESCRIPTION"
6471-To be written ...
6472-.SH "OPTIONS"
6473-.IX Header "OPTIONS"
6474-.IP "\fB\-encoding\fR \fI\s-1NAME\s0\fR" 4
6475-.IX Item "-encoding NAME"
6476-Set the encoding to use.
6477-.IP "\fB\-reversed\fR" 4
6478-.IX Item "-reversed"
6479-Convert from encoding to native.
6480-.PP
6481-Standard options:
6482-.IP "\fB\-help\fR" 4
6483-.IX Item "-help"
6484-Print help text, then exit.
6485-.IP "\fB\-version\fR" 4
6486-.IX Item "-version"
6487-Print version number, then exit.
6488-.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
6489-.IX Item "-JOPTION"
6490-Pass argument to the Java runtime.
6491-.SH "SEE ALSO"
6492-.IX Header "SEE ALSO"
6493-\&\fIjavac\fR\|(1), ...
6494diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gorbd.1 gcc-4.3.3/libjava/classpath/doc/gorbd.1
6495--- gcc-4.3.3.orig/libjava/classpath/doc/gorbd.1 2009-01-24 04:05:56.000000000 -0800
6496+++ gcc-4.3.3/libjava/classpath/doc/gorbd.1 1969-12-31 16:00:00.000000000 -0800
6497@@ -1,176 +0,0 @@
6498-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
6499-.\"
6500-.\" Standard preamble:
6501-.\" ========================================================================
6502-.de Sh \" Subsection heading
6503-.br
6504-.if t .Sp
6505-.ne 5
6506-.PP
6507-\fB\\$1\fR
6508-.PP
6509-..
6510-.de Sp \" Vertical space (when we can't use .PP)
6511-.if t .sp .5v
6512-.if n .sp
6513-..
6514-.de Vb \" Begin verbatim text
6515-.ft CW
6516-.nf
6517-.ne \\$1
6518-..
6519-.de Ve \" End verbatim text
6520-.ft R
6521-.fi
6522-..
6523-.\" Set up some character translations and predefined strings. \*(-- will
6524-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
6525-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
6526-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
6527-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
6528-.\" nothing in troff, for use with C<>.
6529-.tr \(*W-
6530-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
6531-.ie n \{\
6532-. ds -- \(*W-
6533-. ds PI pi
6534-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
6535-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
6536-. ds L" ""
6537-. ds R" ""
6538-. ds C` ""
6539-. ds C' ""
6540-'br\}
6541-.el\{\
6542-. ds -- \|\(em\|
6543-. ds PI \(*p
6544-. ds L" ``
6545-. ds R" ''
6546-'br\}
6547-.\"
6548-.\" Escape single quotes in literal strings from groff's Unicode transform.
6549-.ie \n(.g .ds Aq \(aq
6550-.el .ds Aq '
6551-.\"
6552-.\" If the F register is turned on, we'll generate index entries on stderr for
6553-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
6554-.\" entries marked with X<> in POD. Of course, you'll have to process the
6555-.\" output yourself in some meaningful fashion.
6556-.ie \nF \{\
6557-. de IX
6558-. tm Index:\\$1\t\\n%\t"\\$2"
6559-..
6560-. nr % 0
6561-. rr F
6562-.\}
6563-.el \{\
6564-. de IX
6565-..
6566-.\}
6567-.\"
6568-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
6569-.\" Fear. Run. Save yourself. No user-serviceable parts.
6570-. \" fudge factors for nroff and troff
6571-.if n \{\
6572-. ds #H 0
6573-. ds #V .8m
6574-. ds #F .3m
6575-. ds #[ \f1
6576-. ds #] \fP
6577-.\}
6578-.if t \{\
6579-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
6580-. ds #V .6m
6581-. ds #F 0
6582-. ds #[ \&
6583-. ds #] \&
6584-.\}
6585-. \" simple accents for nroff and troff
6586-.if n \{\
6587-. ds ' \&
6588-. ds ` \&
6589-. ds ^ \&
6590-. ds , \&
6591-. ds ~ ~
6592-. ds /
6593-.\}
6594-.if t \{\
6595-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
6596-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
6597-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
6598-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
6599-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
6600-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
6601-.\}
6602-. \" troff and (daisy-wheel) nroff accents
6603-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
6604-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
6605-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
6606-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
6607-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
6608-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
6609-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
6610-.ds ae a\h'-(\w'a'u*4/10)'e
6611-.ds Ae A\h'-(\w'A'u*4/10)'E
6612-. \" corrections for vroff
6613-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
6614-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
6615-. \" for low resolution devices (crt and lpr)
6616-.if \n(.H>23 .if \n(.V>19 \
6617-\{\
6618-. ds : e
6619-. ds 8 ss
6620-. ds o a
6621-. ds d- d\h'-1'\(ga
6622-. ds D- D\h'-1'\(hy
6623-. ds th \o'bp'
6624-. ds Th \o'LP'
6625-. ds ae ae
6626-. ds Ae AE
6627-.\}
6628-.rm #[ #] #H #V #F C
6629-.\" ========================================================================
6630-.\"
6631-.IX Title "GORBD 1"
6632-.TH GORBD 1 "2009-01-24" "0.96-pre" "GNU"
6633-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6634-.\" way too many mistakes in technical documents.
6635-.if n .ad l
6636-.nh
6637-.SH "NAME"
6638-gorbd \- \- An object request broker daemon
6639-.SH "SYNOPSIS"
6640-.IX Header "SYNOPSIS"
6641-gorbd ...
6642-.SH "DESCRIPTION"
6643-.IX Header "DESCRIPTION"
6644-To be written ...
6645-.SH "OPTIONS"
6646-.IX Header "OPTIONS"
6647-.IP "\fB\-ORBInitialPort\fR \fI\s-1PORT\s0\fR" 4
6648-.IX Item "-ORBInitialPort PORT"
6649-Port on which persistent naming service is to be started.
6650-.IP "\fB\-ior\fR \fI\s-1FILE\s0\fR" 4
6651-.IX Item "-ior FILE"
6652-File in which to store persistent naming service's \s-1IOR\s0 reference
6653-.IP "\fB\-directory\fR \fI\s-1DIR\s0\fR" 4
6654-.IX Item "-directory DIR"
6655-Directory in which to store persistent data.
6656-.IP "\fB\-restart\fR" 4
6657-.IX Item "-restart"
6658-Restart persistent naming service, clearing persistent naming
6659-database.
6660-.PP
6661-Standard options:
6662-.IP "\fB\-help\fR" 4
6663-.IX Item "-help"
6664-Print help text, then exit.
6665-.IP "\fB\-version\fR" 4
6666-.IX Item "-version"
6667-Print version number, then exit.
6668-.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
6669-.IX Item "-JOPTION"
6670-Pass argument to the Java runtime.
6671-.SH "SEE ALSO"
6672-.IX Header "SEE ALSO"
6673-\&\fIjava\fR\|(1), ...
6674diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/grmid.1 gcc-4.3.3/libjava/classpath/doc/grmid.1
6675--- gcc-4.3.3.orig/libjava/classpath/doc/grmid.1 2009-01-24 04:05:56.000000000 -0800
6676+++ gcc-4.3.3/libjava/classpath/doc/grmid.1 1969-12-31 16:00:00.000000000 -0800
6677@@ -1,188 +0,0 @@
6678-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
6679-.\"
6680-.\" Standard preamble:
6681-.\" ========================================================================
6682-.de Sh \" Subsection heading
6683-.br
6684-.if t .Sp
6685-.ne 5
6686-.PP
6687-\fB\\$1\fR
6688-.PP
6689-..
6690-.de Sp \" Vertical space (when we can't use .PP)
6691-.if t .sp .5v
6692-.if n .sp
6693-..
6694-.de Vb \" Begin verbatim text
6695-.ft CW
6696-.nf
6697-.ne \\$1
6698-..
6699-.de Ve \" End verbatim text
6700-.ft R
6701-.fi
6702-..
6703-.\" Set up some character translations and predefined strings. \*(-- will
6704-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
6705-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
6706-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
6707-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
6708-.\" nothing in troff, for use with C<>.
6709-.tr \(*W-
6710-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
6711-.ie n \{\
6712-. ds -- \(*W-
6713-. ds PI pi
6714-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
6715-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
6716-. ds L" ""
6717-. ds R" ""
6718-. ds C` ""
6719-. ds C' ""
6720-'br\}
6721-.el\{\
6722-. ds -- \|\(em\|
6723-. ds PI \(*p
6724-. ds L" ``
6725-. ds R" ''
6726-'br\}
6727-.\"
6728-.\" Escape single quotes in literal strings from groff's Unicode transform.
6729-.ie \n(.g .ds Aq \(aq
6730-.el .ds Aq '
6731-.\"
6732-.\" If the F register is turned on, we'll generate index entries on stderr for
6733-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
6734-.\" entries marked with X<> in POD. Of course, you'll have to process the
6735-.\" output yourself in some meaningful fashion.
6736-.ie \nF \{\
6737-. de IX
6738-. tm Index:\\$1\t\\n%\t"\\$2"
6739-..
6740-. nr % 0
6741-. rr F
6742-.\}
6743-.el \{\
6744-. de IX
6745-..
6746-.\}
6747-.\"
6748-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
6749-.\" Fear. Run. Save yourself. No user-serviceable parts.
6750-. \" fudge factors for nroff and troff
6751-.if n \{\
6752-. ds #H 0
6753-. ds #V .8m
6754-. ds #F .3m
6755-. ds #[ \f1
6756-. ds #] \fP
6757-.\}
6758-.if t \{\
6759-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
6760-. ds #V .6m
6761-. ds #F 0
6762-. ds #[ \&
6763-. ds #] \&
6764-.\}
6765-. \" simple accents for nroff and troff
6766-.if n \{\
6767-. ds ' \&
6768-. ds ` \&
6769-. ds ^ \&
6770-. ds , \&
6771-. ds ~ ~
6772-. ds /
6773-.\}
6774-.if t \{\
6775-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
6776-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
6777-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
6778-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
6779-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
6780-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
6781-.\}
6782-. \" troff and (daisy-wheel) nroff accents
6783-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
6784-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
6785-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
6786-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
6787-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
6788-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
6789-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
6790-.ds ae a\h'-(\w'a'u*4/10)'e
6791-.ds Ae A\h'-(\w'A'u*4/10)'E
6792-. \" corrections for vroff
6793-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
6794-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
6795-. \" for low resolution devices (crt and lpr)
6796-.if \n(.H>23 .if \n(.V>19 \
6797-\{\
6798-. ds : e
6799-. ds 8 ss
6800-. ds o a
6801-. ds d- d\h'-1'\(ga
6802-. ds D- D\h'-1'\(hy
6803-. ds th \o'bp'
6804-. ds Th \o'LP'
6805-. ds ae ae
6806-. ds Ae AE
6807-.\}
6808-.rm #[ #] #H #V #F C
6809-.\" ========================================================================
6810-.\"
6811-.IX Title "GRMID 1"
6812-.TH GRMID 1 "2009-01-24" "0.96-pre" "GNU"
6813-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6814-.\" way too many mistakes in technical documents.
6815-.if n .ad l
6816-.nh
6817-.SH "NAME"
6818-grmid \- \- RMI activation system daemon
6819-.SH "SYNOPSIS"
6820-.IX Header "SYNOPSIS"
6821-grmid [\fI\s-1OPTIONS\s0\fR]...
6822-.SH "DESCRIPTION"
6823-.IX Header "DESCRIPTION"
6824-\&\fBrmiregistry\fR starts a remote object registry on the current
6825-host. If no port number is specified, then port 1099 is used.
6826-.SH "OPTIONS"
6827-.IX Header "OPTIONS"
6828-Activation process control:
6829-.IP "\fB\-port\fR \fI\s-1PORT\s0\fR" 4
6830-.IX Item "-port PORT"
6831-Port on which activation system is to be started.
6832-.IP "\fB\-restart\fR" 4
6833-.IX Item "-restart"
6834-Restart activation system, clearing persistent naming database, if
6835-any.
6836-.IP "\fB\-stop\fR" 4
6837-.IX Item "-stop"
6838-Stop activation system.
6839-.PP
6840-Persistence:
6841-.IP "\fB\-persistent\fR" 4
6842-.IX Item "-persistent"
6843-Make activation system persistent.
6844-.IP "\fB\-directory\fR \fI\s-1DIR\s0\fR" 4
6845-.IX Item "-directory DIR"
6846-Directory in which to store persistent data.
6847-.PP
6848-Debugging:
6849-.IP "\fB\-verbose\fR" 4
6850-.IX Item "-verbose"
6851-Log binding events to standard out.
6852-.PP
6853-Standard options:
6854-.IP "\fB\-help\fR" 4
6855-.IX Item "-help"
6856-Print help text, then exit.
6857-.IP "\fB\-version\fR" 4
6858-.IX Item "-version"
6859-Print version number, then exit.
6860-.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
6861-.IX Item "-JOPTION"
6862-Pass argument to the Java runtime.
6863-.SH "SEE ALSO"
6864-.IX Header "SEE ALSO"
6865-\&\fIjava\fR\|(1), ...
6866diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/grmiregistry.1 gcc-4.3.3/libjava/classpath/doc/grmiregistry.1
6867--- gcc-4.3.3.orig/libjava/classpath/doc/grmiregistry.1 2009-01-24 04:05:56.000000000 -0800
6868+++ gcc-4.3.3/libjava/classpath/doc/grmiregistry.1 1969-12-31 16:00:00.000000000 -0800
6869@@ -1,185 +0,0 @@
6870-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
6871-.\"
6872-.\" Standard preamble:
6873-.\" ========================================================================
6874-.de Sh \" Subsection heading
6875-.br
6876-.if t .Sp
6877-.ne 5
6878-.PP
6879-\fB\\$1\fR
6880-.PP
6881-..
6882-.de Sp \" Vertical space (when we can't use .PP)
6883-.if t .sp .5v
6884-.if n .sp
6885-..
6886-.de Vb \" Begin verbatim text
6887-.ft CW
6888-.nf
6889-.ne \\$1
6890-..
6891-.de Ve \" End verbatim text
6892-.ft R
6893-.fi
6894-..
6895-.\" Set up some character translations and predefined strings. \*(-- will
6896-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
6897-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
6898-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
6899-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
6900-.\" nothing in troff, for use with C<>.
6901-.tr \(*W-
6902-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
6903-.ie n \{\
6904-. ds -- \(*W-
6905-. ds PI pi
6906-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
6907-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
6908-. ds L" ""
6909-. ds R" ""
6910-. ds C` ""
6911-. ds C' ""
6912-'br\}
6913-.el\{\
6914-. ds -- \|\(em\|
6915-. ds PI \(*p
6916-. ds L" ``
6917-. ds R" ''
6918-'br\}
6919-.\"
6920-.\" Escape single quotes in literal strings from groff's Unicode transform.
6921-.ie \n(.g .ds Aq \(aq
6922-.el .ds Aq '
6923-.\"
6924-.\" If the F register is turned on, we'll generate index entries on stderr for
6925-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
6926-.\" entries marked with X<> in POD. Of course, you'll have to process the
6927-.\" output yourself in some meaningful fashion.
6928-.ie \nF \{\
6929-. de IX
6930-. tm Index:\\$1\t\\n%\t"\\$2"
6931-..
6932-. nr % 0
6933-. rr F
6934-.\}
6935-.el \{\
6936-. de IX
6937-..
6938-.\}
6939-.\"
6940-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
6941-.\" Fear. Run. Save yourself. No user-serviceable parts.
6942-. \" fudge factors for nroff and troff
6943-.if n \{\
6944-. ds #H 0
6945-. ds #V .8m
6946-. ds #F .3m
6947-. ds #[ \f1
6948-. ds #] \fP
6949-.\}
6950-.if t \{\
6951-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
6952-. ds #V .6m
6953-. ds #F 0
6954-. ds #[ \&
6955-. ds #] \&
6956-.\}
6957-. \" simple accents for nroff and troff
6958-.if n \{\
6959-. ds ' \&
6960-. ds ` \&
6961-. ds ^ \&
6962-. ds , \&
6963-. ds ~ ~
6964-. ds /
6965-.\}
6966-.if t \{\
6967-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
6968-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
6969-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
6970-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
6971-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
6972-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
6973-.\}
6974-. \" troff and (daisy-wheel) nroff accents
6975-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
6976-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
6977-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
6978-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
6979-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
6980-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
6981-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
6982-.ds ae a\h'-(\w'a'u*4/10)'e
6983-.ds Ae A\h'-(\w'A'u*4/10)'E
6984-. \" corrections for vroff
6985-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
6986-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
6987-. \" for low resolution devices (crt and lpr)
6988-.if \n(.H>23 .if \n(.V>19 \
6989-\{\
6990-. ds : e
6991-. ds 8 ss
6992-. ds o a
6993-. ds d- d\h'-1'\(ga
6994-. ds D- D\h'-1'\(hy
6995-. ds th \o'bp'
6996-. ds Th \o'LP'
6997-. ds ae ae
6998-. ds Ae AE
6999-.\}
7000-.rm #[ #] #H #V #F C
7001-.\" ========================================================================
7002-.\"
7003-.IX Title "GRMIREGISTRY 1"
7004-.TH GRMIREGISTRY 1 "2009-01-24" "0.96-pre" "GNU"
7005-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
7006-.\" way too many mistakes in technical documents.
7007-.if n .ad l
7008-.nh
7009-.SH "NAME"
7010-grmiregistry \- \- Remote object registry
7011-.SH "SYNOPSIS"
7012-.IX Header "SYNOPSIS"
7013-grmiregistry [\fI\s-1OPTIONS\s0\fR]... \fI\s-1PORT\s0\fR
7014-.SH "DESCRIPTION"
7015-.IX Header "DESCRIPTION"
7016-\&\fBgrmiregistry\fR starts a remote object registry on the current
7017-host. If no port number is specified, then port 1099 is used.
7018-.SH "OPTIONS"
7019-.IX Header "OPTIONS"
7020-Registry process control:
7021-.IP "\fB\-restart\fR" 4
7022-.IX Item "-restart"
7023-Restart \s-1RMI\s0 naming service, clearing persistent naming database, if
7024-any.
7025-.IP "\fB\-stop\fR" 4
7026-.IX Item "-stop"
7027-Stop \s-1RMI\s0 naming service.
7028-.PP
7029-Persistence:
7030-.IP "\fB\-persistent\fR" 4
7031-.IX Item "-persistent"
7032-Make \s-1RMI\s0 naming service persistent.
7033-.IP "\fB\-directory\fR \fI\s-1DIR\s0\fR" 4
7034-.IX Item "-directory DIR"
7035-Directory in which to store persistent data.
7036-.PP
7037-Debugging:
7038-.IP "\fB\-verbose\fR" 4
7039-.IX Item "-verbose"
7040-Log binding events to standard out.
7041-.PP
7042-Standard options:
7043-.IP "\fB\-help\fR" 4
7044-.IX Item "-help"
7045-Print help text, then exit.
7046-.IP "\fB\-version\fR" 4
7047-.IX Item "-version"
7048-Print version number, then exit.
7049-.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
7050-.IX Item "-JOPTION"
7051-Pass argument to the Java runtime.
7052-.SH "SEE ALSO"
7053-.IX Header "SEE ALSO"
7054-\&\fIjava\fR\|(1), ...
7055diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gserialver.1 gcc-4.3.3/libjava/classpath/doc/gserialver.1
7056--- gcc-4.3.3.orig/libjava/classpath/doc/gserialver.1 2009-01-24 04:05:56.000000000 -0800
7057+++ gcc-4.3.3/libjava/classpath/doc/gserialver.1 1969-12-31 16:00:00.000000000 -0800
7058@@ -1,166 +0,0 @@
7059-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
7060-.\"
7061-.\" Standard preamble:
7062-.\" ========================================================================
7063-.de Sh \" Subsection heading
7064-.br
7065-.if t .Sp
7066-.ne 5
7067-.PP
7068-\fB\\$1\fR
7069-.PP
7070-..
7071-.de Sp \" Vertical space (when we can't use .PP)
7072-.if t .sp .5v
7073-.if n .sp
7074-..
7075-.de Vb \" Begin verbatim text
7076-.ft CW
7077-.nf
7078-.ne \\$1
7079-..
7080-.de Ve \" End verbatim text
7081-.ft R
7082-.fi
7083-..
7084-.\" Set up some character translations and predefined strings. \*(-- will
7085-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
7086-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
7087-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
7088-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
7089-.\" nothing in troff, for use with C<>.
7090-.tr \(*W-
7091-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
7092-.ie n \{\
7093-. ds -- \(*W-
7094-. ds PI pi
7095-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
7096-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
7097-. ds L" ""
7098-. ds R" ""
7099-. ds C` ""
7100-. ds C' ""
7101-'br\}
7102-.el\{\
7103-. ds -- \|\(em\|
7104-. ds PI \(*p
7105-. ds L" ``
7106-. ds R" ''
7107-'br\}
7108-.\"
7109-.\" Escape single quotes in literal strings from groff's Unicode transform.
7110-.ie \n(.g .ds Aq \(aq
7111-.el .ds Aq '
7112-.\"
7113-.\" If the F register is turned on, we'll generate index entries on stderr for
7114-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
7115-.\" entries marked with X<> in POD. Of course, you'll have to process the
7116-.\" output yourself in some meaningful fashion.
7117-.ie \nF \{\
7118-. de IX
7119-. tm Index:\\$1\t\\n%\t"\\$2"
7120-..
7121-. nr % 0
7122-. rr F
7123-.\}
7124-.el \{\
7125-. de IX
7126-..
7127-.\}
7128-.\"
7129-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
7130-.\" Fear. Run. Save yourself. No user-serviceable parts.
7131-. \" fudge factors for nroff and troff
7132-.if n \{\
7133-. ds #H 0
7134-. ds #V .8m
7135-. ds #F .3m
7136-. ds #[ \f1
7137-. ds #] \fP
7138-.\}
7139-.if t \{\
7140-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
7141-. ds #V .6m
7142-. ds #F 0
7143-. ds #[ \&
7144-. ds #] \&
7145-.\}
7146-. \" simple accents for nroff and troff
7147-.if n \{\
7148-. ds ' \&
7149-. ds ` \&
7150-. ds ^ \&
7151-. ds , \&
7152-. ds ~ ~
7153-. ds /
7154-.\}
7155-.if t \{\
7156-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
7157-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
7158-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
7159-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
7160-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
7161-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
7162-.\}
7163-. \" troff and (daisy-wheel) nroff accents
7164-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
7165-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
7166-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
7167-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
7168-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
7169-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
7170-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
7171-.ds ae a\h'-(\w'a'u*4/10)'e
7172-.ds Ae A\h'-(\w'A'u*4/10)'E
7173-. \" corrections for vroff
7174-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
7175-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
7176-. \" for low resolution devices (crt and lpr)
7177-.if \n(.H>23 .if \n(.V>19 \
7178-\{\
7179-. ds : e
7180-. ds 8 ss
7181-. ds o a
7182-. ds d- d\h'-1'\(ga
7183-. ds D- D\h'-1'\(hy
7184-. ds th \o'bp'
7185-. ds Th \o'LP'
7186-. ds ae ae
7187-. ds Ae AE
7188-.\}
7189-.rm #[ #] #H #V #F C
7190-.\" ========================================================================
7191-.\"
7192-.IX Title "GSERIALVER 1"
7193-.TH GSERIALVER 1 "2009-01-24" "0.96-pre" "GNU"
7194-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
7195-.\" way too many mistakes in technical documents.
7196-.if n .ad l
7197-.nh
7198-.SH "NAME"
7199-gserialver \- version command
7200-.SH "SYNOPSIS"
7201-.IX Header "SYNOPSIS"
7202-gserialver [\fI\s-1OPTIONS\s0\fR]... \fI\s-1CLASS\s0\fR...
7203-.SH "DESCRIPTION"
7204-.IX Header "DESCRIPTION"
7205-Print the serialVersionUID of the specified classes.
7206-.SH "OPTIONS"
7207-.IX Header "OPTIONS"
7208-.IP "\fB\-classpath\fR \fI\s-1PATH\s0\fR" 4
7209-.IX Item "-classpath PATH"
7210-Class path to use to find classes.
7211-.PP
7212-Standard options:
7213-.IP "\fB\-help\fR" 4
7214-.IX Item "-help"
7215-Print help text, then exit.
7216-.IP "\fB\-version\fR" 4
7217-.IX Item "-version"
7218-Print version number, then exit.
7219-.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
7220-.IX Item "-JOPTION"
7221-Pass argument to the Java runtime.
7222-.SH "SEE ALSO"
7223-.IX Header "SEE ALSO"
7224-\&\fIjavac\fR\|(1), ...
7225diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gtnameserv.1 gcc-4.3.3/libjava/classpath/doc/gtnameserv.1
7226--- gcc-4.3.3.orig/libjava/classpath/doc/gtnameserv.1 2009-01-24 04:05:56.000000000 -0800
7227+++ gcc-4.3.3/libjava/classpath/doc/gtnameserv.1 1969-12-31 16:00:00.000000000 -0800
7228@@ -1,169 +0,0 @@
7229-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
7230-.\"
7231-.\" Standard preamble:
7232-.\" ========================================================================
7233-.de Sh \" Subsection heading
7234-.br
7235-.if t .Sp
7236-.ne 5
7237-.PP
7238-\fB\\$1\fR
7239-.PP
7240-..
7241-.de Sp \" Vertical space (when we can't use .PP)
7242-.if t .sp .5v
7243-.if n .sp
7244-..
7245-.de Vb \" Begin verbatim text
7246-.ft CW
7247-.nf
7248-.ne \\$1
7249-..
7250-.de Ve \" End verbatim text
7251-.ft R
7252-.fi
7253-..
7254-.\" Set up some character translations and predefined strings. \*(-- will
7255-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
7256-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
7257-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
7258-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
7259-.\" nothing in troff, for use with C<>.
7260-.tr \(*W-
7261-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
7262-.ie n \{\
7263-. ds -- \(*W-
7264-. ds PI pi
7265-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
7266-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
7267-. ds L" ""
7268-. ds R" ""
7269-. ds C` ""
7270-. ds C' ""
7271-'br\}
7272-.el\{\
7273-. ds -- \|\(em\|
7274-. ds PI \(*p
7275-. ds L" ``
7276-. ds R" ''
7277-'br\}
7278-.\"
7279-.\" Escape single quotes in literal strings from groff's Unicode transform.
7280-.ie \n(.g .ds Aq \(aq
7281-.el .ds Aq '
7282-.\"
7283-.\" If the F register is turned on, we'll generate index entries on stderr for
7284-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
7285-.\" entries marked with X<> in POD. Of course, you'll have to process the
7286-.\" output yourself in some meaningful fashion.
7287-.ie \nF \{\
7288-. de IX
7289-. tm Index:\\$1\t\\n%\t"\\$2"
7290-..
7291-. nr % 0
7292-. rr F
7293-.\}
7294-.el \{\
7295-. de IX
7296-..
7297-.\}
7298-.\"
7299-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
7300-.\" Fear. Run. Save yourself. No user-serviceable parts.
7301-. \" fudge factors for nroff and troff
7302-.if n \{\
7303-. ds #H 0
7304-. ds #V .8m
7305-. ds #F .3m
7306-. ds #[ \f1
7307-. ds #] \fP
7308-.\}
7309-.if t \{\
7310-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
7311-. ds #V .6m
7312-. ds #F 0
7313-. ds #[ \&
7314-. ds #] \&
7315-.\}
7316-. \" simple accents for nroff and troff
7317-.if n \{\
7318-. ds ' \&
7319-. ds ` \&
7320-. ds ^ \&
7321-. ds , \&
7322-. ds ~ ~
7323-. ds /
7324-.\}
7325-.if t \{\
7326-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
7327-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
7328-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
7329-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
7330-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
7331-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
7332-.\}
7333-. \" troff and (daisy-wheel) nroff accents
7334-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
7335-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
7336-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
7337-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
7338-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
7339-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
7340-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
7341-.ds ae a\h'-(\w'a'u*4/10)'e
7342-.ds Ae A\h'-(\w'A'u*4/10)'E
7343-. \" corrections for vroff
7344-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
7345-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
7346-. \" for low resolution devices (crt and lpr)
7347-.if \n(.H>23 .if \n(.V>19 \
7348-\{\
7349-. ds : e
7350-. ds 8 ss
7351-. ds o a
7352-. ds d- d\h'-1'\(ga
7353-. ds D- D\h'-1'\(hy
7354-. ds th \o'bp'
7355-. ds Th \o'LP'
7356-. ds ae ae
7357-. ds Ae AE
7358-.\}
7359-.rm #[ #] #H #V #F C
7360-.\" ========================================================================
7361-.\"
7362-.IX Title "GTNAMESERV 1"
7363-.TH GTNAMESERV 1 "2009-01-24" "0.96-pre" "GNU"
7364-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
7365-.\" way too many mistakes in technical documents.
7366-.if n .ad l
7367-.nh
7368-.SH "NAME"
7369-gtnameserv \- Naming service
7370-.SH "SYNOPSIS"
7371-.IX Header "SYNOPSIS"
7372-tnameserv [\fI\s-1OPTIONS\s0\fR]
7373-.SH "DESCRIPTION"
7374-.IX Header "DESCRIPTION"
7375-To be written ...
7376-.SH "OPTIONS"
7377-.IX Header "OPTIONS"
7378-.IP "\fB\-ORBInitialPort\fR \fI\s-1PORT\s0\fR" 4
7379-.IX Item "-ORBInitialPort PORT"
7380-Port on which naming service is to be started.
7381-.IP "\fB\-ior\fR \fI\s-1FILE\s0\fR" 4
7382-.IX Item "-ior FILE"
7383-File in which to store naming service's \s-1IOR\s0 reference.
7384-.PP
7385-Standard options:
7386-.IP "\fB\-help\fR" 4
7387-.IX Item "-help"
7388-Print help text, then exit.
7389-.IP "\fB\-version\fR" 4
7390-.IX Item "-version"
7391-Print version number, then exit.
7392-.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4
7393-.IX Item "-JOPTION"
7394-Pass argument to the Java runtime.
7395-.SH "SEE ALSO"
7396-.IX Header "SEE ALSO"
7397-\&\fIjava\fR\|(1), ...
7398diff -Naur gcc-4.3.3.orig/libstdc++-v3/ChangeLog gcc-4.3.3/libstdc++-v3/ChangeLog
7399--- gcc-4.3.3.orig/libstdc++-v3/ChangeLog 2009-01-24 02:16:26.000000000 -0800
7400+++ gcc-4.3.3/libstdc++-v3/ChangeLog 2009-01-27 03:39:42.241832000 -0800
7401@@ -1,3 +1,11 @@
7402+2009-01-27 Uros Bizjak <ubizjak@gmail.com>
7403+
7404+ Backport from mainline:
7405+ 2009-01-13 Uros Bizjak <ubizjak@gmail.com>
7406+
7407+ * scripts/extract_symvers: Add sed script to remove ' [<other>: xx] '
7408+ field from readelf output.
7409+
7410 2009-01-24 Release Manager
7411
7412 * GCC 4.3.3 released.
7413diff -Naur gcc-4.3.3.orig/libstdc++-v3/scripts/extract_symvers gcc-4.3.3/libstdc++-v3/scripts/extract_symvers
7414--- gcc-4.3.3.orig/libstdc++-v3/scripts/extract_symvers 2005-08-16 19:28:44.000000000 -0700
7415+++ gcc-4.3.3/libstdc++-v3/scripts/extract_symvers 2009-01-27 03:39:42.241832000 -0800
7416@@ -1,6 +1,6 @@
7417 #!/bin/sh
7418
7419-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
7420+# Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
7421 #
7422 # This file is part of the GNU ISO C++ Library. This library is free
7423 # software; you can redistribute it and/or modify it under the
7424@@ -52,7 +52,9 @@
7425
7426 tmp=extract.$$
7427
7428-${readelf} ${lib} | sed '/\.dynsym/,/^$/p;d' | egrep -v ' (LOCAL|UND) ' |\
7429+${readelf} ${lib} |\
7430+sed -e 's/ \[<other>: [A-Fa-f0-9]*\] //' -e '/\.dynsym/,/^$/p;d' |\
7431+egrep -v ' (LOCAL|UND) ' |\
7432 awk '{ if ($4 == "FUNC" || $4 == "NOTYPE")
7433 printf "%s:%s\n", $4, $8;
7434 else if ($4 == "OBJECT")
Note: See TracBrowser for help on using the repository browser.