Submitted By: Jim Gifford (jim at cross-lfs dot org) Date: 03-23-2009 Initial Package Version: 4.3.3 Origin: Upstream Upstream Status: Applied Description: This is a branch update for gcc-4.3.3, and should be rechecked periodically. diff -Naur gcc-4.3.3.orig/gcc/ada/ChangeLog gcc-4.3.3/gcc/ada/ChangeLog --- gcc-4.3.3.orig/gcc/ada/ChangeLog 2009-01-24 02:15:46.000000000 -0800 +++ gcc-4.3.3/gcc/ada/ChangeLog 2009-03-01 15:05:14.694633000 -0800 @@ -1,3 +1,8 @@ +2009-02-28 Eric Botcazou + + * Makefile.in (cygwin/mingw): Revert accidental EH_MECHANISM change + made on 2007-12-06. + 2009-01-24 Release Manager * GCC 4.3.3 released. diff -Naur gcc-4.3.3.orig/gcc/ada/Makefile.in gcc-4.3.3/gcc/ada/Makefile.in --- gcc-4.3.3.orig/gcc/ada/Makefile.in 2008-02-13 11:04:53.000000000 -0800 +++ gcc-4.3.3/gcc/ada/Makefile.in 2009-02-28 09:30:26.328421000 -0800 @@ -1353,7 +1353,6 @@ mlib-tgt-specific.adbkind == cdk_attrs) + t = t->declarator; + flexible_array_member = (t->kind == cdk_id); + if (flexible_array_member + && pedantic && !flag_isoc99 && !in_system_header) pedwarn ("ISO C90 does not support flexible array members"); /* ISO C99 Flexible array members are effectively identical to GCC's zero-length array extension. */ - itype = build_range_type (sizetype, size_zero_node, NULL_TREE); + if (flexible_array_member || array_parm_vla_unspec_p) + itype = build_range_type (sizetype, size_zero_node, + NULL_TREE); } else if (decl_context == PARM) { @@ -5362,6 +5370,8 @@ error ("redefinition of %", name); else error ("redefinition of %", name); + /* Don't create structures using a name already in use. */ + ref = NULL_TREE; } else if (C_TYPE_BEING_DEFINED (ref)) { diff -Naur gcc-4.3.3.orig/gcc/ChangeLog gcc-4.3.3/gcc/ChangeLog --- gcc-4.3.3.orig/gcc/ChangeLog 2009-01-24 02:16:13.000000000 -0800 +++ gcc-4.3.3/gcc/ChangeLog 2009-03-17 06:11:58.563094000 -0700 @@ -1,3 +1,341 @@ +2009-03-17 H.J. Lu + + Backport from mainline: + 2009-03-17 H.J. Lu + + PR target/39477 + * doc/extend.texi: Correct register behavior for regparm on + Intel 386. + +2009-03-12 H.J. Lu + + Backport from mainline: + 2009-03-12 H.J. Lu + + PR target/39327 + * config/i386/sse.md (sse3_addsubv4sf3): Correct item bits. + (sse3_addsubv2df3): Likewise. + +2009-03-09 Denis Chertykov + + * config/avr/avr.md ("andsi3"): Fix wrong cc attribute. + +2009-03-02 Richard Sandiford + + * config/mips/mips.c (mips_mdebug_abi_name): Fix the handling + of ABI_64. + +2009-03-02 Ulrich Weigand + + * config/spu/spu.c (TARGET_SECTION_TYPE_FLAGS): Define. + (spu_section_type_flags): New function. + +2009-02-28 Martin Jambor + + Backport from mainline: + 2008-12-02 Martin Jambor + + PR middle-end/37861 + * tree-ssa-forwprop.c + (forward_propagate_addr_into_variable_array_index): Check that the + offset is not computed from a MULT_EXPR if element size is one. + +2009-02-28 Uros Bizjak + + Backport from mainline: + 2009-02-26 Uros Bizjak + + * config/alpha/alpha.h (alpha_expand_mov): Return false if + force_const_mem returns NULL_RTX. + +2009-02-26 Uros Bizjak + + Backport from mainline: + 2009-02-02 Jakub Jelinek + + PR inline-asm/39058 + * recog.h (asm_operand_ok): Add constraints argument. + * recog.c (asm_operand_ok): Likewise. If it is set, for digits + recurse on matching constraint. + (check_asm_operands): Pass constraints as 3rd argument to + asm_operand_ok. Don't look up matching constraint here. + * stmt.c (expand_asm_operands): Pass NULL as 3rd argument + to asm_operand_ok. + +2009-02-25 Janis Johnson + + Backport from mainline: + 2008-10-29 Joseph Myers + + PR middle-end/36578 + * convert.c (convert_to_real): Do not optimize conversions of + binary arithmetic operations between binary and decimal + floating-point types. Consider mode of target type in determining + decimal type for arithmetic. Unless + flag_unsafe_math_optimizations, do not optimize binary conversions + where this may change rounding behavior. + * real.c (real_can_shorten_arithmetic): New. + * real.h (real_can_shorten_arithmetic): Declare. + +2009-02-21 Uros Bizjak + + Backport from mainline: + 2009-02-20 Jaka Mocnik + + * calls.c (emit_library_call_value_1): Use slot_offset instead of + offset when calculating bounds for indexing stack_usage_map. Fixes + a buffer overflow with certain target setups. + +2009-02-20 Steve Ellcey + + PR target/38056 + * config/ia64/ia64.c (ia64_function_ok_for_sibcall): Check + TARGET_CONST_GP. + +2009-02-19 Uros Bizjak + + PR target/39228 + * config/i386/i386.md (isinfxf2): Split from isinf2. + (UNSPEC_FXAM_MEM): New unspec. + (fxam2_i387_with_temp): New insn and split pattern. + (isinf2): Use MODEF mode iterator. Force operand[1] through + memory using fxam2_i387_with_temp to remove excess precision. + +2009-02-17 Uros Bizjak + + * config/soft-fp/double.h: Update from glibc CVS. + +2009-02-17 Joseph Myers + + PR c/35446 + * c-parser.c (c_parser_braced_init): Call pop_init_level when + skipping until next close brace. + +2009-02-13 Joseph Myers + + PR c/35444 + * c-parser.c (c_parser_parms_list_declarator): Discard pending + sizes on syntax error after some arguments have been parsed. + +2009-02-11 Uros Bizjak + Jakub Jelinek + + PR target/39118 + * config/i386/i386.md (UNSPEC_MEMORY_BLOCKAGE): New constant. + (memory_blockage): New expander. + (*memory_blockage): New insn pattern. + * config/i386/i386.c (ix86_expand_prologue): Use memory_blockage + instead of general blockage at the end of function prologue when + frame pointer is used to access red zone area. Do not emit blockage + when profiling, it is emitted in generic code. + (ix86_expand_epilogue): Emit memory_blockage at the beginning of + function epilogue when frame pointer is used to access red zone area. + +2009-02-10 Steve Ellcey + + PR c/39084 + * c-decl.c (start_struct): Return NULL on error. + +2009-02-10 Uros Bizjak + + PR target/39118 + * config/i386/i386.c (expand_prologue): Emit blockage at the end + of function prologue when frame pointer is used to access + red zone area. + +2009-02-09 Janis Johnson + + PR c/39035 + * real.c (do_compare): Special-case compare of zero against + decimal float value. + +2009-02-08 Joseph Myers + + PR c/35434 + * c-common.c (handle_alias_attribute): Disallow attribute for + anything not a FUNCTION_DECL or VAR_DECL. + +2009-02-08 Joseph Myers + + PR c/36432 + * c-decl.c (grokdeclarator): Don't treat [] declarators in fields + as indicating flexible array members unless the field itself is + being declarared as the incomplete array. + +2009-02-07 Kaz Kojima + + Backport from mainline: + 2009-02-05 Kaz Kojima + + PR target/38991 + * config/sh/predicates.md (general_movsrc_operand): Don't check + the subreg of system registers here. + +2009-02-05 Joseph Myers + + PR c/35435 + * c-common.c (handle_tls_model_attribute): Ignore attribute for + non-VAR_DECLs without checking DECL_THREAD_LOCAL_P. + +2009-02-05 Richard Guenther + + Backport from mainline + 2009-02-05 Daniel Berlin + Richard Guenther + + PR tree-optimization/39100 + * tree-ssa-structalias.c (do_ds_constraint): Actually do what the + comment says and add edges. + +2009-02-04 Ramana Radhakrishnan + + PR rtl-optimization/39076 + Backport from mainline: + 2008-06-28 Andrew Jenner + + * regrename.c (build_def_use): Don't copy RTX. + +2009-02-04 Joseph Myers + + PR c/35433 + * c-typeck.c (composite_type): Set TYPE_SIZE and TYPE_SIZE_UNIT + for composite type involving a zero-length array type. + +2009-02-02 Catherine Moore + + * sde.h (SUBTARGET_ARM_SPEC): Don't assemble -fpic code as + -mabicalls. + +2009-01-31 John David Anglin + + * config/pa/fptr.c: Revert license to GPL 2. + * config/pa/milli64.S: Likewise. + +2009-01-30 Richard Guenther + + PR tree-optimization/39041 + * tree-ssa-forwprop.c (forward_propagate_addr_expr_1): + Propagate variable indices only if the types match for this stmt. + +2009-01-29 Uros Bizjak + + Backport from mainline: + 2009-01-28 Uros Bizjak + + PR target/38988 + * config/i386/i386.md (set_rip_rex64): Wrap operand 1 in label_ref. + (set_got_offset_rex64): Ditto. + + 2009-01-27 Uros Bizjak + + PR middle-end/38969 + * calls.c (initialize_argument_information): Do not wrap complex + arguments in SAVE_EXPR. + +2009-01-27 Steve Ellcey + + PR middle-end/38615 + * gimplify.c (gimplify_init_constructor): Fix promotion of const + variables to static. + * doc/invoke.texi (-fmerge-all-constants): Update description. + +2009-01-27 Uros Bizjak + + Backport from mainline: + 2009-01-13 Uros Bizjak + + * config/alpha/alpha.c (alpha_legitimate_address_p): Explicit + relocations of local symbols wider than UNITS_PER_WORD are not valid. + (alpha_legitimize_address): Do not split local symbols wider than + UNITS_PER_WORD into HIGH/LO_SUM parts. + + 2009-01-07 Uros Bizjak + + PR target/38706 + * config/alpha/alpha.c (alpha_end_function): For TARGET_ABI_OSF, call + free_after_compilation when outputting a thunk. + (alpha_output_mi_thunk_osf): Assert that we are processing a thunk. + Do not call free_after_compilation here. + + 2008-12-22 Uros Bizjak + + * config/alpha/elf.h (ASM_OUTPUT_EXTERNAL): New macro. + + 2008-12-21 Uros Bizjak + + * config/alpha/alpha.c (alpha_pad_noreturn): New static function. + (alpha_reorg): Call alpha_pad_noreturn. + + 2008-12-08 Uros Bizjak + + * config/alpha/alpha.c (alpha_set_memflags): Process memory + references in full insn sequence. + + 2008-12-05 Uros Bizjak + + * config/alpha/alpha.c (alpha_fold_vector_minmax): Create + VIEW_CONVERT_EXPR to convert output to long_integer_type_node. + + (alpha_emit_conditional_branch): Do not generate direct branch + for UNORDERED comparisons. + +2008-01-26 Paolo Bonzini + + PR tree-optimization/38932 + * fold-const.c (fold_unary_ignore_overflow): New. + * tree.h (fold_unary_ignore_overflow): Declare. + * tree-ssa-ccp.c (ccp_fold): Use fold_unary_ignore_overflow. + * tree-ssa-sccvn.c (simplify_unary_expression): Likewise. + +2009-01-25 Uros Bizjak + + Backport from mainline: + 2009-01-22 Uros Bizjak + + PR target/38931 + * config/i386/i386.md (*movsi_1): Use type "mmx" for alternative 2. + (*movdi_1_rex64): Use type "mmx" for alternative 5. + + 2009-01-21 Uros Bizjak + + PR rtl-optimization/38879 + * alias.c (base_alias_check): Unaligned access via AND address can + alias all surrounding object types except those with sizes equal + or wider than the size of unaligned access. + +2009-01-25 Richard Guenther + + Backport from mainline: + 2008-12-02 Richard Guenther + + PR tree-optimization/38359 + * fold-const.c (fold_binary): Fold -1 >> x to -1 only for + non-negative x. + +2009-01-24 Eric Botcazou + + * config/sparc/linux.h (DBX_REGISTER_NUMBER): Delete. + * config/sparc/linux64.h (DBX_REGISTER_NUMBER): Likewise. + * config/sparc/sysv4.h (DBX_REGISTER_NUMBER): Likewise. + +2009-01-24 H.J. Lu + + PR target/38902 + Backport from mainline: + 2008-12-23 Jakub Jelinek + + * config/i386/i386.c (expand_movmem_via_rep_mov): Set MEM_SIZE + correctly. + (expand_setmem_via_rep_stos): Add ORIG_VALUE argument. If + ORIG_VALUE is const0_rtx and COUNT is constant, set MEM_SIZE + on DESTMEM. + (ix86_expand_setmem): Adjust callers. + +2008-01-24 Richard Guenther + + * BASE-VER: Set to 4.3.4. + * DEV-PHASE: Set to prerelease. + 2009-01-24 Release Manager * GCC 4.3.3 released. @@ -5,8 +343,7 @@ 2009-01-20 Joseph Myers PR other/38758 - * longlong.h: Update copyright years. Use soft-fp license - notice. + * longlong.h: Update copyright years. Use soft-fp license notice. 2009-01-19 Richard Guenther @@ -41,7 +378,8 @@ 2009-01-11 Matthias Klose - PR middle-end/38616, backport from mainline: + PR middle-end/38616 + Backport from mainline: 2008-05-04 Uros Bizjak * config/i386/i386.md (*strmovsi_1): Simplify asm alternatives. @@ -509,8 +847,8 @@ PR tree-optimization/37102 * tree-outof-ssa.c (remove_gimple_phi_args): Remove all the PHI args from a node. Check to see if another PHI is dead. - (eliminate_useless_phis): Rename from eliminate_virtual_phis and remove - real PHIs which have no uses. + (eliminate_useless_phis): Rename from eliminate_virtual_phis and + remove real PHIs which have no uses. (rewrite_out_of_ssa): Call eliminate_useless_phis. 2008-10-08 Simon Martin @@ -986,8 +1324,10 @@ (MFC_MIN_DMA_LIST_ELEMENTS): New define. (MFC_MAX_DMA_LIST_ELEMENTS): Likewise. - (MFC_MIN_DMA_LIST_SIZE): Redefine in terms of MFC_MIN_DMA_LIST_ELEMENTS. - (MFC_MAX_DMA_LIST_SIZE): Redefine in terms of MFC_MAX_DMA_LIST_ELEMENTS. + (MFC_MIN_DMA_LIST_SIZE): Redefine in terms of + MFC_MIN_DMA_LIST_ELEMENTS. + (MFC_MAX_DMA_LIST_SIZE): Redefine in terms of + MFC_MAX_DMA_LIST_ELEMENTS. (MFC_START_ENABLE): Remove PPU-only define. (MFC_PUTS_CMD, MFC_PUTFS_CMD, MFC_PUTBS_CMD): Likewise. diff -Naur gcc-4.3.3.orig/gcc/config/alpha/alpha.c gcc-4.3.3/gcc/config/alpha/alpha.c --- gcc-4.3.3.orig/gcc/config/alpha/alpha.c 2008-09-08 16:16:55.000000000 -0700 +++ gcc-4.3.3/gcc/config/alpha/alpha.c 2009-02-28 09:22:52.585822000 -0800 @@ -1,6 +1,7 @@ /* Subroutines used for code generation on the DEC Alpha. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Free Software Foundation, Inc. Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu) This file is part of GCC. @@ -863,9 +864,11 @@ } } - /* If we're managing explicit relocations, LO_SUM is valid, as - are small data symbols. */ - else if (TARGET_EXPLICIT_RELOCS) + /* If we're managing explicit relocations, LO_SUM is valid, as are small + data symbols. Avoid explicit relocations in modes larger than word + mode since i.e. $LC0+8($1) can fold around +/- 32k offset. */ + else if (TARGET_EXPLICIT_RELOCS + && GET_MODE_SIZE (mode) <= UNITS_PER_WORD) { if (small_symbolic_operand (x, Pmode)) return true; @@ -915,8 +918,7 @@ to be legitimate. If we find one, return the new, valid address. */ rtx -alpha_legitimize_address (rtx x, rtx scratch, - enum machine_mode mode ATTRIBUTE_UNUSED) +alpha_legitimize_address (rtx x, rtx scratch, enum machine_mode mode) { HOST_WIDE_INT addend; @@ -964,8 +966,12 @@ goto split_addend; } - /* If this is a local symbol, split the address into HIGH/LO_SUM parts. */ - if (TARGET_EXPLICIT_RELOCS && symbolic_operand (x, Pmode)) + /* If this is a local symbol, split the address into HIGH/LO_SUM parts. + Avoid modes larger than word mode since i.e. $LC0+8($1) can fold + around +/- 32k offset. */ + if (TARGET_EXPLICIT_RELOCS + && GET_MODE_SIZE (mode) <= UNITS_PER_WORD + && symbolic_operand (x, Pmode)) { rtx r0, r16, eqv, tga, tp, insn, dest, seq; @@ -1602,18 +1608,17 @@ return -1; } -/* Given INSN, which is an INSN list or the PATTERN of a single insn - generated to perform a memory operation, look for any MEMs in either +/* Given SEQ, which is an INSN list, look for any MEMs in either a SET_DEST or a SET_SRC and copy the in-struct, unchanging, and volatile flags from REF into each of the MEMs found. If REF is not a MEM, don't do anything. */ void -alpha_set_memflags (rtx insn, rtx ref) +alpha_set_memflags (rtx seq, rtx ref) { - rtx *base_ptr; + rtx insn; - if (GET_CODE (ref) != MEM) + if (!MEM_P (ref)) return; /* This is only called from alpha.md, after having had something @@ -1626,11 +1631,11 @@ && !MEM_READONLY_P (ref)) return; - if (INSN_P (insn)) - base_ptr = &PATTERN (insn); - else - base_ptr = &insn; - for_each_rtx (base_ptr, alpha_set_memflags_1, (void *) ref); + for (insn = seq; insn; insn = NEXT_INSN (insn)) + if (INSN_P (insn)) + for_each_rtx (&PATTERN (insn), alpha_set_memflags_1, (void *) ref); + else + gcc_unreachable (); } static rtx alpha_emit_set_const (rtx, enum machine_mode, HOST_WIDE_INT, @@ -2118,6 +2123,8 @@ bool alpha_expand_mov (enum machine_mode mode, rtx *operands) { + rtx tmp; + /* If the output is not a register, the input must be. */ if (GET_CODE (operands[0]) == MEM && ! reg_or_0_operand (operands[1], mode)) @@ -2126,8 +2133,6 @@ /* Allow legitimize_address to perform some simplifications. */ if (mode == Pmode && symbolic_operand (operands[1], mode)) { - rtx tmp; - tmp = alpha_legitimize_address (operands[1], operands[0], mode); if (tmp) { @@ -2152,14 +2157,18 @@ } /* Otherwise we've nothing left but to drop the thing to memory. */ - operands[1] = force_const_mem (mode, operands[1]); + tmp = force_const_mem (mode, operands[1]); + + if (tmp == NULL_RTX) + return false; + if (reload_in_progress) { - emit_move_insn (operands[0], XEXP (operands[1], 0)); - operands[1] = replace_equiv_address (operands[1], operands[0]); + emit_move_insn (operands[0], XEXP (tmp, 0)); + operands[1] = replace_equiv_address (tmp, operands[0]); } else - operands[1] = validize_mem (operands[1]); + operands[1] = validize_mem (tmp); return false; } @@ -2452,7 +2461,7 @@ if (alpha_compare.fp_p) { cmp_mode = DFmode; - if (flag_unsafe_math_optimizations) + if (flag_unsafe_math_optimizations && cmp_code != UNORDERED) { /* When we are not as concerned about non-finite values, and we are comparing against zero, we can branch directly. */ @@ -6794,7 +6803,7 @@ tree op0 = fold_convert (vtype, op[0]); tree op1 = fold_convert (vtype, op[1]); tree val = fold_build2 (code, vtype, op0, op1); - return fold_convert (long_integer_type_node, val); + return fold_build1 (VIEW_CONVERT_EXPR, long_integer_type_node, val); } static tree @@ -8242,6 +8251,11 @@ if (GET_CODE (insn) == CALL_INSN) output_asm_insn (get_insn_template (CODE_FOR_nop, NULL), NULL); +#if TARGET_ABI_OSF + if (current_function_is_thunk) + free_after_compilation (cfun); +#endif + #if TARGET_ABI_OPEN_VMS alpha_write_linkage (file, fnname, decl); #endif @@ -8281,6 +8295,8 @@ HOST_WIDE_INT hi, lo; rtx this, insn, funexp; + gcc_assert (current_function_is_thunk); + /* We always require a valid GP. */ emit_insn (gen_prologue_ldgp ()); emit_note (NOTE_INSN_PROLOGUE_END); @@ -9268,12 +9284,68 @@ i = next; } } + +/* Insert an unop between a noreturn function call and GP load. */ + +static void +alpha_pad_noreturn (void) +{ + rtx insn, next; + + for (insn = get_insns (); insn; insn = NEXT_INSN (insn)) + { + rtx pat; + + if (!CALL_P (insn) + || !find_reg_note (insn, REG_NORETURN, NULL_RTX)) + continue; + + next = next_active_insn (insn); + + if (next) + { + pat = PATTERN (next); + + if (GET_CODE (pat) == SET + && GET_CODE (SET_SRC (pat)) == UNSPEC_VOLATILE + && XINT (SET_SRC (pat), 1) == UNSPECV_LDGP1) + emit_insn_after (gen_unop (), insn); + } + } +} /* Machine dependent reorg pass. */ static void alpha_reorg (void) { + /* Workaround for a linker error that triggers when an + exception handler immediatelly follows a noreturn function. + + The instruction stream from an object file: + + 54: 00 40 5b 6b jsr ra,(t12),58 <__func+0x58> + 58: 00 00 ba 27 ldah gp,0(ra) + 5c: 00 00 bd 23 lda gp,0(gp) + 60: 00 00 7d a7 ldq t12,0(gp) + 64: 00 40 5b 6b jsr ra,(t12),68 <__func+0x68> + + was converted in the final link pass to: + + fdb24: a0 03 40 d3 bsr ra,fe9a8 <_called_func+0x8> + fdb28: 00 00 fe 2f unop + fdb2c: 00 00 fe 2f unop + fdb30: 30 82 7d a7 ldq t12,-32208(gp) + fdb34: 00 40 5b 6b jsr ra,(t12),fdb38 <__func+0x68> + + GP load instructions were wrongly cleared by the linker relaxation + pass. This workaround prevents removal of GP loads by inserting + an unop instruction between a noreturn function call and + exception handler prologue. */ + + if (current_function_has_exception_handlers ()) + alpha_pad_noreturn (); + if (alpha_tp != ALPHA_TP_PROG || flag_exceptions) alpha_handle_trap_shadows (); diff -Naur gcc-4.3.3.orig/gcc/config/alpha/elf.h gcc-4.3.3/gcc/config/alpha/elf.h --- gcc-4.3.3.orig/gcc/config/alpha/elf.h 2007-08-02 03:49:31.000000000 -0700 +++ gcc-4.3.3/gcc/config/alpha/elf.h 2009-01-27 03:39:42.241832000 -0800 @@ -423,3 +423,13 @@ #if defined(HAVE_LD_EH_FRAME_HDR) #define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " #endif + +/* A C statement (sans semicolon) to output to the stdio stream STREAM + any text necessary for declaring the name of an external symbol + named NAME which is referenced in this compilation but not defined. + It is needed to properly support non-default visibility. */ + +#ifndef ASM_OUTPUT_EXTERNAL +#define ASM_OUTPUT_EXTERNAL(FILE, DECL, NAME) \ + default_elf_asm_output_external (FILE, DECL, NAME) +#endif diff -Naur gcc-4.3.3.orig/gcc/config/avr/avr.md gcc-4.3.3/gcc/config/avr/avr.md --- gcc-4.3.3.orig/gcc/config/avr/avr.md 2008-09-12 10:29:38.000000000 -0700 +++ gcc-4.3.3/gcc/config/avr/avr.md 2009-03-09 13:49:28.992696000 -0700 @@ -1,8 +1,8 @@ ;; -*- Mode: Scheme -*- ;; Machine description for GNU compiler, ;; for ATMEL AVR micro controllers. -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 -;; Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, +;; 2009 Free Software Foundation, Inc. ;; Contributed by Denis Chertykov (denisc@overta.ru) ;; This file is part of GCC. @@ -1180,7 +1180,7 @@ return \"bug\"; }" [(set_attr "length" "4,4") - (set_attr "cc" "set_n,set_n")]) + (set_attr "cc" "set_n,clobber")]) ;;||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ;; ior diff -Naur gcc-4.3.3.orig/gcc/config/i386/i386.c gcc-4.3.3/gcc/config/i386/i386.c --- gcc-4.3.3.orig/gcc/config/i386/i386.c 2008-08-28 06:31:33.000000000 -0700 +++ gcc-4.3.3/gcc/config/i386/i386.c 2009-02-11 03:53:47.721500000 -0800 @@ -6483,14 +6483,21 @@ insn = emit_insn (gen_set_got (pic_offset_table_rtx)); } - /* Prevent function calls from being scheduled before the call to mcount. - In the pic_reg_used case, make sure that the got load isn't deleted. */ - if (current_function_profile) - { - if (pic_reg_used) - emit_insn (gen_prologue_use (pic_offset_table_rtx)); - emit_insn (gen_blockage ()); - } + /* In the pic_reg_used case, make sure that the got load isn't deleted + when mcount needs it. Blockage to avoid call movement across mcount + call is emitted in generic code after the NOTE_INSN_PROLOGUE_END + note. */ + if (current_function_profile && pic_reg_used) + emit_insn (gen_prologue_use (pic_offset_table_rtx)); + + /* Prevent instructions from being scheduled into register save push + sequence when access to the redzone area is done through frame pointer. + The offset betweeh the frame pointer and the stack pointer is calculated + relative to the value of the stack pointer at the end of the function + prologue, and moving instructions that access redzone area via frame + pointer inside push sequence violates this assumption. */ + if (frame_pointer_needed && frame.red_zone_size) + emit_insn (gen_memory_blockage ()); /* Emit cld instruction if stringops are used in the function. */ if (TARGET_CLD && ix86_current_function_needs_cld) @@ -6539,6 +6546,11 @@ ix86_compute_frame_layout (&frame); + /* See the comment about red zone and frame + pointer usage in ix86_expand_prologue. */ + if (frame_pointer_needed && frame.red_zone_size) + emit_insn (gen_memory_blockage ()); + /* Calculate start of saved registers relative to ebp. Special care must be taken for the normal return case of a function using eh_return: the eax and edx registers are marked as saved, but not @@ -14773,6 +14785,22 @@ destexp = gen_rtx_PLUS (Pmode, destptr, countreg); srcexp = gen_rtx_PLUS (Pmode, srcptr, countreg); } + if (CONST_INT_P (count)) + { + count = GEN_INT (INTVAL (count) + & ~((HOST_WIDE_INT) GET_MODE_SIZE (mode) - 1)); + destmem = shallow_copy_rtx (destmem); + srcmem = shallow_copy_rtx (srcmem); + set_mem_size (destmem, count); + set_mem_size (srcmem, count); + } + else + { + if (MEM_SIZE (destmem)) + set_mem_size (destmem, NULL_RTX); + if (MEM_SIZE (srcmem)) + set_mem_size (srcmem, NULL_RTX); + } emit_insn (gen_rep_mov (destptr, destmem, srcptr, srcmem, countreg, destexp, srcexp)); } @@ -14781,8 +14809,8 @@ Arguments have same meaning as for previous function */ static void expand_setmem_via_rep_stos (rtx destmem, rtx destptr, rtx value, - rtx count, - enum machine_mode mode) + rtx count, enum machine_mode mode, + rtx orig_value) { rtx destexp; rtx countreg; @@ -14799,6 +14827,15 @@ } else destexp = gen_rtx_PLUS (Pmode, destptr, countreg); + if (orig_value == const0_rtx && CONST_INT_P (count)) + { + count = GEN_INT (INTVAL (count) + & ~((HOST_WIDE_INT) GET_MODE_SIZE (mode) - 1)); + destmem = shallow_copy_rtx (destmem); + set_mem_size (destmem, count); + } + else if (MEM_SIZE (destmem)) + set_mem_size (destmem, NULL_RTX); emit_insn (gen_rep_stos (destptr, countreg, destmem, value, destexp)); } @@ -15871,15 +15908,15 @@ break; case rep_prefix_8_byte: expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp, - DImode); + DImode, val_exp); break; case rep_prefix_4_byte: expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp, - SImode); + SImode, val_exp); break; case rep_prefix_1_byte: expand_setmem_via_rep_stos (dst, destreg, promoted_val, count_exp, - QImode); + QImode, val_exp); break; } /* Adjust properly the offset of src and dest memory for aliasing. */ diff -Naur gcc-4.3.3.orig/gcc/config/i386/i386.md gcc-4.3.3/gcc/config/i386/i386.md --- gcc-4.3.3.orig/gcc/config/i386/i386.md 2009-01-11 09:29:23.000000000 -0800 +++ gcc-4.3.3/gcc/config/i386/i386.md 2009-02-19 04:44:40.878358000 -0800 @@ -67,12 +67,13 @@ (UNSPEC_DEF_CFA 15) (UNSPEC_SET_RIP 16) (UNSPEC_SET_GOT_OFFSET 17) + (UNSPEC_MEMORY_BLOCKAGE 18) ; TLS support - (UNSPEC_TP 18) - (UNSPEC_TLS_GD 19) - (UNSPEC_TLS_LD_BASE 20) - (UNSPEC_TLSDESC 21) + (UNSPEC_TP 20) + (UNSPEC_TLS_GD 21) + (UNSPEC_TLS_LD_BASE 22) + (UNSPEC_TLSDESC 23) ; Other random patterns (UNSPEC_SCAS 30) @@ -144,6 +145,7 @@ (UNSPEC_FPREM1_U 91) (UNSPEC_C2_FLAG 95) + (UNSPEC_FXAM_MEM 96) ; SSP patterns (UNSPEC_SP_SET 100) @@ -1397,7 +1399,7 @@ gcc_unreachable (); } - case TYPE_MMXADD: + case TYPE_MMX: return "pxor\t%0, %0"; case TYPE_MMXMOV: @@ -1415,7 +1417,7 @@ } [(set (attr "type") (cond [(eq_attr "alternative" "2") - (const_string "mmxadd") + (const_string "mmx") (eq_attr "alternative" "3,4,5") (const_string "mmxmov") (eq_attr "alternative" "6") @@ -2231,7 +2233,7 @@ return "movq\t{%1, %0|%0, %1}"; case TYPE_SSELOG1: - case TYPE_MMXADD: + case TYPE_MMX: return "pxor\t%0, %0"; case TYPE_MULTI: @@ -2252,7 +2254,7 @@ } [(set (attr "type") (cond [(eq_attr "alternative" "5") - (const_string "mmxadd") + (const_string "mmx") (eq_attr "alternative" "6,7,8,9,10") (const_string "mmxmov") (eq_attr "alternative" "11") @@ -14877,6 +14879,24 @@ "" [(set_attr "length" "0")]) +;; Do not schedule instructions accessing memory across this point. + +(define_expand "memory_blockage" + [(set (match_dup 0) + (unspec:BLK [(match_dup 0)] UNSPEC_MEMORY_BLOCKAGE))] + "" +{ + operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode)); + MEM_VOLATILE_P (operands[0]) = 1; +}) + +(define_insn "*memory_blockage" + [(set (match_operand:BLK 0 "" "") + (unspec:BLK [(match_dup 0)] UNSPEC_MEMORY_BLOCKAGE))] + "" + "" + [(set_attr "length" "0")]) + ;; As USE insns aren't meaningful after reload, this is used instead ;; to prevent deleting instructions setting registers for PIC code (define_insn "prologue_use" @@ -15001,7 +15021,7 @@ (define_insn "set_rip_rex64" [(set (match_operand:DI 0 "register_operand" "=r") - (unspec:DI [(match_operand:DI 1 "" "")] UNSPEC_SET_RIP))] + (unspec:DI [(label_ref (match_operand 1 "" ""))] UNSPEC_SET_RIP))] "TARGET_64BIT" "lea{q}\t{%l1(%%rip), %0|%0, %l1[rip]}" [(set_attr "type" "lea") @@ -15009,7 +15029,9 @@ (define_insn "set_got_offset_rex64" [(set (match_operand:DI 0 "register_operand" "=r") - (unspec:DI [(match_operand:DI 1 "" "")] UNSPEC_SET_GOT_OFFSET))] + (unspec:DI + [(label_ref (match_operand 1 "" ""))] + UNSPEC_SET_GOT_OFFSET))] "TARGET_64BIT" "movabs{q}\t{$_GLOBAL_OFFSET_TABLE_-%l1, %0|%0, OFFSET FLAT:_GLOBAL_OFFSET_TABLE_-%l1}" [(set_attr "type" "imov") @@ -18472,9 +18494,56 @@ (set_attr "unit" "i387") (set_attr "mode" "")]) +(define_insn_and_split "fxam2_i387_with_temp" + [(set (match_operand:HI 0 "register_operand" "") + (unspec:HI + [(match_operand:MODEF 1 "memory_operand" "")] + UNSPEC_FXAM_MEM))] + "TARGET_USE_FANCY_MATH_387 + && !(reload_completed || reload_in_progress)" + "#" + "&& 1" + [(set (match_dup 2)(match_dup 1)) + (set (match_dup 0) + (unspec:HI [(match_dup 2)] UNSPEC_FXAM))] +{ + operands[2] = gen_reg_rtx (mode); + + MEM_VOLATILE_P (operands[1]) = 1; +} + [(set_attr "type" "multi") + (set_attr "unit" "i387") + (set_attr "mode" "")]) + +(define_expand "isinfxf2" + [(use (match_operand:SI 0 "register_operand" "")) + (use (match_operand:XF 1 "register_operand" ""))] + "TARGET_USE_FANCY_MATH_387 + && TARGET_C99_FUNCTIONS" +{ + rtx mask = GEN_INT (0x45); + rtx val = GEN_INT (0x05); + + rtx cond; + + rtx scratch = gen_reg_rtx (HImode); + rtx res = gen_reg_rtx (QImode); + + emit_insn (gen_fxamxf2_i387 (scratch, operands[1])); + + emit_insn (gen_andqi_ext_0 (scratch, scratch, mask)); + emit_insn (gen_cmpqi_ext_3 (scratch, val)); + cond = gen_rtx_fmt_ee (EQ, QImode, + gen_rtx_REG (CCmode, FLAGS_REG), + const0_rtx); + emit_insn (gen_rtx_SET (VOIDmode, res, cond)); + emit_insn (gen_zero_extendqisi2 (operands[0], res)); + DONE; +}) + (define_expand "isinf2" [(use (match_operand:SI 0 "register_operand" "")) - (use (match_operand:X87MODEF 1 "register_operand" ""))] + (use (match_operand:MODEF 1 "nonimmediate_operand" ""))] "TARGET_USE_FANCY_MATH_387 && TARGET_C99_FUNCTIONS && !(SSE_FLOAT_MODE_P (mode) && TARGET_SSE_MATH)" @@ -18487,7 +18556,18 @@ rtx scratch = gen_reg_rtx (HImode); rtx res = gen_reg_rtx (QImode); - emit_insn (gen_fxam2_i387 (scratch, operands[1])); + /* Remove excess precision by forcing value through memory. */ + if (memory_operand (operands[1], VOIDmode)) + emit_insn (gen_fxam2_i387_with_temp (scratch, operands[1])); + else + { + int slot = virtuals_instantiated ? SLOT_TEMP : SLOT_VIRTUAL; + rtx temp = assign_386_stack_local (mode, slot); + + emit_move_insn (temp, operands[1]); + emit_insn (gen_fxam2_i387_with_temp (scratch, temp)); + } + emit_insn (gen_andqi_ext_0 (scratch, scratch, mask)); emit_insn (gen_cmpqi_ext_3 (scratch, val)); cond = gen_rtx_fmt_ee (EQ, QImode, diff -Naur gcc-4.3.3.orig/gcc/config/i386/sse.md gcc-4.3.3/gcc/config/i386/sse.md --- gcc-4.3.3.orig/gcc/config/i386/sse.md 2008-12-01 04:28:05.000000000 -0800 +++ gcc-4.3.3/gcc/config/i386/sse.md 2009-03-12 10:50:02.974543000 -0700 @@ -737,7 +737,7 @@ (match_operand:V4SF 1 "register_operand" "0") (match_operand:V4SF 2 "nonimmediate_operand" "xm")) (minus:V4SF (match_dup 1) (match_dup 2)) - (const_int 5)))] + (const_int 10)))] "TARGET_SSE3" "addsubps\t{%2, %0|%0, %2}" [(set_attr "type" "sseadd") @@ -2381,7 +2381,7 @@ (match_operand:V2DF 1 "register_operand" "0") (match_operand:V2DF 2 "nonimmediate_operand" "xm")) (minus:V2DF (match_dup 1) (match_dup 2)) - (const_int 1)))] + (const_int 2)))] "TARGET_SSE3" "addsubpd\t{%2, %0|%0, %2}" [(set_attr "type" "sseadd") diff -Naur gcc-4.3.3.orig/gcc/config/ia64/ia64.c gcc-4.3.3/gcc/config/ia64/ia64.c --- gcc-4.3.3.orig/gcc/config/ia64/ia64.c 2008-07-01 13:59:19.000000000 -0700 +++ gcc-4.3.3/gcc/config/ia64/ia64.c 2009-02-20 09:18:20.718912000 -0800 @@ -4328,8 +4328,9 @@ return false; /* We must always return with our current GP. This means we can - only sibcall to functions defined in the current module. */ - return decl && (*targetm.binds_local_p) (decl); + only sibcall to functions defined in the current module unless + TARGET_CONST_GP is set to true. */ + return (decl && (*targetm.binds_local_p) (decl)) || TARGET_CONST_GP; } diff -Naur gcc-4.3.3.orig/gcc/config/mips/mips.c gcc-4.3.3/gcc/config/mips/mips.c --- gcc-4.3.3.orig/gcc/config/mips/mips.c 2008-07-12 01:00:46.000000000 -0700 +++ gcc-4.3.3/gcc/config/mips/mips.c 2009-03-02 12:42:24.177070000 -0800 @@ -7080,7 +7080,7 @@ case ABI_N32: return "abiN32"; case ABI_64: - return "abiN64"; + return "abi64"; case ABI_EABI: return TARGET_64BIT ? "eabi64" : "eabi32"; default: diff -Naur gcc-4.3.3.orig/gcc/config/mips/sde.h gcc-4.3.3/gcc/config/mips/sde.h --- gcc-4.3.3.orig/gcc/config/mips/sde.h 2007-09-19 10:13:33.000000000 -0700 +++ gcc-4.3.3/gcc/config/mips/sde.h 2009-02-02 12:31:19.548659000 -0800 @@ -56,7 +56,6 @@ #undef SUBTARGET_ASM_SPEC #define SUBTARGET_ASM_SPEC "\ %{!mips1:--trap} \ -%{fPIC|fpic|fPIE|fpie:%{!mips16*:-KPIC}} \ %{mips16:-no-mips16}" #undef LINK_SPEC diff -Naur gcc-4.3.3.orig/gcc/config/pa/fptr.c gcc-4.3.3/gcc/config/pa/fptr.c --- gcc-4.3.3.orig/gcc/config/pa/fptr.c 2007-08-02 03:49:31.000000000 -0700 +++ gcc-4.3.3/gcc/config/pa/fptr.c 2009-01-31 12:05:03.693395000 -0800 @@ -6,7 +6,7 @@ GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 3, or (at your option) any later +Software Foundation; either version 2, or (at your option) any later version. In addition to the permissions in the GNU General Public License, the @@ -24,8 +24,9 @@ for more details. You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING3. If not see -. */ +along with GCC; see the file COPYING. If not, write to the Free +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ /* WARNING: The code is this function depends on internal and undocumented details of the GNU linker and dynamic loader as implemented for parisc diff -Naur gcc-4.3.3.orig/gcc/config/pa/milli64.S gcc-4.3.3/gcc/config/pa/milli64.S --- gcc-4.3.3.orig/gcc/config/pa/milli64.S 2007-08-02 03:49:31.000000000 -0700 +++ gcc-4.3.3/gcc/config/pa/milli64.S 2009-01-31 12:05:03.693395000 -0800 @@ -8,7 +8,7 @@ GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 3, or (at your option) any later +Software Foundation; either version 2, or (at your option) any later version. In addition to the permissions in the GNU General Public License, the @@ -26,8 +26,9 @@ for more details. You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see -. */ +along with GCC; see the file COPYING. If not, write to the Free +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ #ifdef pa64 .level 2.0w diff -Naur gcc-4.3.3.orig/gcc/config/sh/predicates.md gcc-4.3.3/gcc/config/sh/predicates.md --- gcc-4.3.3.orig/gcc/config/sh/predicates.md 2007-08-02 03:49:31.000000000 -0700 +++ gcc-4.3.3/gcc/config/sh/predicates.md 2009-02-07 16:53:30.513258000 -0800 @@ -1,5 +1,5 @@ ;; Predicate definitions for Renesas / SuperH SH. -;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. ;; ;; This file is part of GCC. ;; @@ -392,12 +392,6 @@ return 0; } - if ((mode == QImode || mode == HImode) - && (GET_CODE (op) == SUBREG - && GET_CODE (XEXP (op, 0)) == REG - && system_reg_operand (XEXP (op, 0), mode))) - return 0; - if (TARGET_SHMEDIA && (GET_CODE (op) == PARALLEL || GET_CODE (op) == CONST_VECTOR) && sh_rep_vec (op, mode)) diff -Naur gcc-4.3.3.orig/gcc/config/soft-fp/double.h gcc-4.3.3/gcc/config/soft-fp/double.h --- gcc-4.3.3.orig/gcc/config/soft-fp/double.h 2007-05-03 12:05:39.000000000 -0700 +++ gcc-4.3.3/gcc/config/soft-fp/double.h 2009-02-17 05:54:43.208764000 -0800 @@ -1,6 +1,7 @@ /* Software floating-point emulation. Definitions for IEEE Double Precision - Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2006, 2007, 2008, 2009 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson (rth@cygnus.com), Jakub Jelinek (jj@ultra.linux.cz), @@ -203,13 +204,13 @@ #define FP_UNPACK_SEMIRAW_D(X,val) \ do { \ - _FP_UNPACK_RAW_2(1,X,val); \ + _FP_UNPACK_RAW_1(D,X,val); \ _FP_UNPACK_SEMIRAW(D,1,X); \ } while (0) #define FP_UNPACK_SEMIRAW_DP(X,val) \ do { \ - _FP_UNPACK_RAW_2_P(1,X,val); \ + _FP_UNPACK_RAW_1_P(D,X,val); \ _FP_UNPACK_SEMIRAW(D,1,X); \ } while (0) diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h --- gcc-4.3.3.orig/gcc/config/sparc/linux64.h 2007-10-18 21:29:38.000000000 -0700 +++ gcc-4.3.3/gcc/config/sparc/linux64.h 2009-01-24 12:49:51.463535000 -0800 @@ -285,10 +285,6 @@ %{mlittle-endian:-EL} \ %(asm_cpu) %(asm_arch) %(asm_relax)" -/* Same as sparc.h */ -#undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(REGNO) (REGNO) - #undef ASM_OUTPUT_ALIGNED_LOCAL #define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN) \ do { \ diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h --- gcc-4.3.3.orig/gcc/config/sparc/linux.h 2007-08-02 03:49:31.000000000 -0700 +++ gcc-4.3.3/gcc/config/sparc/linux.h 2009-01-24 12:49:51.463535000 -0800 @@ -148,10 +148,6 @@ "%{V} %{v:%{!V:-V}} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Wa,*:%*} -s \ %{fpic|fPIC|fpie|fPIE:-K PIC} %(asm_cpu) %(asm_relax)" -/* Same as sparc.h */ -#undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(REGNO) (REGNO) - #undef ASM_OUTPUT_ALIGNED_LOCAL #define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN) \ do { \ diff -Naur gcc-4.3.3.orig/gcc/config/sparc/sysv4.h gcc-4.3.3/gcc/config/sparc/sysv4.h --- gcc-4.3.3.orig/gcc/config/sparc/sysv4.h 2007-08-02 03:49:31.000000000 -0700 +++ gcc-4.3.3/gcc/config/sparc/sysv4.h 2009-01-24 12:49:51.463535000 -0800 @@ -93,22 +93,6 @@ fprintf (FILE, "\n"); \ } while (0) -/* Define how the SPARC registers should be numbered for Dwarf output. - The numbering provided here should be compatible with the native - svr4 SDB debugger in the SPARC/svr4 reference port. The numbering - is as follows: - - Assembly name gcc internal regno Dwarf regno - ---------------------------------------------------------- - g0-g7 0-7 0-7 - o0-o7 8-15 8-15 - l0-l7 16-23 16-23 - i0-i7 24-31 24-31 - f0-f31 32-63 40-71 -*/ - -#define DBX_REGISTER_NUMBER(REGNO) ((REGNO) < 32 ? (REGNO) : (REGNO) + 8) - /* A set of symbol definitions for assembly pseudo-ops which will get us switched to various sections of interest. These are used in all places where we simply want to switch to a section, and diff -Naur gcc-4.3.3.orig/gcc/config/spu/spu.c gcc-4.3.3/gcc/config/spu/spu.c --- gcc-4.3.3.orig/gcc/config/spu/spu.c 2008-09-12 06:29:31.000000000 -0700 +++ gcc-4.3.3/gcc/config/spu/spu.c 2009-03-02 11:38:26.367169000 -0800 @@ -142,6 +142,7 @@ static bool spu_vector_alignment_reachable (const_tree, bool); static int spu_sms_res_mii (struct ddg *g); static void asm_file_start (void); +static unsigned int spu_section_type_flags (tree, const char *, int); extern const char *reg_names[]; rtx spu_compare_op0, spu_compare_op1; @@ -325,6 +326,9 @@ #undef TARGET_ASM_FILE_START #define TARGET_ASM_FILE_START asm_file_start +#undef TARGET_SECTION_TYPE_FLAGS +#define TARGET_SECTION_TYPE_FLAGS spu_section_type_flags + struct gcc_target targetm = TARGET_INITIALIZER; void @@ -6220,3 +6224,13 @@ default_file_start (); } +/* Implement targetm.section_type_flags. */ +static unsigned int +spu_section_type_flags (tree decl, const char *name, int reloc) +{ + /* .toe needs to have type @nobits. */ + if (strcmp (name, ".toe") == 0) + return SECTION_BSS; + return default_section_type_flags (decl, name, reloc); +} + diff -Naur gcc-4.3.3.orig/gcc/convert.c gcc-4.3.3/gcc/convert.c --- gcc-4.3.3.orig/gcc/convert.c 2007-09-06 18:24:09.000000000 -0700 +++ gcc-4.3.3/gcc/convert.c 2009-02-25 14:08:55.493777000 -0800 @@ -261,18 +261,22 @@ tree arg1 = strip_float_extensions (TREE_OPERAND (expr, 1)); if (FLOAT_TYPE_P (TREE_TYPE (arg0)) - && FLOAT_TYPE_P (TREE_TYPE (arg1))) + && FLOAT_TYPE_P (TREE_TYPE (arg1)) + && DECIMAL_FLOAT_TYPE_P (itype) == DECIMAL_FLOAT_TYPE_P (type)) { tree newtype = type; if (TYPE_MODE (TREE_TYPE (arg0)) == SDmode - || TYPE_MODE (TREE_TYPE (arg1)) == SDmode) + || TYPE_MODE (TREE_TYPE (arg1)) == SDmode + || TYPE_MODE (type) == SDmode) newtype = dfloat32_type_node; if (TYPE_MODE (TREE_TYPE (arg0)) == DDmode - || TYPE_MODE (TREE_TYPE (arg1)) == DDmode) + || TYPE_MODE (TREE_TYPE (arg1)) == DDmode + || TYPE_MODE (type) == DDmode) newtype = dfloat64_type_node; if (TYPE_MODE (TREE_TYPE (arg0)) == TDmode - || TYPE_MODE (TREE_TYPE (arg1)) == TDmode) + || TYPE_MODE (TREE_TYPE (arg1)) == TDmode + || TYPE_MODE (type) == TDmode) newtype = dfloat128_type_node; if (newtype == dfloat32_type_node || newtype == dfloat64_type_node @@ -290,7 +294,32 @@ newtype = TREE_TYPE (arg0); if (TYPE_PRECISION (TREE_TYPE (arg1)) > TYPE_PRECISION (newtype)) newtype = TREE_TYPE (arg1); - if (TYPE_PRECISION (newtype) < TYPE_PRECISION (itype)) + /* Sometimes this transformation is safe (cannot + change results through affecting double rounding + cases) and sometimes it is not. If NEWTYPE is + wider than TYPE, e.g. (float)((long double)double + + (long double)double) converted to + (float)(double + double), the transformation is + unsafe regardless of the details of the types + involved; double rounding can arise if the result + of NEWTYPE arithmetic is a NEWTYPE value half way + between two representable TYPE values but the + exact value is sufficiently different (in the + right direction) for this difference to be + visible in ITYPE arithmetic. If NEWTYPE is the + same as TYPE, however, the transformation may be + safe depending on the types involved: it is safe + if the ITYPE has strictly more than twice as many + mantissa bits as TYPE, can represent infinities + and NaNs if the TYPE can, and has sufficient + exponent range for the product or ratio of two + values representable in the TYPE to be within the + range of normal values of ITYPE. */ + if (TYPE_PRECISION (newtype) < TYPE_PRECISION (itype) + && (flag_unsafe_math_optimizations + || (TYPE_PRECISION (newtype) == TYPE_PRECISION (type) + && real_can_shorten_arithmetic (TYPE_MODE (itype), + TYPE_MODE (type))))) { expr = build2 (TREE_CODE (expr), newtype, fold (convert_to_real (newtype, arg0)), diff -Naur gcc-4.3.3.orig/gcc/cp/ChangeLog gcc-4.3.3/gcc/cp/ChangeLog --- gcc-4.3.3.orig/gcc/cp/ChangeLog 2009-01-24 02:15:39.000000000 -0800 +++ gcc-4.3.3/gcc/cp/ChangeLog 2009-03-18 08:00:32.834440000 -0700 @@ -1,3 +1,66 @@ +2009-03-18 H.J. Lu + + Backport from mainline: + 2009-03-18 H.J. Lu + + PR c++/39425 + * parser.c (cp_parser_explicit_specialization): Don't skip the + rest of the specialization when begin_specialization returns + false. + +2009-03-04 Jason Merrill + + PR c++/9634 + PR c++/29469 + PR c++/29607 + * decl.c (make_typename_type): Do look inside currently open classes. + * parser.c (cp_parser_lookup_name): Likewise. + (cp_parser_template_name): Likewise. + * pt.c (dependent_scope_p): New function. + * cp-tree.h: Declare it. + * class.c (currently_open_class): Return fast if T isn't a class. + +2009-02-20 Jason Merrill + + PR c++/39225 + * decl.c (grokdeclarator): Handle ~identifier. + +2009-02-17 Jason Merrill + + PR c++/38950 + * pt.c (unify)[TEMPLATE_PARM_INDEX]: Convert to the tsubsted type. + +2009-02-13 Jason Merrill + + PR c++/39070 + * semantics.c (finish_call_expr): Change koenig_p parm to int. + If -1, don't set KOENIG_LOOKUP_P but do keep hidden candidates. + * cp-tree.h: Adjust prototype. + * pt.c (tsubst_copy_and_build) [CALL_EXPR]: Pass -1. + +2009-02-03 Paolo Bonzini + + PR c++/36897 + * pt.c (convert_nontype_argument_function): Expect expr to be an + ADDR_EXPR. + + PR c++/37314 + * typeck.c (merge_types): Call resolve_typename_type if only + one type is a typename. + +2009-02-02 Jason Merrill + + PR c++/39054 + * parser.c (cp_parser_unqualified_id): Don't wrap error_mark_node + in BIT_NOT_EXPR. + +2009-01-26 Jason Merrill + + PR c++/23287 + * parser.c (cp_parser_unqualified_id): In a template, + accept ~identifier. + * typeck.c (lookup_destructor): Handle IDENTIFIER_NODE. + 2009-01-24 Release Manager * GCC 4.3.3 released. diff -Naur gcc-4.3.3.orig/gcc/cp/class.c gcc-4.3.3/gcc/cp/class.c --- gcc-4.3.3.orig/gcc/cp/class.c 2008-06-15 04:57:33.000000000 -0700 +++ gcc-4.3.3/gcc/cp/class.c 2009-03-04 11:37:43.898064000 -0800 @@ -5688,6 +5688,9 @@ { int i; + if (!CLASS_TYPE_P (t)) + return false; + /* We start looking from 1 because entry 0 is from global scope, and has no type. */ for (i = current_class_depth; i > 0; --i) diff -Naur gcc-4.3.3.orig/gcc/cp/cp-tree.h gcc-4.3.3/gcc/cp/cp-tree.h --- gcc-4.3.3.orig/gcc/cp/cp-tree.h 2009-01-15 14:34:20.000000000 -0800 +++ gcc-4.3.3/gcc/cp/cp-tree.h 2009-03-04 11:37:43.898064000 -0800 @@ -4460,6 +4460,7 @@ extern tree maybe_get_template_decl_from_type_decl (tree); extern int processing_template_parmlist; extern bool dependent_type_p (tree); +extern bool dependent_scope_p (tree); extern bool any_dependent_template_arguments_p (const_tree); extern bool dependent_template_p (tree); extern bool dependent_template_id_p (tree, tree); @@ -4623,7 +4624,7 @@ extern tree finish_stmt_expr (tree, bool); extern tree stmt_expr_value_expr (tree); extern tree perform_koenig_lookup (tree, tree); -extern tree finish_call_expr (tree, tree, bool, bool); +extern tree finish_call_expr (tree, tree, bool, int); extern tree finish_increment_expr (tree, enum tree_code); extern tree finish_this_expr (void); extern tree finish_pseudo_destructor_expr (tree, tree, tree); diff -Naur gcc-4.3.3.orig/gcc/cp/decl.c gcc-4.3.3/gcc/cp/decl.c --- gcc-4.3.3.orig/gcc/cp/decl.c 2008-09-30 12:56:13.000000000 -0700 +++ gcc-4.3.3/gcc/cp/decl.c 2009-03-04 11:37:43.898064000 -0800 @@ -2978,12 +2978,6 @@ gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE); gcc_assert (TYPE_P (context)); - /* When the CONTEXT is a dependent type, NAME could refer to a - dependent base class of CONTEXT. So we cannot peek inside it, - even if CONTEXT is a currently open scope. */ - if (dependent_type_p (context)) - return build_typename_type (context, name, fullname, tag_type); - if (!IS_AGGR_TYPE (context)) { if (complain & tf_error) @@ -2991,11 +2985,23 @@ return error_mark_node; } + /* When the CONTEXT is a dependent type, NAME could refer to a + dependent base class of CONTEXT. But look inside it anyway + if CONTEXT is a currently open scope, in case it refers to a + member of the current instantiation or a non-dependent base; + lookup will stop when we hit a dependent base. */ + if (!dependent_scope_p (context)) + /* We should only set WANT_TYPE when we're a nested typename type. + Then we can give better diagnostics if we find a non-type. */ + t = lookup_field (context, name, 0, /*want_type=*/true); + else + t = NULL_TREE; + + if (!t && dependent_type_p (context)) + return build_typename_type (context, name, fullname, tag_type); + want_template = TREE_CODE (fullname) == TEMPLATE_ID_EXPR; - /* We should only set WANT_TYPE when we're a nested typename type. - Then we can give better diagnostics if we find a non-type. */ - t = lookup_field (context, name, 0, /*want_type=*/true); if (!t) { if (complain & tf_error) @@ -7512,7 +7518,9 @@ } type = TREE_OPERAND (decl, 0); - name = IDENTIFIER_POINTER (constructor_name (type)); + if (TYPE_P (type)) + type = constructor_name (type); + name = IDENTIFIER_POINTER (type); dname = decl; } break; @@ -8009,8 +8017,9 @@ switch (TREE_CODE (unqualified_id)) { case BIT_NOT_EXPR: - unqualified_id - = constructor_name (TREE_OPERAND (unqualified_id, 0)); + unqualified_id = TREE_OPERAND (unqualified_id, 0); + if (TYPE_P (unqualified_id)) + unqualified_id = constructor_name (unqualified_id); break; case IDENTIFIER_NODE: @@ -8856,21 +8865,20 @@ /* Check that the name used for a destructor makes sense. */ if (sfk == sfk_destructor) { + tree uqname = id_declarator->u.id.unqualified_name; + if (!ctype) { gcc_assert (friendp); error ("expected qualified name in friend declaration " - "for destructor %qD", - id_declarator->u.id.unqualified_name); + "for destructor %qD", uqname); return error_mark_node; } - if (!same_type_p (TREE_OPERAND - (id_declarator->u.id.unqualified_name, 0), - ctype)) + if (!check_dtor_name (ctype, TREE_OPERAND (uqname, 0))) { error ("declaration of %qD as member of %qT", - id_declarator->u.id.unqualified_name, ctype); + uqname, ctype); return error_mark_node; } } diff -Naur gcc-4.3.3.orig/gcc/cp/parser.c gcc-4.3.3/gcc/cp/parser.c --- gcc-4.3.3.orig/gcc/cp/parser.c 2008-11-19 13:00:23.000000000 -0800 +++ gcc-4.3.3/gcc/cp/parser.c 2009-03-18 08:00:32.834440000 -0700 @@ -3791,6 +3791,8 @@ parser->scope = NULL_TREE; parser->object_scope = NULL_TREE; parser->qualifying_scope = NULL_TREE; + if (processing_template_decl) + cp_parser_parse_tentatively (parser); type_decl = cp_parser_class_name (parser, /*typename_keyword_p=*/false, @@ -3799,6 +3801,16 @@ /*check_dependency=*/false, /*class_head_p=*/false, declarator_p); + if (processing_template_decl + && ! cp_parser_parse_definitely (parser)) + { + /* We couldn't find a type with this name, so just accept + it and check for a match at instantiation time. */ + type_decl = cp_parser_identifier (parser); + if (type_decl != error_mark_node) + type_decl = build_nt (BIT_NOT_EXPR, type_decl); + return type_decl; + } } /* If an error occurred, assume that the name of the destructor is the same as the name of the qualifying @@ -9941,7 +9953,7 @@ && !template_keyword_p && parser->scope && TYPE_P (parser->scope) && check_dependency_p - && dependent_type_p (parser->scope) + && dependent_scope_p (parser->scope) /* Do not do this for dtors (or ctors), since they never need the template keyword before their name. */ && !constructor_name_p (identifier, parser->scope)) @@ -10485,7 +10497,6 @@ if (!begin_specialization ()) { end_specialization (); - cp_parser_skip_to_end_of_block_or_statement (parser); return; } @@ -16214,35 +16225,11 @@ cannot look up the name if the scope is not a class type; it might, for example, be a template type parameter. */ dependent_p = (TYPE_P (parser->scope) - && !(parser->in_declarator_p - && currently_open_class (parser->scope)) - && dependent_type_p (parser->scope)); + && dependent_scope_p (parser->scope)); if ((check_dependency || !CLASS_TYPE_P (parser->scope)) - && dependent_p) - { - if (tag_type) - { - tree type; - - /* The resolution to Core Issue 180 says that `struct - A::B' should be considered a type-name, even if `A' - is dependent. */ - type = make_typename_type (parser->scope, name, tag_type, - /*complain=*/tf_error); - decl = TYPE_NAME (type); - } - else if (is_template - && (cp_parser_next_token_ends_template_argument_p (parser) - || cp_lexer_next_token_is (parser->lexer, - CPP_CLOSE_PAREN))) - decl = make_unbound_class_template (parser->scope, - name, NULL_TREE, - /*complain=*/tf_error); - else - decl = build_qualified_name (/*type=*/NULL_TREE, - parser->scope, name, - is_template); - } + && dependent_p) + /* Defer lookup. */ + decl = error_mark_node; else { tree pushed_scope = NULL_TREE; @@ -16263,14 +16250,42 @@ /*complain=*/true); /* If we have a single function from a using decl, pull it out. */ - if (decl - && TREE_CODE (decl) == OVERLOAD + if (TREE_CODE (decl) == OVERLOAD && !really_overloaded_fn (decl)) decl = OVL_FUNCTION (decl); if (pushed_scope) pop_scope (pushed_scope); } + + /* If the scope is a dependent type and either we deferred lookup or + we did lookup but didn't find the name, rememeber the name. */ + if (decl == error_mark_node && TYPE_P (parser->scope) + && dependent_type_p (parser->scope)) + { + if (tag_type) + { + tree type; + + /* The resolution to Core Issue 180 says that `struct + A::B' should be considered a type-name, even if `A' + is dependent. */ + type = make_typename_type (parser->scope, name, tag_type, + /*complain=*/tf_error); + decl = TYPE_NAME (type); + } + else if (is_template + && (cp_parser_next_token_ends_template_argument_p (parser) + || cp_lexer_next_token_is (parser->lexer, + CPP_CLOSE_PAREN))) + decl = make_unbound_class_template (parser->scope, + name, NULL_TREE, + /*complain=*/tf_error); + else + decl = build_qualified_name (/*type=*/NULL_TREE, + parser->scope, name, + is_template); + } parser->qualifying_scope = parser->scope; parser->object_scope = NULL_TREE; } diff -Naur gcc-4.3.3.orig/gcc/cp/pt.c gcc-4.3.3/gcc/cp/pt.c --- gcc-4.3.3.orig/gcc/cp/pt.c 2009-01-16 14:35:24.000000000 -0800 +++ gcc-4.3.3/gcc/cp/pt.c 2009-03-04 11:37:43.898064000 -0800 @@ -4555,6 +4555,13 @@ expr = convert_nontype_argument_function (type, expr); if (!expr || expr == error_mark_node) return expr; + + if (TREE_CODE (expr) != ADDR_EXPR) + { + error ("%qE is not a valid template argument for type %qT", expr, type); + error ("it must be the address of a function with external linkage"); + return NULL_TREE; + } } /* [temp.arg.nontype]/5, bullet 5 @@ -11054,12 +11061,12 @@ qualified_p ? LOOKUP_NONVIRTUAL : LOOKUP_NORMAL, /*fn_p=*/NULL)); } - /* Pass true for koenig_p so that build_new_function_call will + /* Pass -1 for koenig_p so that build_new_function_call will allow hidden friends found by arg-dependent lookup at template parsing time. */ return finish_call_expr (function, call_args, /*disallow_virtual=*/qualified_p, - /*koenig_p*/true); + /*koenig_p*/-1); } case COND_EXPR: @@ -13051,7 +13058,7 @@ /* Convert the ARG to the type of PARM; the deduced non-type template argument must exactly match the types of the corresponding parameter. */ - arg = fold (build_nop (TREE_TYPE (parm), arg)); + arg = fold (build_nop (tparm, arg)); else if (uses_template_parms (tparm)) /* We haven't deduced the type of this parameter yet. Try again later. */ @@ -15637,6 +15644,16 @@ return TYPE_DEPENDENT_P (type); } +/* Returns TRUE if SCOPE is a dependent scope, in which we can't do any + lookup. In other words, a dependent type that is not the current + instantiation. */ + +bool +dependent_scope_p (tree scope) +{ + return dependent_type_p (scope) && !currently_open_class (scope); +} + /* Returns TRUE if EXPRESSION is dependent, according to CRITERION. */ static bool @@ -15658,7 +15675,7 @@ An id-expression is type-dependent if it contains a nested-name-specifier that contains a class-name that names a dependent type. */ - /* The suggested resolution to Core Issue 2 implies that if the + /* The suggested resolution to Core Issue 224 implies that if the qualifying type is the current class, then we must peek inside it. */ if (DECL_P (name) diff -Naur gcc-4.3.3.orig/gcc/cp/semantics.c gcc-4.3.3/gcc/cp/semantics.c --- gcc-4.3.3.orig/gcc/cp/semantics.c 2008-11-14 14:01:12.000000000 -0800 +++ gcc-4.3.3/gcc/cp/semantics.c 2009-02-13 13:53:38.261573000 -0800 @@ -1832,10 +1832,14 @@ qualified. For example a call to `X::f' never generates a virtual call.) + KOENIG_P is 1 if we want to perform argument-dependent lookup, + -1 if we don't, but we want to accept functions found by previous + argument-dependent lookup, and 0 if we want nothing to do with it. + Returns code for the call. */ tree -finish_call_expr (tree fn, tree args, bool disallow_virtual, bool koenig_p) +finish_call_expr (tree fn, tree args, bool disallow_virtual, int koenig_p) { tree result; tree orig_fn; @@ -1857,7 +1861,7 @@ || any_type_dependent_arguments_p (args)) { result = build_nt_call_list (fn, args); - KOENIG_LOOKUP_P (result) = koenig_p; + KOENIG_LOOKUP_P (result) = koenig_p > 0; if (cfun) { do @@ -1946,7 +1950,7 @@ if (!result) /* A call to a namespace-scope function. */ - result = build_new_function_call (fn, args, koenig_p); + result = build_new_function_call (fn, args, koenig_p != 0); } else if (TREE_CODE (fn) == PSEUDO_DTOR_EXPR) { diff -Naur gcc-4.3.3.orig/gcc/cp/typeck.c gcc-4.3.3/gcc/cp/typeck.c --- gcc-4.3.3.orig/gcc/cp/typeck.c 2009-01-15 14:34:20.000000000 -0800 +++ gcc-4.3.3/gcc/cp/typeck.c 2009-02-03 07:56:05.128711000 -0800 @@ -608,6 +608,20 @@ code1 = TREE_CODE (t1); code2 = TREE_CODE (t2); + if (code1 != code2) + { + gcc_assert (code1 == TYPENAME_TYPE || code2 == TYPENAME_TYPE); + if (code1 == TYPENAME_TYPE) + { + t1 = resolve_typename_type (t1, /*only_current_p=*/true); + code1 = TREE_CODE (t1); + } + else + { + t2 = resolve_typename_type (t2, /*only_current_p=*/true); + code2 = TREE_CODE (t2); + } + } switch (code1) { @@ -2034,8 +2048,8 @@ return result; } -/* Return the destructor denoted by OBJECT.SCOPE::~DTOR_NAME, or, if - SCOPE is NULL, by OBJECT.~DTOR_NAME. */ +/* Return the destructor denoted by OBJECT.SCOPE::DTOR_NAME, or, if + SCOPE is NULL, by OBJECT.DTOR_NAME, where DTOR_NAME is ~type. */ static tree lookup_destructor (tree object, tree scope, tree dtor_name) @@ -2050,7 +2064,21 @@ scope, dtor_type); return error_mark_node; } - if (!DERIVED_FROM_P (dtor_type, TYPE_MAIN_VARIANT (object_type))) + if (TREE_CODE (dtor_type) == IDENTIFIER_NODE) + { + /* In a template, names we can't find a match for are still accepted + destructor names, and we check them here. */ + if (check_dtor_name (object_type, dtor_type)) + dtor_type = object_type; + else + { + error ("object type %qT does not match destructor name ~%qT", + object_type, dtor_type); + return error_mark_node; + } + + } + else if (!DERIVED_FROM_P (dtor_type, TYPE_MAIN_VARIANT (object_type))) { error ("the type being destroyed is %qT, but the destructor refers to %qT", TYPE_MAIN_VARIANT (object_type), dtor_type); diff -Naur gcc-4.3.3.orig/gcc/c-parser.c gcc-4.3.3/gcc/c-parser.c --- gcc-4.3.3.orig/gcc/c-parser.c 2008-04-03 14:24:28.000000000 -0700 +++ gcc-4.3.3/gcc/c-parser.c 2009-02-17 05:00:40.440258000 -0800 @@ -2680,6 +2680,7 @@ "expected %<;%>, %<,%> or %<)%>")) { c_parser_skip_until_found (parser, CPP_CLOSE_PAREN, NULL); + get_pending_sizes (); return NULL; } if (c_parser_next_token_is (parser, CPP_ELLIPSIS)) @@ -2707,6 +2708,7 @@ { c_parser_skip_until_found (parser, CPP_CLOSE_PAREN, "expected %<)%>"); + get_pending_sizes (); return NULL; } } @@ -3132,6 +3134,7 @@ ret.value = error_mark_node; ret.original_code = ERROR_MARK; c_parser_skip_until_found (parser, CPP_CLOSE_BRACE, "expected %<}%>"); + pop_init_level (0); return ret; } c_parser_consume_token (parser); diff -Naur gcc-4.3.3.orig/gcc/c-typeck.c gcc-4.3.3/gcc/c-typeck.c --- gcc-4.3.3.orig/gcc/c-typeck.c 2008-01-29 15:19:07.000000000 -0800 +++ gcc-4.3.3/gcc/c-typeck.c 2009-02-04 05:07:43.805620000 -0800 @@ -327,10 +327,14 @@ tree d2 = TYPE_DOMAIN (t2); bool d1_variable, d2_variable; bool d1_zero, d2_zero; + bool t1_complete, t2_complete; /* We should not have any type quals on arrays at all. */ gcc_assert (!TYPE_QUALS (t1) && !TYPE_QUALS (t2)); + t1_complete = COMPLETE_TYPE_P (t1); + t2_complete = COMPLETE_TYPE_P (t2); + d1_zero = d1 == 0 || !TYPE_MAX_VALUE (d1); d2_zero = d2 == 0 || !TYPE_MAX_VALUE (d2); @@ -370,6 +374,15 @@ || !d1_variable)) ? t1 : t2)); + /* Ensure a composite type involving a zero-length array type + is a zero-length type not an incomplete type. */ + if (d1_zero && d2_zero + && (t1_complete || t2_complete) + && !COMPLETE_TYPE_P (t1)) + { + TYPE_SIZE (t1) = bitsize_zero_node; + TYPE_SIZE_UNIT (t1) = size_zero_node; + } t1 = c_build_qualified_type (t1, quals); return build_type_attribute_variant (t1, attributes); } diff -Naur gcc-4.3.3.orig/gcc/DATESTAMP gcc-4.3.3/gcc/DATESTAMP --- gcc-4.3.3.orig/gcc/DATESTAMP 2009-01-23 16:16:35.000000000 -0800 +++ gcc-4.3.3/gcc/DATESTAMP 2009-03-22 17:16:37.424141000 -0700 @@ -1 +1 @@ -20090124 +20090323 diff -Naur gcc-4.3.3.orig/gcc/doc/extend.texi gcc-4.3.3/gcc/doc/extend.texi --- gcc-4.3.3.orig/gcc/doc/extend.texi 2008-07-15 08:52:35.000000000 -0700 +++ gcc-4.3.3/gcc/doc/extend.texi 2009-03-17 06:11:58.563094000 -0700 @@ -2687,7 +2687,7 @@ the loader, which might assume EAX, EDX and ECX can be clobbered, as per the standard calling conventions. Solaris 8 is affected by this. GNU systems with GLIBC 2.1 or higher, and FreeBSD, are believed to be -safe since the loaders there save all registers. (Lazy binding can be +safe since the loaders there save EAX, EDX and ECX. (Lazy binding can be disabled with the linker or the loader if desired, to avoid the problem.) diff -Naur gcc-4.3.3.orig/gcc/doc/invoke.texi gcc-4.3.3/gcc/doc/invoke.texi --- gcc-4.3.3.orig/gcc/doc/invoke.texi 2008-11-21 08:21:50.000000000 -0800 +++ gcc-4.3.3/gcc/doc/invoke.texi 2009-01-27 10:45:49.519017000 -0800 @@ -5406,8 +5406,9 @@ This option implies @option{-fmerge-constants}. In addition to @option{-fmerge-constants} this considers e.g.@: even constant initialized arrays or initialized constant variables with integral or floating point -types. Languages like C or C++ require each non-automatic variable to -have distinct location, so using this option will result in non-conforming +types. Languages like C or C++ require each variable, including multiple +instances of the same variable in recursive calls, to have distinct locations, +so using this option will result in non-conforming behavior. @item -fmodulo-sched diff -Naur gcc-4.3.3.orig/gcc/fold-const.c gcc-4.3.3/gcc/fold-const.c --- gcc-4.3.3.orig/gcc/fold-const.c 2008-10-22 13:08:01.000000000 -0700 +++ gcc-4.3.3/gcc/fold-const.c 2009-01-26 07:54:18.800086000 -0800 @@ -8519,6 +8519,24 @@ } /* switch (code) */ } + +/* If the operation was a conversion do _not_ mark a resulting constant + with TREE_OVERFLOW if the original constant was not. These conversions + have implementation defined behavior and retaining the TREE_OVERFLOW + flag here would confuse later passes such as VRP. */ +tree +fold_unary_ignore_overflow (enum tree_code code, tree type, tree op0) +{ + tree res = fold_unary (code, type, op0); + if (res + && TREE_CODE (res) == INTEGER_CST + && TREE_CODE (op0) == INTEGER_CST + && (code == NOP_EXPR || code == CONVERT_EXPR)) + TREE_OVERFLOW (res) = TREE_OVERFLOW (op0); + + return res; +} + /* Fold a binary expression of code CODE and type TYPE with operands OP0 and OP1, containing either a MIN-MAX or a MAX-MIN combination. Return the folded expression if folding is successful. Otherwise, @@ -11673,7 +11691,8 @@ case RSHIFT_EXPR: /* Optimize -1 >> x for arithmetic right shifts. */ - if (integer_all_onesp (arg0) && !TYPE_UNSIGNED (type)) + if (integer_all_onesp (arg0) && !TYPE_UNSIGNED (type) + && tree_expr_nonnegative_p (arg1)) return omit_one_operand (type, arg0, arg1); /* ... fall through ... */ diff -Naur gcc-4.3.3.orig/gcc/fortran/ChangeLog gcc-4.3.3/gcc/fortran/ChangeLog --- gcc-4.3.3.orig/gcc/fortran/ChangeLog 2009-01-24 02:15:54.000000000 -0800 +++ gcc-4.3.3/gcc/fortran/ChangeLog 2009-03-07 07:58:49.569600000 -0800 @@ -1,3 +1,57 @@ +2009-03-07 Paul Thomas + + PR fortran/39295 + * interface.c (compare_type_rank_if): Return 1 if the symbols + are the same and deal with external procedures where one is + identified to be a function or subroutine by usage but the + other is not. + +2009-03-07 Paul Thomas + + PR fortran/39292 + * trans-array.c (gfc_conv_array_initializer): Convert all + expressions rather than ICEing. + +2009-02-19 Paul Thomas + + PR fortran/38852 + PR fortran/39006 + Backport from trunk + * trans-intrinsic.c (gfc_conv_intrinsic_bound): Use the array + descriptor ubound for UBOUND, when the array lbound == 1. + +2009-01-26 Paul Thomas + + PR fortran/38907 + Backport from trunk + * resolve.c (check_host_association): Remove the matching to + correct an incorrect host association and use manipulation of + the expression instead. + +2009-01-26 Mikael Morin + + PR fortran/38859 + Backport from trunk + * simplify.c (simplify_bound): Don't use array specification + if variable or component has subsequent references. + +2009-01-26 Paul Thomas + + PR fortran/38657 + Backport from trunk. + * module.c (write_common_0): Add argument 'this_module' and + check that non-use associated common blocks are written first. + (write_common): Call write_common_0 twice, once with true and + then with false. + +2009-01-24 Thomas Koenig + + PR fortran/38672 + Backport from trunk. + * resolve.c (resolve_symbol): Check for the + presence of derived->ns->proc_name before + accessing derived->ns->proc_name->attr.flavor . + 2009-01-24 Release Manager * GCC 4.3.3 released. diff -Naur gcc-4.3.3.orig/gcc/fortran/interface.c gcc-4.3.3/gcc/fortran/interface.c --- gcc-4.3.3.orig/gcc/fortran/interface.c 2009-01-10 13:01:14.000000000 -0800 +++ gcc-4.3.3/gcc/fortran/interface.c 2009-03-07 07:58:49.569600000 -0800 @@ -492,17 +492,26 @@ if (s1 == NULL || s2 == NULL) return s1 == s2 ? 1 : 0; + if (s1 == s2) + return 1; + if (s1->attr.flavor != FL_PROCEDURE && s2->attr.flavor != FL_PROCEDURE) return compare_type_rank (s1, s2); if (s1->attr.flavor != FL_PROCEDURE || s2->attr.flavor != FL_PROCEDURE) return 0; - /* At this point, both symbols are procedures. */ - if ((s1->attr.function == 0 && s1->attr.subroutine == 0) - || (s2->attr.function == 0 && s2->attr.subroutine == 0)) - return 0; + /* At this point, both symbols are procedures. It can happen that + a external procedures are compared where one is identified by usage + to be a function or subroutine but the other is not. Check TKR + nonetheless for these cases. */ + if (s1->attr.function == 0 && s1->attr.subroutine == 0) + return s1->attr.external == 1 ? compare_type_rank (s1, s2) : 0; + + if (s2->attr.function == 0 && s2->attr.subroutine == 0) + return s2->attr.external == 1 ? compare_type_rank (s1, s2) : 0; + /* Now the type of procedure has been identified. */ if (s1->attr.function != s2->attr.function || s1->attr.subroutine != s2->attr.subroutine) return 0; diff -Naur gcc-4.3.3.orig/gcc/fortran/module.c gcc-4.3.3/gcc/fortran/module.c --- gcc-4.3.3.orig/gcc/fortran/module.c 2009-01-17 01:28:50.000000000 -0800 +++ gcc-4.3.3/gcc/fortran/module.c 2009-01-25 21:12:03.141287000 -0800 @@ -3992,7 +3992,7 @@ /* Write a common block to the module -- recursive helper function. */ static void -write_common_0 (gfc_symtree *st) +write_common_0 (gfc_symtree *st, bool this_module) { gfc_common_head *p; const char * name; @@ -4004,7 +4004,7 @@ if (st == NULL) return; - write_common_0 (st->left); + write_common_0 (st->left, this_module); /* We will write out the binding label, or the name if no label given. */ name = st->n.common->name; @@ -4023,6 +4023,10 @@ w = (c < 0) ? w->left : w->right; } + /* Give priority to commons that are not use associated. */ + if (this_module && p->use_assoc) + write_me = false; + if (write_me) { /* Write the common to the module. */ @@ -4043,12 +4047,12 @@ /* Record that we have written this common. */ w = gfc_getmem (sizeof (struct written_common)); - w->name = name; w->label = label; + w->name = name; gfc_insert_bbt (&written_commons, w, compare_written_commons); } - write_common_0 (st->right); + write_common_0 (st->right, this_module); } @@ -4059,7 +4063,8 @@ write_common (gfc_symtree *st) { written_commons = NULL; - write_common_0 (st); + write_common_0 (st, true); + write_common_0 (st, false); free_written_common (written_commons); written_commons = NULL; } diff -Naur gcc-4.3.3.orig/gcc/fortran/resolve.c gcc-4.3.3/gcc/fortran/resolve.c --- gcc-4.3.3.orig/gcc/fortran/resolve.c 2009-01-11 05:42:32.000000000 -0800 +++ gcc-4.3.3/gcc/fortran/resolve.c 2009-01-25 22:15:41.225652000 -0800 @@ -4189,15 +4189,17 @@ /* Checks to see that the correct symbol has been host associated. The only situation where this arises is that in which a twice contained function is parsed after the host association is made. - Therefore, on detecting this, the line is rematched, having got - rid of the existing references and actual_arg_list. */ + Therefore, on detecting this, change the symbol in the expression + and convert the array reference into an actual arglist if the old + symbol is a variable. */ static bool check_host_association (gfc_expr *e) { gfc_symbol *sym, *old_sym; - locus temp_locus; - gfc_expr *expr; + gfc_symtree *st; int n; + gfc_ref *ref; + gfc_actual_arglist *arg, *tail; bool retval = e->expr_type == EXPR_FUNCTION; /* If the expression is the result of substitution in @@ -4213,26 +4215,16 @@ if (gfc_current_ns->parent && old_sym->ns != gfc_current_ns) { + /* Use the 'USE' name so that renamed module symbols are + correctly handled. */ gfc_find_symbol (e->symtree->name, gfc_current_ns, 1, &sym); + if (sym && old_sym != sym && sym->ts.type == old_sym->ts.type && sym->attr.flavor == FL_PROCEDURE && sym->attr.contained) { - temp_locus = gfc_current_locus; - gfc_current_locus = e->where; - - gfc_buffer_error (1); - - gfc_free_ref_list (e->ref); - e->ref = NULL; - - if (retval) - { - gfc_free_actual_arglist (e->value.function.actual); - e->value.function.actual = NULL; - } - + /* Clear the shape, since it might not be valid. */ if (e->shape != NULL) { for (n = 0; n < e->rank; n++) @@ -4241,22 +4233,58 @@ gfc_free (e->shape); } -/* TODO - Replace this gfc_match_rvalue with a straight replacement of - actual arglists for function to function substitutions and with a - conversion of the reference list to an actual arglist in the case of - a variable to function replacement. This should be quite easy since - only integers and vectors can be involved. */ - gfc_match_rvalue (&expr); - gfc_clear_error (); - gfc_buffer_error (0); + /* Give the symbol a symtree in the right place! */ + gfc_get_sym_tree (sym->name, gfc_current_ns, &st); + st->n.sym = sym; + + if (old_sym->attr.flavor == FL_PROCEDURE) + { + /* Original was function so point to the new symbol, since + the actual argument list is already attached to the + expression. */ + e->value.function.esym = NULL; + e->symtree = st; + } + else + { + /* Original was variable so convert array references into + an actual arglist. This does not need any checking now + since gfc_resolve_function will take care of it. */ + e->value.function.actual = NULL; + e->expr_type = EXPR_FUNCTION; + e->symtree = st; + + /* Ambiguity will not arise if the array reference is not + the last reference. */ + for (ref = e->ref; ref; ref = ref->next) + if (ref->type == REF_ARRAY && ref->next == NULL) + break; - gcc_assert (expr && sym == expr->symtree->n.sym); + gcc_assert (ref->type == REF_ARRAY); - *e = *expr; - gfc_free (expr); - sym->refs++; + /* Grab the start expressions from the array ref and + copy them into actual arguments. */ + for (n = 0; n < ref->u.ar.dimen; n++) + { + arg = gfc_get_actual_arglist (); + arg->expr = gfc_copy_expr (ref->u.ar.start[n]); + if (e->value.function.actual == NULL) + tail = e->value.function.actual = arg; + else + { + tail->next = arg; + tail = arg; + } + } - gfc_current_locus = temp_locus; + /* Dump the reference list and set the rank. */ + gfc_free_ref_list (e->ref); + e->ref = NULL; + e->rank = sym->as ? sym->as->rank : 0; + } + + gfc_resolve_expr (e); + sym->refs++; } } /* This might have changed! */ @@ -8116,6 +8144,7 @@ module function and is not PRIVATE. */ if (sym->ts.type == BT_DERIVED && sym->ts.derived->attr.use_assoc + && sym->ns->proc_name && sym->ns->proc_name->attr.flavor == FL_MODULE) { gfc_symbol *ds; diff -Naur gcc-4.3.3.orig/gcc/fortran/simplify.c gcc-4.3.3/gcc/fortran/simplify.c --- gcc-4.3.3.orig/gcc/fortran/simplify.c 2008-11-13 22:14:46.000000000 -0800 +++ gcc-4.3.3/gcc/fortran/simplify.c 2009-01-25 21:43:44.109708000 -0800 @@ -2104,7 +2104,10 @@ case AR_FULL: /* We're done because 'as' has already been set in the previous iteration. */ - goto done; + if (!ref->next) + goto done; + + /* Fall through. */ case AR_SECTION: case AR_UNKNOWN: diff -Naur gcc-4.3.3.orig/gcc/fortran/trans-array.c gcc-4.3.3/gcc/fortran/trans-array.c --- gcc-4.3.3.orig/gcc/fortran/trans-array.c 2008-11-29 12:42:22.000000000 -0800 +++ gcc-4.3.3/gcc/fortran/trans-array.c 2009-03-07 07:56:37.773017000 -0800 @@ -3867,8 +3867,21 @@ CONSTRUCTOR_APPEND_ELT (v, index, se.expr); break; + default: - gcc_unreachable (); + /* Catch those occasional beasts that do not simplify + for one reason or another, assuming that if they are + standard defying the frontend will catch them. */ + gfc_conv_expr (&se, c->expr); + if (range == NULL_TREE) + CONSTRUCTOR_APPEND_ELT (v, index, se.expr); + else + { + if (index != NULL_TREE) + CONSTRUCTOR_APPEND_ELT (v, index, se.expr); + CONSTRUCTOR_APPEND_ELT (v, range, se.expr); + } + break; } } break; diff -Naur gcc-4.3.3.orig/gcc/fortran/trans-intrinsic.c gcc-4.3.3/gcc/fortran/trans-intrinsic.c --- gcc-4.3.3.orig/gcc/fortran/trans-intrinsic.c 2008-07-27 04:41:35.000000000 -0700 +++ gcc-4.3.3/gcc/fortran/trans-intrinsic.c 2009-02-18 22:43:15.919035000 -0800 @@ -917,12 +917,17 @@ cond4 = fold_build2 (LT_EXPR, boolean_type_node, stride, gfc_index_zero_node); - cond4 = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, cond4, cond2); if (upper) { + tree cond5; cond = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, cond3, cond4); + cond5 = fold_build2 (EQ_EXPR, boolean_type_node, gfc_index_one_node, lbound); + cond5 = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, cond4, cond5); + + cond = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, cond, cond5); + se->expr = fold_build3 (COND_EXPR, gfc_array_index_type, cond, ubound, gfc_index_zero_node); } diff -Naur gcc-4.3.3.orig/gcc/gimplify.c gcc-4.3.3/gcc/gimplify.c --- gcc-4.3.3.orig/gcc/gimplify.c 2008-12-18 13:55:31.000000000 -0800 +++ gcc-4.3.3/gcc/gimplify.c 2009-01-27 10:45:49.519017000 -0800 @@ -3206,7 +3206,8 @@ if (valid_const_initializer && num_nonzero_elements > 1 && TREE_READONLY (object) - && TREE_CODE (object) == VAR_DECL) + && TREE_CODE (object) == VAR_DECL + && (flag_merge_constants >= 2 || !TREE_ADDRESSABLE (object))) { if (notify_temp_creation) return GS_ERROR; diff -Naur gcc-4.3.3.orig/gcc/real.c gcc-4.3.3/gcc/real.c --- gcc-4.3.3.orig/gcc/real.c 2008-10-22 04:33:04.000000000 -0700 +++ gcc-4.3.3/gcc/real.c 2009-02-25 14:08:55.493777000 -0800 @@ -905,15 +905,23 @@ /* Sign of zero doesn't matter for compares. */ return 0; + case CLASS2 (rvc_normal, rvc_zero): + /* Decimal float zero is special and uses rvc_normal, not rvc_zero. */ + if (a->decimal) + return decimal_do_compare (a, b, nan_result); + /* Fall through. */ case CLASS2 (rvc_inf, rvc_zero): case CLASS2 (rvc_inf, rvc_normal): - case CLASS2 (rvc_normal, rvc_zero): return (a->sign ? -1 : 1); case CLASS2 (rvc_inf, rvc_inf): return -a->sign - -b->sign; case CLASS2 (rvc_zero, rvc_normal): + /* Decimal float zero is special and uses rvc_normal, not rvc_zero. */ + if (b->decimal) + return decimal_do_compare (a, b, nan_result); + /* Fall through. */ case CLASS2 (rvc_zero, rvc_inf): case CLASS2 (rvc_normal, rvc_inf): return (b->sign ? 1 : -1); @@ -1266,6 +1274,31 @@ *r = u; return true; } + +/* Return true if arithmetic on values in IMODE that were promoted + from values in TMODE is equivalent to direct arithmetic on values + in TMODE. */ + +bool +real_can_shorten_arithmetic (enum machine_mode imode, enum machine_mode tmode) +{ + const struct real_format *tfmt, *ifmt; + tfmt = REAL_MODE_FORMAT (tmode); + ifmt = REAL_MODE_FORMAT (imode); + /* These conditions are conservative rather than trying to catch the + exact boundary conditions; the main case to allow is IEEE float + and double. */ + return (ifmt->b == tfmt->b + && ifmt->p > 2 * tfmt->p + && ifmt->emin < 2 * tfmt->emin - tfmt->p - 2 + && ifmt->emin < tfmt->emin - tfmt->emax - tfmt->p - 2 + && ifmt->emax > 2 * tfmt->emax + 2 + && ifmt->emax > tfmt->emax - tfmt->emin + tfmt->p + 2 + && ifmt->round_towards_zero == tfmt->round_towards_zero + && ifmt->has_nans >= tfmt->has_nans + && ifmt->has_inf >= tfmt->has_inf + && ifmt->has_signed_zero >= tfmt->has_signed_zero); +} /* Render R as an integer. */ diff -Naur gcc-4.3.3.orig/gcc/real.h gcc-4.3.3/gcc/real.h --- gcc-4.3.3.orig/gcc/real.h 2008-08-19 09:37:13.000000000 -0700 +++ gcc-4.3.3/gcc/real.h 2009-02-25 14:08:55.493777000 -0800 @@ -413,6 +413,11 @@ /* Replace R by 1/R in the given machine mode, if the result is exact. */ extern bool exact_real_inverse (enum machine_mode, REAL_VALUE_TYPE *); +/* Return true if arithmetic on values in IMODE that were promoted + from values in TMODE is equivalent to direct arithmetic on values + in TMODE. */ +bool real_can_shorten_arithmetic (enum machine_mode, enum machine_mode); + /* In tree.c: wrap up a REAL_VALUE_TYPE in a tree node. */ extern tree build_real (tree, REAL_VALUE_TYPE); diff -Naur gcc-4.3.3.orig/gcc/recog.c gcc-4.3.3/gcc/recog.c --- gcc-4.3.3.orig/gcc/recog.c 2008-06-07 14:13:29.000000000 -0700 +++ gcc-4.3.3/gcc/recog.c 2009-02-25 23:06:48.803473000 -0800 @@ -1,6 +1,6 @@ /* Subroutines used by or related to instruction recognition. Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. This file is part of GCC. @@ -147,10 +147,7 @@ const char *c = constraints[i]; if (c[0] == '%') c++; - if (ISDIGIT ((unsigned char) c[0]) && c[1] == '\0') - c = constraints[c[0] - '0']; - - if (! asm_operand_ok (operands[i], c)) + if (! asm_operand_ok (operands[i], c, constraints)) return 0; } @@ -1506,7 +1503,7 @@ Return > 0 if ok, = 0 if bad, < 0 if inconclusive. */ int -asm_operand_ok (rtx op, const char *constraint) +asm_operand_ok (rtx op, const char *constraint, const char **constraints) { int result = 0; @@ -1534,15 +1531,29 @@ case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - /* For best results, our caller should have given us the - proper matching constraint, but we can't actually fail - the check if they didn't. Indicate that results are - inconclusive. */ - do - constraint++; - while (ISDIGIT (*constraint)); - if (! result) - result = -1; + /* If caller provided constraints pointer, look up + the maching constraint. Otherwise, our caller should have + given us the proper matching constraint, but we can't + actually fail the check if they didn't. Indicate that + results are inconclusive. */ + if (constraints) + { + char *end; + unsigned long match; + + match = strtoul (constraint, &end, 10); + if (!result) + result = asm_operand_ok (op, constraints[match], NULL); + constraint = (const char *) end; + } + else + { + do + constraint++; + while (ISDIGIT (*constraint)); + if (! result) + result = -1; + } continue; case 'p': diff -Naur gcc-4.3.3.orig/gcc/recog.h gcc-4.3.3/gcc/recog.h --- gcc-4.3.3.orig/gcc/recog.h 2007-07-26 01:37:01.000000000 -0700 +++ gcc-4.3.3/gcc/recog.h 2009-02-25 23:06:48.803473000 -0800 @@ -1,6 +1,6 @@ /* Declarations for interface to insn recognizer and insn-output.c. Copyright (C) 1987, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, - 2005, 2006, 2007 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GCC. @@ -71,7 +71,7 @@ extern void init_recog (void); extern void init_recog_no_volatile (void); extern int check_asm_operands (rtx); -extern int asm_operand_ok (rtx, const char *); +extern int asm_operand_ok (rtx, const char *, const char **); extern bool validate_change (rtx, rtx *, rtx, bool); extern bool validate_unshare_change (rtx, rtx *, rtx, bool); extern bool canonicalize_change_group (rtx insn, rtx x); diff -Naur gcc-4.3.3.orig/gcc/regrename.c gcc-4.3.3/gcc/regrename.c --- gcc-4.3.3.orig/gcc/regrename.c 2008-11-25 13:26:19.000000000 -0800 +++ gcc-4.3.3/gcc/regrename.c 2009-02-04 13:42:04.642083000 -0800 @@ -820,7 +820,7 @@ OP_IN, 0); for (i = 0; i < recog_data.n_dups; i++) - *recog_data.dup_loc[i] = copy_rtx (old_dups[i]); + *recog_data.dup_loc[i] = old_dups[i]; for (i = 0; i < n_ops; i++) *recog_data.operand_loc[i] = old_operands[i]; if (recog_data.n_dups) diff -Naur gcc-4.3.3.orig/gcc/stmt.c gcc-4.3.3/gcc/stmt.c --- gcc-4.3.3.orig/gcc/stmt.c 2008-05-09 11:12:13.000000000 -0700 +++ gcc-4.3.3/gcc/stmt.c 2009-02-25 23:06:48.803473000 -0800 @@ -1,6 +1,6 @@ /* Expands front end tree to back end RTL for GCC Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. This file is part of GCC. @@ -895,7 +895,7 @@ else if (MEM_P (op)) op = validize_mem (op); - if (asm_operand_ok (op, constraint) <= 0) + if (asm_operand_ok (op, constraint, NULL) <= 0) { if (allows_reg && TYPE_MODE (type) != BLKmode) op = force_reg (TYPE_MODE (type), op); diff -Naur gcc-4.3.3.orig/gcc/testsuite/ChangeLog gcc-4.3.3/gcc/testsuite/ChangeLog --- gcc-4.3.3.orig/gcc/testsuite/ChangeLog 2009-01-24 02:15:24.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/ChangeLog 2009-03-18 08:00:32.834440000 -0700 @@ -1,3 +1,369 @@ +2009-03-18 H.J. Lu + + Backport from mainline: + 2009-03-18 H.J. Lu + + PR c++/39425 + * g++.dg/template/pr39425.C: New. + + * g++.dg/template/spec33.C: Updated. + +2009-03-13 H.J. Lu + + Backport from mainline: + 2009-03-13 H.J. Lu + + PR testsuite/39451 + * gcc.dg/asm-b.c: Use "Q" constraint on %b1/%h1 and "R" + constraint on (%2). + +2009-03-11 Ulrich Weigand + + * g++.old-deja/g++.jason/thunk2.C: Skip on SPU. + +2009-03-07 Paul Thomas + + PR fortran/39295 + * gfortran.dg/interface_25.f90: New test. + * gfortran.dg/interface_26.f90: New test. + +2009-03-07 Paul Thomas + + PR fortran/39292 + * gfortran.dg/initialization_22.f90: New test. + +2009-03-04 Jason Merrill + Giovanni Bajo + + PR c++/9634 + PR c++/29469 + PR c++/29607 + * g++.dg/template/dependent-name5.C: New test. + +2009-02-26 Uros Bizjak + + Backport from mainline: + 2009-02-02 Jakub Jelinek + + PR inline-asm/39058 + * gcc.target/i386/pr39058.c: New test. + +2009-02-25 Janis Johnson + + Backport from mainline: + 2008-10-29 Joseph Myers + + PR middle-end/36578 + * gcc.dg/dfp/convert-bfp-13.c, gcc.dg/dfp/convert-bfp-14.c, + gcc.dg/dfp/convert-dfp-fold-2.c, gcc.target/i386/pr36578-1.c, + gcc.target/i386/pr36578-2.c: New tests. + +2009-02-25 H.J. Lu + + Backport from mainline: + 2008-02-25 H.J. Lu + + PR rtl-optimization/39241 + * gcc.dg/torture/pr39241.c: New. + +2009-02-21 Kaz Kojima + + * gcc.c-torture/execute/pr39228.x: New. + +2009-02-20 Steve Ellcey + + PR target/38056 + * gcc.target/ia64/sibcall-opt-1.c: New test. + * gcc.target/ia64/sibcall-opt-2.c: New test. + +2009-02-20 Jason Merrill + + PR c++/39225 + * g++.dg/parse/dtor15.C: New test. + +2009-02-19 Uros Bizjak + + PR target/39228 + * gcc.c-torture/execute/pr39228.c: New test. + +2009-02-19 Paul Thomas + + PR fortran/38852 + PR fortran/39006 + Backport from mainline: + * gfortran.dg/bound_6.f90: New test. + +2009-02-17 Jason Merrill + + PR c++/38950 + * g++.dg/template/array20.C: New test. + +2009-02-17 Joseph Myers + + PR c/35446 + * gcc.dg/noncompile/init-5.c: New test. + * gcc.dg/init-bad-4.c: Adjust expected errors. + +2009-02-15 Uros Bizjak + + * gcc.dg/struct/w_prof_single_str_global.c: Mask return value. + + Backport from mainline: + 2009-01-12 Mark Mitchell + + * gcc.dg/struct/wo_prof_single_str_global.c: Mask return value. + * gcc.dg/struct/wo_prof_single_str_local.c: Mask return value. + * gcc.dg/struct/wo_prof_single_str_pointer.c: Mask return value. + +2009-02-13 Jason Merrill + + PR c++/39070 + * g++.dg/cpp0x/decltype16.C: New. + +2009-02-13 Joseph Myers + + PR c/35444 + * gcc.dg/noncompile/pr35444-1.c, gcc.dg/noncompile/pr35444-2.c: + New tests. + +2009-02-10 Steve Ellcey + + PR c/39084 + * gcc.dg/pr39084.c: New test. + +2009-02-09 Janis Johnson + + PR c/39035 + * gcc.dg/dfp/pr39035.c: New test. + +2009-02-08 Joseph Myers + + PR c/35434 + * gcc.dg/attr-alias-4.c: New test. + +2009-02-08 Joseph Myers + + PR c/36432 + * gcc.dg/c90-flex-array-2.c, gcc.dg/c99-flex-array-6.c: New tests. + +2009-02-05 Joseph Myers + + PR c/35435 + * gcc.dg/tls/diag-6.c: New test. + +2009-02-05 Richard Guenther + + Backport from mainline + 2009-02-05 Daniel Berlin + + * gcc.c-torture/execute/pr39100.c: New. + +2009-02-04 Joseph Myers + + PR c/35433 + * gcc.dg/init-bad-6.c: New test. + +2009-02-03 Paolo Bonzini + + PR c++/36897 + * g++.dg/template/func2.C: New test. + + PR c++/37314 + * g++.dg/template/typename15.C: New. + * g++.dg/template/typename16.C: New. + +2009-02-02 Jason Merrill + + PR c++/39054 + * g++.dg/parse/dtor14.C: New test. + +2009-01-30 H.J. Lu + + Backport from mainline: + 2009-01-14 Jakub Jelinek + + PR rtl-optimization/38245 + * gcc.dg/pr38245-3.c: New test. + * gcc.dg/pr38245-3.h: New file. + * gcc.dg/pr38245-4.c: New file. + * gcc.dg/pr38364.c: New test. + +2009-01-30 Richard Guenther + + PR tree-optimization/39041 + * gcc.c-torture/compile/pr39041.c: New testcase. + +2009-01-30 H.J. Lu + + Backport from mainline: + 2009-01-16 Jakub Jelinek + + PR tree-optimization/38789 + * gcc.c-torture/compile/pr38789.c: New test. + +2009-01-30 H.J. Lu + + Backport from mainline: + 2009-01-27 Richard Guenther + + PR tree-optimization/38503 + * g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C: New testcase. + + 2009-01-26 Richard Guenther + + PR tree-optimization/38745 + * g++.dg/torture/pr38745.C: New testcase. + + 2009-01-26 Richard Guenther + + PR middle-end/38851 + * g++.dg/warn/Wuninitialized-1.C: New testcase. + + 2009-01-20 Andrew Pinski + Richard Guenther + + PR tree-optimization/38747 + PR tree-optimization/38748 + * gcc.dg/tree-ssa/struct-aliasing-1.c: New test. + * gcc.c-torture/execute/struct-aliasing-1.c: Likewise. + +2009-01-29 H.J. Lu + + Backport from mainline: + 2009-01-28 Richard Guenther + + PR middle-end/38908 + * g++.dg/warn/Wuninitialized-2.C: New testcase. + + 2009-01-27 Daniel Kraft + + PR fortran/38883 + * gfortran.dg/mvbits_6.f90: New test. + * gfortran.dg/mvbits_7.f90: New test. + * gfortran.dg/mvbits_8.f90: New test. + + 2009-01-21 Daniel Kraft + + PR fortran/38887 + * gfortran.dg/mvbits_5.f90: New test. + +2009-01-29 H.J. Lu + + Backport from mainline: + 2009-01-29 Steve Ellcey + + PR middle-end/38857 + * gcc.c-torture/compile/pr38857.c: New test. + + 2009-01-28 Richard Guenther + + PR tree-optimization/38926 + * gcc.c-torture/compile/pr38926.c: New testcase. + +2009-01-29 Uros Bizjak + + Backport from mainline: + 2009-01-28 Uros Bizjak + + PR target/38988 + * gcc.target/i386/pr38988.c: New test. + + 2009-01-27 Uros Bizjak + + PR middle-end/38969 + * gcc.c-torture/execute/pr38969.c: New test. + +2009-01-27 Steve Ellcey + + PR middle-end/38615 + * gcc.dg/pr38615.c: New test. + +2009-01-27 Uros Bizjak + + Backport from mainline: + 2009-01-07 Uros Bizjak + + PR target/38706 + * g++.dg/other/pr38706.C: New test. + +2009-01-26 Jason Merrill + + PR c++/23287 + * g++.dg/template/dtor5.C: New test. + +2009-01-26 H.J. Lu + + Backport from mainline: + 2008-07-17 H.J. Lu + + PR testsuite/36443 + * objc.dg/gnu-encoding/gnu-encoding.exp: Temporarily unset + GCC_EXEC_PREFIX from environment when running $HOSTCC. + +2008-01-26 Paolo Bonzini + + PR tree-optimization/38932 + * gcc.dg/pr38932.c: New. + +2009-01-26 Paul Thomas + + PR fortran/38907 + Backport from trunk + * gfortran.dg/host_assoc_function_7.f90: New test. + +2009-01-26 Mikael Morin + + PR fortran/38859 + Backport from trunk + * gfortran.dg/bound_5.f90: New test. + +2009-01-26 Paul Thomas + + PR fortran/38657 + Backport from trunk. + * gfortran.dg/module_commons_3.f90: Reapply. + +2009-01-25 Uros Bizjak + + Backport from mainline: + 2009-01-22 Uros Bizjak + + PR target/38931 + * gcc.target/i386/pr38931.c: New test. + +2009-01-25 Richard Guenther + + Backport from mainline: + 2008-12-02 Richard Guenther + + PR tree-optimization/38359 + * gcc.c-torture/compile/pr38359.c: New testcase. + * gcc.c-torture/execute/shiftopt-1.c: Adjust. + +2009-01-24 Thomas Koenig + + PR fortran/38672 + Backport from trunk. + * gfortran.dg/host_assoc_blockdata_1.f90: New test. + * gfortran.dg/host_assoc_blockdata_2.f90: New test. + +2009-01-24 H.J. Lu + + Backport from mainline: + 2009-01-20 Kees Cook + H.J. Lu + + PR target/38902 + * gcc.dg/pr38902.c: New. + +2009-01-24 H.J. Lu + + Backport from mainline: + 2008-01-20 Paolo Bonzini + + PR target/38868 + * gfortran.dg/pr38868.f: New testcase. + 2009-01-24 Release Manager * GCC 4.3.3 released. @@ -89,7 +455,7 @@ Backport from mainline: 2008-12-29 Dorit Nuzman - Ira Rosen + Ira Rosen PR tree-optimization/38529 * gcc.dg/vect/pr38529.c: New test. @@ -426,8 +792,8 @@ 2008-11-14 Paul Thomas - PR fortran/37836 - * gfortran.dg/minmaxval_1.f90: New test. + PR fortran/37836 + * gfortran.dg/minmaxval_1.f90: New test. 2008-11-13 Jason Merrill diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38359.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38359.c 2009-01-24 15:26:56.556617000 -0800 @@ -0,0 +1,17 @@ +unsigned _ov_64_seek_lap (_Bool x1, _Bool x2, _Bool x3) +{ + unsigned ltmp_3978_7__PHI_TEMPORARY; + signed ltmp_4011_7; + + if (!x1 || !x2) + while (1) ; + + if (x3) + ltmp_3978_7__PHI_TEMPORARY = 0xffffff7e; + else + ltmp_3978_7__PHI_TEMPORARY = 1; + + ltmp_4011_7 = -1; + return ltmp_4011_7 >> ltmp_3978_7__PHI_TEMPORARY; +} + diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38789.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38789.c 2009-01-30 09:46:24.138943000 -0800 @@ -0,0 +1,18 @@ +/* PR tree-optimization/38789 */ + +void +baz (int v) +{ + unsigned a = (v == 1) ? 1 : 2; + + if (__builtin_constant_p (a)) + asm volatile ("# constant %0" :: "i" (a)); + else + asm volatile ("# register %0" :: "r" (a)); + + a = 6; + if (__builtin_constant_p (a)) + asm volatile ("# constant %0" :: "i" (a)); + else + asm volatile ("# register %0" :: "r" (a)); +} diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38857.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38857.c 2009-01-29 09:06:01.240583000 -0800 @@ -0,0 +1,22 @@ +static const int vs_total_ac_bits = 2680; +typedef struct EncBlockInfo { + short mb[64]; + unsigned char next[64]; +} EncBlockInfo; +inline void dv_guess_qnos(EncBlockInfo* blks, int* qnos) { + int size[5]; + int j, k, a, prev; + EncBlockInfo* b; + for(a=2; a==2 || vs_total_ac_bits < size[0]; a+=a){ + for (j=0; j<6*5; j++, b++) { + for (k= b->next[prev]; k<64; k= b->next[k]) { + if(b->mb[k] < a && b->mb[k] > -a){ + b->next[prev] = b->next[k]; + } + else{ + prev = k; + } + } + } + } +} diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr38926.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr38926.c 2009-01-29 09:06:01.240583000 -0800 @@ -0,0 +1,41 @@ +static inline int foo (unsigned _si1) +{ + if (_si1 != 0) + if (_si1 > 2147483647) + return 1; + return 0; +} + +static inline unsigned bar (unsigned _left, int _right) +{ + return (unsigned) _right >= 8 ? 1 : _left >> _right; +} + +unsigned g_2; +unsigned g_67; +volatile unsigned g_162; + +static inline int func_62 (unsigned p_63) +{ + p_63 = g_2 & g_67; + if (g_2) + ; + else if (p_63) + return 1; + g_67 = bar (p_63, g_2); + return 0; +} + +unsigned baz (void) +{ + if (g_2) + for (; g_2 <= -16; g_2 = foo (g_2)) + { + for (; g_162; g_162) + func_62 (func_62 (0)); + if (g_67) + break; + } + return g_2; +} + diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/compile/pr39041.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/compile/pr39041.c 2009-01-30 14:14:39.201534000 -0800 @@ -0,0 +1,28 @@ +int test_bit(int nr, void *addr) +{ + int *a = (int *)addr; + int mask; + a += nr; + mask = 1 << nr; + return mask & *a; +} +struct { + struct { + int disabled; + } *data[1]; +} trace; +struct { + unsigned bits[1]; +} cpumask; +void inc(int *); +void dec(int *); +int foo(void) +{ + int cpu; + for (cpu = 0; cpu < 1; cpu++) { + if (test_bit(cpu, cpumask.bits)) + inc(&trace.data[cpu]->disabled); + if (!test_bit(cpu, cpumask.bits)) + dec(&trace.data[cpu]->disabled); + } +} diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr38969.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr38969.c 2009-01-29 02:05:17.651873000 -0800 @@ -0,0 +1,25 @@ +__complex__ float +__attribute__ ((noinline)) foo (__complex__ float x) +{ + return x; +} + +__complex__ float +__attribute__ ((noinline)) bar (__complex__ float x) +{ + return foo (x); +} + +int main() +{ + __complex__ float a, b; + __real__ a = 9; + __imag__ a = 42; + + b = bar (a); + + if (a != b) + abort (); + + return 0; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39100.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39100.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39100.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39100.c 2009-02-05 03:10:02.086542000 -0800 @@ -0,0 +1,65 @@ +/* Bad PTA results (incorrect store handling) was causing us to delete + *na = 0 store. */ + +typedef struct E +{ + int p; + struct E *n; +} *EP; + +typedef struct C +{ + EP x; + short cn, cp; +} *CP; + +__attribute__((noinline)) CP +foo (CP h, EP x) +{ + EP pl = 0, *pa = &pl; + EP nl = 0, *na = &nl; + EP n; + + while (x) + { + n = x->n; + if ((x->p & 1) == 1) + { + h->cp++; + *pa = x; + pa = &((*pa)->n); + } + else + { + h->cn++; + *na = x; + na = &((*na)->n); + } + x = n; + } + *pa = nl; + *na = 0; + h->x = pl; + return h; +} + +int +main (void) +{ + struct C c = { 0, 0, 0 }; + struct E e[2] = { { 0, &e[1] }, { 1, 0 } }; + EP p; + + foo (&c, &e[0]); + if (c.cn != 1 || c.cp != 1) + __builtin_abort (); + if (c.x != &e[1]) + __builtin_abort (); + if (e[1].n != &e[0]) + __builtin_abort (); + if (e[0].n) + __builtin_abort (); + return 0; +} + + diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39228.c gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39228.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39228.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39228.c 2009-02-19 04:44:40.878358000 -0800 @@ -0,0 +1,36 @@ +extern void abort (void); + +static int __attribute__((always_inline)) testf (float b) +{ + float c = 1.01f * b; + + return __builtin_isinff (c); +} + +static int __attribute__((always_inline)) test (double b) +{ + double c = 1.01 * b; + + return __builtin_isinf (c); +} + +static int __attribute__((always_inline)) testl (long double b) +{ + long double c = 1.01L * b; + + return __builtin_isinfl (c); +} + +int main() +{ + if (testf (__FLT_MAX__) < 1) + abort (); + + if (test (__DBL_MAX__) < 1) + abort (); + + if (testl (__LDBL_MAX__) < 1) + abort (); + + return 0; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39228.x gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39228.x --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/pr39228.x 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/pr39228.x 2009-02-21 05:04:37.075689000 -0800 @@ -0,0 +1,10 @@ +if { [istarget "alpha*-*-*"] || [istarget "sh*-*-*"] } { + # alpha and SH require -mieee for this test. + set additional_flags "-mieee" +} +if [istarget "spu-*-*"] { + # No Inf/NaN support on SPU. + return 1 +} + +return 0 diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c 2002-12-16 10:23:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/shiftopt-1.c 2009-01-24 15:26:56.556617000 -0800 @@ -43,12 +43,6 @@ if (0 >> x != 0) link_error (); - - if (-1 >> x != -1) - link_error (); - - if (~0 >> x != ~0) - link_error (); } int diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.c-torture/execute/struct-aliasing-1.c 2009-01-30 09:31:24.050790000 -0800 @@ -0,0 +1,17 @@ +struct S { float f; }; +int __attribute__((noinline)) +foo (int *r, struct S *p) +{ + int *q = (int *)&p->f; + int i = *q; + *r = 0; + return i + *q; +} +extern void abort (void); +int main() +{ + int i = 1; + if (foo (&i, (struct S *)&i) != 1) + abort (); + return (0); +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/asm-b.c gcc-4.3.3/gcc/testsuite/gcc.dg/asm-b.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/asm-b.c 2006-12-20 14:01:01.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/asm-b.c 2009-03-13 06:25:50.614654000 -0700 @@ -24,8 +24,8 @@ #if defined (__powerpc__) || defined (__PPC__) || defined (__ppc__) || defined (_POWER) || defined (__ppc64__) __asm __volatile ("sthbrx %1,0,%2" : "=m" (*z) : "r" (y), "r" (z)); #elif defined __i386__ || defined __x86_64__ - __asm __volatile ("movb %b1,1(%2); movb %h1,(%2)" : "=m" (*z) : "r" (y), "r" -(z)); + __asm __volatile ("movb %b1,1(%2)\n\tmovb %h1,(%2)" + : "=m" (*z) : "Q" (y), "R" (z)); #endif return (x & 1) == 0; } diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/attr-alias-4.c gcc-4.3.3/gcc/testsuite/gcc.dg/attr-alias-4.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/attr-alias-4.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/attr-alias-4.c 2009-02-08 11:02:56.473953000 -0800 @@ -0,0 +1,4 @@ +/* ICE on invalid alias attribute: PR 35434. */ +/* { dg-do compile } */ +/* { dg-options "" } */ +typedef int i __attribute__((alias("j"))); /* { dg-warning "ignored" } */ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/c90-flex-array-2.c gcc-4.3.3/gcc/testsuite/gcc.dg/c90-flex-array-2.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/c90-flex-array-2.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/c90-flex-array-2.c 2009-02-08 11:01:57.311455000 -0800 @@ -0,0 +1,15 @@ +/* [] does not indicate a flexible array member unless it is the field + itself being declared as an incomplete array type rather than a + pointer or other type derived from such a type. PR 36432. */ +/* { dg-do compile } */ +/* { dg-options "-std=iso9899:1990 -pedantic-errors" } */ + +void +f (void) +{ + int a[3]; + int (*p)[]; + struct { int (*p)[]; } s; + p = &a; + s.p = &a; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/c99-flex-array-6.c gcc-4.3.3/gcc/testsuite/gcc.dg/c99-flex-array-6.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/c99-flex-array-6.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/c99-flex-array-6.c 2009-02-08 11:01:57.311455000 -0800 @@ -0,0 +1,15 @@ +/* [] does not indicate a flexible array member unless it is the field + itself being declared as an incomplete array type rather than a + pointer or other type derived from such a type. PR 36432. */ +/* { dg-do compile } */ +/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */ + +void +f (void) +{ + int a[3]; + int (*p)[]; + struct { int (*p)[]; } s; + p = &a; + s.p = &a; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-bfp-13.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-bfp-13.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-bfp-13.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-bfp-13.c 2009-02-25 14:08:55.493777000 -0800 @@ -0,0 +1,20 @@ +/* Test for bug where fold changed binary operation to decimal + depending on typedefs. */ +/* { dg-options "-std=gnu99" } */ + +extern void abort (void); +extern void exit (int); + +volatile double d = 1.2345675; + +typedef const volatile _Decimal32 d32; + +int +main (void) +{ + _Decimal32 a = (d * d); + d32 b = (d * d); + if (a != b) + abort (); + exit (0); +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-bfp-14.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-bfp-14.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-bfp-14.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-bfp-14.c 2009-02-25 14:08:55.493777000 -0800 @@ -0,0 +1,17 @@ +/* Test for bug where fold narrowed decimal floating-point + operations. */ +/* { dg-options "-std=gnu99" } */ + +extern void abort (void); +extern void exit (int); + +volatile _Decimal32 f = 1.23456DF; +volatile _Decimal64 d = 1.23456DD; + +int +main (void) +{ + if ((double)((_Decimal64)f * (_Decimal64)f) != (double)(d * d)) + abort (); + exit (0); +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-dfp-fold-2.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-dfp-fold-2.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/convert-dfp-fold-2.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/convert-dfp-fold-2.c 2009-02-25 14:08:55.493777000 -0800 @@ -0,0 +1,17 @@ +/* Test for bug where fold narrowed decimal floating-point + operations. */ +/* { dg-options "-std=gnu99" } */ + +extern void abort (void); +extern void exit (int); + +volatile _Decimal32 f = 1.23456DF; +volatile _Decimal64 d = 1.23456DD; + +int +main (void) +{ + if ((_Decimal128)((_Decimal64)f * (_Decimal64)f) != (_Decimal128)(d * d)) + abort (); + exit (0); +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/pr39034.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/pr39034.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/pr39034.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/pr39034.c 2009-02-25 14:08:55.493777000 -0800 @@ -0,0 +1,110 @@ +/* { dg-do run } */ +/* { dg-options "-std=gnu99 -O" } */ + +/* DFP TR 24732 == WG14 / N1176, N1312 */ + +extern void abort (void); +int failures = 0; + +#ifdef DBG +#include +#define FAILURE(MSG) { printf ("line %d: %s\n", __LINE__, MSG); failures++; } +#else +#define FAILURE(MSG) failures++; +#endif + + +/* Test runtime computations. */ + +void +runtime32 (void) +{ + volatile float v1 = 28.f, v2 = 3.f, v3 = 9.f, v4 = 31.f, v5 = 3.f, v6 = 10.f; + float b32 = (float)((v1/v2-v3) - (v4/v5-v6)); + _Decimal32 d32 = (float)((v1/v2-v3) - (v4/v5-v6)); + + if (b32) + FAILURE ("runtime: b32 should be zero") + if (d32) + FAILURE ("runtime: d32 should be zero") +} + +void +runtime64 (void) +{ + volatile double v1 = 28., v2 = 3., v3 = 9., v4 = 31., v5 = 3., v6 = 10.; + double b64 = (double)((v1/v2-v3) - (v4/v5-v6)); + _Decimal64 d64 = (double)((v1/v2-v3) - (v4/v5-v6)); + + if (b64) + FAILURE ("runtime: b64 should be zero") + if (d64) + FAILURE ("runtime: d64 should be zero") +} + +void +runtime128 (void) +{ + volatile long double v1 = 28.l, v2 = 3.l, v3 = 9.l, + v4 = 31.l, v5 = 3.l, v6 = 10.l; + long double b128 = (long double)((v1/v2-v3) - (v4/v5-v6)); + _Decimal128 d128 = (long double)((v1/v2-v3) - (v4/v5-v6)); + + if (b128) + FAILURE ("runtime: b128 should be zero") + if (d128) + FAILURE ("runtime: d128 should be zero") +} + +/* Test constant folding. */ + +void +fold32 (void) +{ + double d32 = (float)((28.f/3.f-9.f) - (31.f/3.f-10.f)); + _Decimal32 b32 = (float)((28.f/3.f-9.f) - (31.f/3.f-10.f)); + + if (b32) + FAILURE ("fold: b32 should be zero") + if (d32) + FAILURE ("fold: d32 should be zero") +} + +void +fold64 (void) +{ + double b64 = (double)((28./3.-9.) - (31./3.-10.)); + _Decimal64 d64 = (double)((28./3.-9.) - (31./3.-10.)); + + if (b64) + FAILURE ("fold: b64 should be zero") + if (d64) + FAILURE ("fold: d64 should be zero") +} + +void +fold128 (void) +{ + long double b128 = (long double)((28./3.-9.) - (31./3.-10.)); + _Decimal128 d128 = (long double)((28./3.-9.) - (31./3.-10.)); + + if (b128) + FAILURE ("fold: b128 should be zero") + if (d128) + FAILURE ("fold: d128 should be zero") +} + +int +main () +{ + runtime32 (); + runtime64 (); + runtime128 (); + fold32 (); + fold64 (); + fold128 (); + + if (failures != 0) + abort (); + return 0; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/pr39035.c gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/pr39035.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/dfp/pr39035.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/dfp/pr39035.c 2009-02-09 10:51:31.855521000 -0800 @@ -0,0 +1,81 @@ +/* { dg-do run } */ +/* { dg-options "-std=gnu99 -O" } */ + +/* DFP TR 24732 == WG14 / N1176, N1312 */ +/* Based on a test from Fred Tydeman. */ + +extern void abort (void); +int failures = 0; + +#ifdef DBG +#include +#define FAILURE(MSG) { printf ("line %d: %s\n", __LINE__, MSG); failures++; } +#else +#define FAILURE(MSG) failures++; +#endif + +/* Test runtime computations. */ + +void +runtime32 (void) +{ + volatile _Decimal32 d; + d = 0.0DF; + if (d) + FAILURE ("0.0DF should be zero") +} + +void +runtime64 (void) +{ + volatile _Decimal64 d; + d = 0.0DD; + if (d) + FAILURE ("0.0DD should be zero") +} + +void +runtime128 (void) +{ + volatile _Decimal128 d; + d = 0.0DL; + if (d) + FAILURE ("0.0DL should be zero") +} + +void +fold32 (void) +{ + if (0.0DF) + FAILURE ("0.0DF should be zero") +} + +void +fold64 (void) +{ + if (0.0DD) + FAILURE ("0.0DD should be zero") +} + +void +fold128 (void) +{ + if (0.0DL) + FAILURE ("0.0DL should be zero") +} + +int +main(void) +{ + runtime32 (); + runtime64 (); + runtime128 (); + + fold32 (); + fold64 (); + fold128 (); + + if (failures != 0) + abort (); + return 0; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/init-bad-4.c gcc-4.3.3/gcc/testsuite/gcc.dg/init-bad-4.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/init-bad-4.c 2006-04-21 16:02:26.000000000 -0700 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/init-bad-4.c 2009-02-17 05:00:40.440258000 -0800 @@ -2,4 +2,4 @@ /* Origin: Richard Guenther */ /* { dg-do compile } */ -struct A { } a = (struct A) {{ (X)0 }}; /* { dg-error "no members|extra brace|near|undeclared|constant|compound" } */ +struct A { } a = (struct A) {{ (X)0 }}; /* { dg-error "no members|extra brace|near|undeclared|constant|compound|excess" } */ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/init-bad-6.c gcc-4.3.3/gcc/testsuite/gcc.dg/init-bad-6.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/init-bad-6.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/init-bad-6.c 2009-02-04 05:07:43.805620000 -0800 @@ -0,0 +1,12 @@ +/* ICE arising from bug computing composite type of zero-length array + types: PR 35433. */ +/* { dg-do compile } */ +/* { dg-options "" } */ + +typedef int* X; +typedef int* Y; + +X (*p)[][0]; +Y (*q)[][0]; + +typeof(*(0 ? p : q)) x = { 0 }; /* { dg-warning "excess elements in array initializer|near initialization" } */ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/init-5.c gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/init-5.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/init-5.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/init-5.c 2009-02-17 05:00:40.440258000 -0800 @@ -0,0 +1,4 @@ +/* Test for ICE after syntax error in initializer with range + designator: PR 35446. */ + +int a[2][2] = { [0 ... 1] = { ; } }; /* { dg-error "expected expression" } */ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/pr35444-1.c gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/pr35444-1.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/pr35444-1.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/pr35444-1.c 2009-02-13 05:10:52.921838000 -0800 @@ -0,0 +1,3 @@ +/* PR 35444: ICE from pending VLA sizes in invalid parameter list. */ +void foo(int n, int a[n], int 0); /* { dg-error "expected" } */ +void bar() {} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/pr35444-2.c gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/pr35444-2.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/noncompile/pr35444-2.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/noncompile/pr35444-2.c 2009-02-13 05:10:52.921838000 -0800 @@ -0,0 +1,4 @@ +/* PR 35444: ICE from pending VLA sizes in invalid parameter list. + Similar case to the PR, but with "..." before the syntax error. */ +void foo(int n, int a[n], ... 0); /* { dg-error "expected" } */ +void bar() {} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.c 2009-01-30 14:36:22.577619000 -0800 @@ -0,0 +1,112 @@ +/* PR rtl-optimization/38245 */ +/* { dg-do run } */ +/* { dg-additional-sources "pr38245-4.c" } */ +/* { dg-options "-O2" } */ + +#include "pr38245-3.h" + +extern void abort (void); + +struct A { int i, j; union { short s[4]; long long l; }; char pad[512]; } a; +int globv = 6; + +void __attribute__((noinline)) +f1 (void) +{ + a.s[2] = b1 (6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21); + a.l = 6; +} + +void __attribute__((noinline)) +f2 (void) +{ + a.s[2] = b2 (6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21); + a.l = 6; +} + +void __attribute__((noinline)) +f3 (void) +{ + struct B b = { 30, 31, { 32, 33 } }; + a.s[2] = b3 (6, 7, 8, 9, 10, 11, 12, b, 14, b, 16, b, 18, 19, 20, 21, + 6, b, 8, b, 10, 11, 12, 13, 14, b, 16, b, 18, 19, 20, 21); + a.l = 6; +} + +void __attribute__((noinline)) +f4 (void) +{ + struct B b = { 30, 31, { 32, 33 } }; + a.s[2] = b4 (6, 7, 8, 9, 10, 11, 12, b, 14, b, 16, b, 18, 19, 20, 21, + 6, b, 8, b, 10, 11, 12, 13, 14, b, 16, b, 18, 19, 20, 21); + a.l = 6; +} + +void __attribute__((noinline)) +f5 (void) +{ + a.s[2] = b5 (6.0, 7, 8, 9, 10, 11, 21.0, 22.0, 23.0); + a.l = 6; +} + +void __attribute__((noinline)) +f6 (void) +{ + a.s[2] = b6 (6.0, 7, 8, 9, 10, 11, 21.0, 22.0, 23.0); + a.l = 6; +} + +void __attribute__((noinline)) +f7 (void) +{ + a.s[2] = b7 (6, 7); + a.l = 6; +} + +void __attribute__((noinline)) +f8 (void) +{ + a.s[2] = b8 (6, 7); + a.l = 6; +} + +void __attribute__((noinline)) +f9 (void) +{ + a.s[2] = b9 (6, 7, 8, 9, 10, 11, 12); + a.l = 6; +} + +void __attribute__((noinline)) +f10 (void) +{ + a.s[2] = b10 (6, 7, 8, 9, 10, 11, 12); + a.l = 6; +} + +int +main (void) +{ + char buf[256]; + int i; + for (i = 0; i < (int) sizeof buf; i++) + buf[i] = i; + asm volatile ("" : : "r" (buf) : "memory"); + f1 (); + f2 (); + f3 (); + f4 (); + f5 (); + f6 (); + f7 (); + f8 (); + f9 (); + f10 (); + asm volatile ("" : : "r" (buf) : "memory"); + for (i = 0; i < (int) sizeof buf; i++) + if (buf[i] != (char) i) + abort (); + return 0; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.h gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.h --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-3.h 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-3.h 2009-01-30 14:36:22.577619000 -0800 @@ -0,0 +1,35 @@ +/* PR rtl-optimization/38245 */ + +struct B { long a, b; char p[32]; }; +extern int globv; + +extern int b1 (long long, long, long, long, long, long, long, long, + long long, long, long, long, long, long, long, long, + long long, long, long, long, long, long, long, long, + long long, long, long, long, long, long, long, long) + __attribute__((pure, noinline)); +extern int b2 (long long, long, long, long, long, long, long, long, + long long, long, long, long, long, long, long, long, + long long, long, long, long, long, long, long, long, + long long, long, long, long, long, long, long, long) + __attribute__((const, noinline)); +extern int b3 (long long, long, long, long, long, long, long, struct B, + long long, struct B, long, struct B, long, long, long, long, + long long, struct B, long, struct B, long, long, long, long, + long long, struct B, long, struct B, long, long, long, long) + __attribute__((pure, noinline)); +extern int b4 (long long, long, long, long, long, long, long, struct B, + long long, struct B, long, struct B, long, long, long, long, + long long, struct B, long, struct B, long, long, long, long, + long long, struct B, long, struct B, long, long, long, long) + __attribute__((const, noinline)); +extern int b5 () __attribute__((pure, noinline)); +extern int b6 () __attribute__((const, noinline)); +extern int b7 (int, int) + __attribute__((pure, noinline)); +extern int b8 (int, int) + __attribute__((const, noinline)); +extern int b9 (int, int, int, int, int, int, int) + __attribute__((pure, noinline)); +extern int b10 (int, int, int, int, int, int, int) + __attribute__((const, noinline)); diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-4.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-4.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38245-4.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38245-4.c 2009-01-30 14:36:22.577619000 -0800 @@ -0,0 +1,107 @@ +/* PR rtl-optimization/38245 */ +/* { dg-do compile } */ +/* { dg-options "" } */ + +#include "pr38245-3.h" + +int +b1 (long long a1, long a2, long a3, long a4, + long a5, long a6, long a7, long a8, + long long a9, long a10, long a11, long a12, + long a13, long a14, long a15, long a16, + long long a17, long a18, long a19, long a20, + long a21, long a22, long a23, long a24, + long long a25, long a26, long a27, long a28, + long a29, long a30, long a31, long a32) +{ + return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + a10 + + a11 + a12 + a13 + a14 + a15 + a16 + a17 + a18 + a19 + a20 + + a21 + a22 + a23 + a24 + a25 + a26 + a27 + a28 + a29 + a30 + + a31 + a32 + globv; +} + +int +b2 (long long a1, long a2, long a3, long a4, + long a5, long a6, long a7, long a8, + long long a9, long a10, long a11, long a12, + long a13, long a14, long a15, long a16, + long long a17, long a18, long a19, long a20, + long a21, long a22, long a23, long a24, + long long a25, long a26, long a27, long a28, + long a29, long a30, long a31, long a32) +{ + return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + a10 + + a11 + a12 + a13 + a14 + a15 + a16 + a17 + a18 + a19 + a20 + + a21 + a22 + a23 + a24 + a25 + a26 + a27 + a28 + a29 + a30 + + a31 + a32; +} + +int +b3 (long long a1, long a2, long a3, long a4, + long a5, long a6, long a7, struct B a8, + long long a9, struct B a10, long a11, struct B a12, + long a13, long a14, long a15, long a16, + long long a17, struct B a18, long a19, struct B a20, + long a21, long a22, long a23, long a24, + long long a25, struct B a26, long a27, struct B a28, + long a29, long a30, long a31, long a32) +{ + return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8.a + a9 + a10.a + + a11 + a12.a + a13 + a14 + a15 + a16 + a17 + a18.a + a19 + a20.a + + a21 + a22 + a23 + a24 + a25 + a26.a + a27 + a28.a + a29 + a30 + + a31 + a32 + globv; +} + +int +b4 (long long a1, long a2, long a3, long a4, + long a5, long a6, long a7, struct B a8, + long long a9, struct B a10, long a11, struct B a12, + long a13, long a14, long a15, long a16, + long long a17, struct B a18, long a19, struct B a20, + long a21, long a22, long a23, long a24, + long long a25, struct B a26, long a27, struct B a28, + long a29, long a30, long a31, long a32) +{ + return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8.a + a9 + a10.a + + a11 + a12.a + a13 + a14 + a15 + a16 + a17 + a18.a + a19 + a20.a + + a21 + a22 + a23 + a24 + a25 + a26.a + a27 + a28.a + a29 + a30 + + a31 + a32; +} + +int +b5 (double a1, int a2, int a3, int a4, int a5, int a6, double a7, + double a8, double a9) +{ + return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9 + globv; +} + +int +b6 (double a1, int a2, int a3, int a4, int a5, int a6, double a7, + double a8, double a9) +{ + return a1 + a2 + a3 + a4 + a5 + a6 + a7 + a8 + a9; +} + +int +b7 (int a1, int a2) +{ + return a1 + a2 + globv; +} + +int +b8 (int a1, int a2) +{ + return a1 + a2; +} + +int +b9 (int a1, int a2, int a3, int a4, int a5, int a6, int a7) +{ + return a1 + a2 + a3 + a4 + a5 + a6 + a7 + globv; +} + +int +b10 (int a1, int a2, int a3, int a4, int a5, int a6, int a7) +{ + return a1 + a2 + a3 + a4 + a5 + a6 + a7; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38364.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38364.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38364.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38364.c 2009-01-30 14:36:22.577619000 -0800 @@ -0,0 +1,79 @@ +/* PR middle-end/38364 */ +/* { dg-do run } */ +/* { dg-options "-O2 -ftrapv" } */ + +extern void abort (void); + +static inline short +f1 (short x, short y) +{ + if (x > 0) + { + if (y > 0) + { + if (x > __SHRT_MAX__ / y) + return x; + } + else if (y < (-__SHRT_MAX__ - 1) / x) + return x; + } + else + { + if (y > 0) + { + if (x < (-__SHRT_MAX__ - 1) / y) + return x; + } + else if (x != 0 && y < __SHRT_MAX__ / x) + return x; + } + return x * y; +} + +static inline signed char +f2 (signed char x, signed char y) +{ + if (((x ^ y) & (((x ^ ((x ^ y) & (1 << (__CHAR_BIT__ - 1)))) - y) ^ y)) < 0) + return x; + return x - y; +} + +unsigned int v; + +int +f3 (int x, unsigned int y) +{ + f1 (1, 1); + return 1; +} + +int +f4 (unsigned short x) +{ + v = x; + return 1; +} + +int +f5 (int x) +{ + if (f2 (x, 1)) + f1 (1, f4 (1)); + return x; +} + +int +f6 (unsigned int x) +{ + f4 (x < (1 != f5 (0))); + return x; +} + +int +main (void) +{ + f6 (1); + if (v != 0) + abort (); + return 0; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38615.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38615.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38615.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38615.c 2009-01-27 10:45:49.519017000 -0800 @@ -0,0 +1,19 @@ +/* { dg-do run } */ + +int t; +extern void abort (void); + +int f(int t, const int *a) +{ + const int b[] = { 1, 2, 3}; + if (!t) + return f(1, b); + return b == a; +} + +int main(void) +{ + if (f(0, 0)) + abort (); + return 0; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38902.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38902.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38902.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38902.c 2009-01-24 07:31:13.971031000 -0800 @@ -0,0 +1,131 @@ +/* PR target/38902 */ +/* { dg-do run } */ +/* { dg-options "-O2 -fstack-protector" } */ +/* { dg-require-effective-target fstack_protector } */ + +#ifdef DEBUG +#include +#define debug(format, args...) printf (format , ## args) +#else +extern int sprintf (char *, const char *, ...); +#define debug(format, args...) +#endif + +extern void abort (void); + +/* + +Copyright (C) 2009 Canonical, Ltd. +Author: Kees Cook +License: GPLv3 + +http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38616 +https://bugs.launchpad.net/ubuntu/+source/gcc-4.3/+bug/316019 +http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38902 + +gcc -O2 -fstack-protector truncate.c -o truncate + + Broken: + + Only the first operation fails, so create a new function for each test. + Source must be local (literal or stack) + + __builtin_memmove + __builtin_memcpy + __builtin_strcpy (optimized to __builtin_memcpy?) + sprintf (direct) (optmized to __builtin_strcpy?) + sprintf (via %s) (optmized to __builtin_strcpy?) + + OK: + __builtin_strcat + sprintf (complex format) + + */ + +char *heap = "1234567890abcdefghijklmnopqrstuvwxyz"; + +int failed = 0; + +#define CHECK(count, a...) \ +void test##count (void) \ +{ \ + char *local = "1234567890abcdefghijklmnopqrstuvwxyz"; \ + char buffer[1024]=""; \ + a; \ + if (__builtin_strcmp(buffer, heap) == 0) { \ + debug("Okay(%d):\n\t%s\n", count, # a); \ + } \ + else { \ + debug("Failed(%d):\n\t%s\n", count, # a); \ + failed++; \ + } \ +} + + +CHECK( 0, __builtin_memcpy (buffer, "1234567890abcdefghijklmnopqrstuvwxyz", __builtin_strlen("1234567890abcdefghijklmnopqrstuvwxyz")+1); ); +CHECK( 1, __builtin_memcpy (buffer, local, __builtin_strlen(local)+1); ); +CHECK( 2, __builtin_memcpy (buffer, heap, __builtin_strlen(heap)+1); ); + +CHECK( 3, __builtin_memmove (buffer, "1234567890abcdefghijklmnopqrstuvwxyz", __builtin_strlen("1234567890abcdefghijklmnopqrstuvwxyz")+1); ); +CHECK( 4, __builtin_memmove (buffer, local, __builtin_strlen(local)+1); ); +CHECK( 5, __builtin_memmove (buffer, heap, __builtin_strlen(heap)+1); ); + +CHECK( 6, __builtin_strcpy (buffer, "1234567890abcdefghijklmnopqrstuvwxyz"); ); +CHECK( 7, __builtin_strcpy (buffer, local); ); +CHECK( 8, __builtin_strcpy (buffer, heap); ); + +CHECK( 9, sprintf (buffer, "1234567890abcdefghijklmnopqrstuvwxyz"); ); +CHECK(10, sprintf (buffer, local); ); +CHECK(11, sprintf (buffer, heap); ); + +CHECK(12, sprintf (buffer, "%s", "1234567890abcdefghijklmnopqrstuvwxyz"); ); +CHECK(13, sprintf (buffer, "%s", local); ); +CHECK(14, sprintf (buffer, "%s", heap); ); + +CHECK(15, __builtin_strcat (buffer, "1234567890abcdefghijklmnopqrstuvwxyz"); ); +CHECK(16, __builtin_strcat (buffer, local); ); +CHECK(17, __builtin_strcat (buffer, heap); ); + +void mongoose(void) +{ + char buffer[1024]=""; + sprintf (buffer, "%s", "1234567890abcdefghijklmnopqrstuvwxyz");; + if (__builtin_strcmp(buffer, heap) == 0) { + debug("Okay(%d):\n\t%s\n", -1, "sprintf (buffer, \"%s\", \"1234567890abcdefghijklmnopqrstuvwxyz\");"); + } + else { + debug("Failed(%d):\n\t%s\n", -1, "sprintf (buffer, \"%s\", \"1234567890abcdefghijklmnopqrstuvwxyz\");"); + failed++; + } +} + +int main (int argc, char *argv[]) +{ + test0(); + test1(); + test2(); + test3(); + test4(); + test5(); + test6(); + test7(); + test8(); + test9(); + test10(); + test11(); + + // wtf, why are these different?! + test12(); + mongoose(); + + test13(); + test14(); + test15(); + test16(); + test17(); + + if (failed) + abort (); + + return 0; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38932.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr38932.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr38932.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr38932.c 2009-01-26 07:54:18.800086000 -0800 @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +/* This variable needed only to exercise FRE instead of CCP. */ +unsigned char g; + +extern void abort(); + +void f (long long int p) +{ + g = 255; + if (p >= (-9223372036854775807LL - 1) - (signed char) g) + p = 1; + + if (p) + abort (); +} + + diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr39084.c gcc-4.3.3/gcc/testsuite/gcc.dg/pr39084.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/pr39084.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/pr39084.c 2009-02-10 08:45:37.511311000 -0800 @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +struct color { int i; }; +static const struct color col; +struct color * f(void) +{ + return (struct color *) &col; +} + +struct color { int j; }; /* { dg-error "redefinition of" } */ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_global.c gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_global.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_global.c 2007-12-13 05:47:22.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_global.c 2009-02-15 00:09:49.211979000 -0800 @@ -25,7 +25,9 @@ if (str.a != res) abort (); - return str.a; + /* POSIX ignores all but the 8 low-order bits, but other + environments may not. */ + return (str.a & 255); } /*--------------------------------------------------------------------------*/ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_local.c gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_local.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_local.c 2007-12-13 05:47:22.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_local.c 2009-02-15 00:09:49.211979000 -0800 @@ -25,7 +25,9 @@ if (str.a != res) abort (); - return str.a; + /* POSIX ignores all but the 8 low-order bits, but other + environments may not. */ + return (str.a & 255); } /*--------------------------------------------------------------------------*/ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_pointer.c gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_pointer.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_pointer.c 2007-12-13 05:47:22.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/struct/wo_prof_single_str_pointer.c 2009-02-15 00:09:49.211979000 -0800 @@ -29,7 +29,9 @@ if (p->a != res) abort (); - return p->a; + /* POSIX ignores all but the 8 low-order bits, but other + environments may not. */ + return (p->a & 255); } /*--------------------------------------------------------------------------*/ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/w_prof_single_str_global.c gcc-4.3.3/gcc/testsuite/gcc.dg/struct/w_prof_single_str_global.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/struct/w_prof_single_str_global.c 2007-12-13 05:47:22.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/struct/w_prof_single_str_global.c 2009-02-15 00:09:49.211979000 -0800 @@ -22,7 +22,9 @@ if (str.a != res) abort (); - return str.a; + /* POSIX ignores all but the 8 low-order bits, but other + environments may not. */ + return (str.a & 255); } /*--------------------------------------------------------------------------*/ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/tls/diag-6.c gcc-4.3.3/gcc/testsuite/gcc.dg/tls/diag-6.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/tls/diag-6.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/tls/diag-6.c 2009-02-05 04:13:52.859351000 -0800 @@ -0,0 +1,8 @@ +/* Invalid tls_model attributes. PR 35435. */ +/* { dg-require-effective-target tls } */ + +int v __attribute__((tls_model("initial-exec"))); /* { dg-warning "attribute ignored" } */ +typedef int X __attribute__((tls_model("initial-exec"))); /* { dg-warning "attribute ignored" } */ +void f(int x __attribute__((tls_model("initial-exec")))); /* { dg-warning "attribute ignored" } */ +__thread int a __attribute__((tls_model(1))); /* { dg-error "tls_model argument not a string" } */ +__thread int b __attribute__((tls_model("unknown"))); /* { dg-error "tls_model argument must be one of" } */ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.dg/torture/pr39241.c gcc-4.3.3/gcc/testsuite/gcc.dg/torture/pr39241.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/torture/pr39241.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/torture/pr39241.c 2009-02-25 10:55:14.218944000 -0800 @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-w" } */ + +static inline int +foo (float f) +{ + return *((int *) &f) - 1; +} + +float +bar (float x, float y, float *z) +{ + float c = y < 0.002f ? 0.002f : y; + float d = x < c ? c : x; + return z[foo (c)] + z[foo (d * 255.0f)]; +} diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c 2009-01-30 09:31:24.050790000 -0800 @@ -0,0 +1,15 @@ +/* { dg-do "compile" } */ +/* { dg-options "-O2 -fdump-tree-fre" } */ + +struct S { float f; }; +int __attribute__((noinline)) +foo (float *r, struct S *p) +{ + int *q = (int *)&p->f; + int i = *q; + *r = 0.0; + return i + *q; +} + +/* { dg-final { scan-tree-dump-times "\\\*q" 1 "fre" } } */ +/* { dg-final { cleanup-tree-dump "fre" } } */ diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr36578-1.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr36578-1.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr36578-1.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr36578-1.c 2009-02-25 14:08:55.493777000 -0800 @@ -0,0 +1,22 @@ +/* Test for unsafe floating-point conversions. PR 36578. */ +/* { dg-do run } */ +/* { dg-options "-msse2 -mfpmath=sse" } */ + +#include "sse2-check.h" + +extern void abort (void); +extern void exit (int); +extern int printf(const char *, ...); + +volatile double d1 = 1.0; +volatile double d2 = 0x1.00001p-53; +volatile double d3; + +static void +sse2_test (void) +{ + d3 = (double)((long double)d1 + (long double)d2); + if (d3 != d1) + abort (); + exit (0); +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr36578-2.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr36578-2.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr36578-2.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr36578-2.c 2009-02-25 14:08:55.493777000 -0800 @@ -0,0 +1,23 @@ +/* Test for unsafe floating-point conversions. */ +/* { dg-do run } */ +/* { dg-options "-msse2 -mfpmath=sse" } */ + +#include "sse2-check.h" + +extern void abort (void); +extern void exit (int); +extern int printf(const char *, ...); + +volatile double d1 = 0x1.000001p0; +volatile double d2 = 0x1p-54; +volatile float f = 0x1.000002p0f; +volatile float f2; + +static void +sse2_test (void) +{ + f2 = (float)((long double)d1 + (long double)d2); + if (f != f2) + abort (); + exit (0); +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38931.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38931.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38931.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38931.c 2009-01-25 04:26:15.714544000 -0800 @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -msse" } */ + +typedef int __m64 __attribute__ ((__vector_size__ (8))); + +extern __m64 foo () ; + +void bar (const int input_bpl, const unsigned char *input, + unsigned char *output, unsigned long x1) +{ + unsigned char *pix_end_ptr = output + x1 * 4; + __m64 m_original = { 0, 0 }; + __m64 m_base_addr = __builtin_ia32_vec_init_v2si (0, input_bpl); + __m64 m_addr = __builtin_ia32_paddd (m_original, m_base_addr); + __m64 *a0 = (__m64 *) input; + + for (; output < pix_end_ptr; output += 4) + { + a0 = (__m64 *) (input + __builtin_ia32_vec_ext_v2si (m_addr, 0)); + m_addr = foo (); + __builtin_prefetch (a0, 0); + } +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38988.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38988.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr38988.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr38988.c 2009-01-29 02:05:17.651873000 -0800 @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target lp64 } */ +/* { dg-require-effective-target fpic } */ +/* { dg-options "-O2 -fpic -mcmodel=large" } */ + +typedef long unsigned int size_t; +typedef void (*func_ptr) (void); + +static func_ptr __DTOR_LIST__[1] = { (func_ptr) (-1) }; + +void +__do_global_dtors_aux (void) +{ + extern func_ptr __DTOR_END__[]; + size_t dtor_idx = 0; + const size_t max_idx = __DTOR_END__ - __DTOR_LIST__ - 1; + func_ptr f; + + while (dtor_idx < max_idx) + { + f = __DTOR_LIST__[++dtor_idx]; + f (); + } +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr39058.c gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr39058.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.target/i386/pr39058.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.target/i386/pr39058.c 2009-02-25 23:06:48.803473000 -0800 @@ -0,0 +1,34 @@ +/* PR inline-asm/39058 */ +/* { dg-options "-O2" } */ + +double +f1 () +{ + double x; + asm ("" : "=r,r" (x) : "0,0" (x)); + return x; +} + +double +f2 () +{ + double x; + asm ("" : "=r" (x) : "0" (x)); + return x; +} + +double +f3 () +{ + double x, y; + asm ("" : "=r,r" (x), "=r,r" (y) : "%0,0" (x), "r,r" (0)); + return x; +} + +double +f4 () +{ + double x, y; + asm ("" : "=r" (x), "=r" (y) : "0" (x), "r" (0)); + return x; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/ia64/sibcall-opt-1.c gcc-4.3.3/gcc/testsuite/gcc.target/ia64/sibcall-opt-1.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.target/ia64/sibcall-opt-1.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.target/ia64/sibcall-opt-1.c 2009-02-20 09:18:20.718912000 -0800 @@ -0,0 +1,12 @@ +/* PR target/38056. Do not do sibcall optimization across object file + boundery when -mconstant-gp is not used. */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ +/* { dg-final { scan-assembler "br.call.*bar" } } */ + +int bar(int x); + +int foo(int x) +{ + return (bar(x + 1)); +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/gcc.target/ia64/sibcall-opt-2.c gcc-4.3.3/gcc/testsuite/gcc.target/ia64/sibcall-opt-2.c --- gcc-4.3.3.orig/gcc/testsuite/gcc.target/ia64/sibcall-opt-2.c 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gcc.target/ia64/sibcall-opt-2.c 2009-02-20 09:18:20.718912000 -0800 @@ -0,0 +1,12 @@ +/* PR target/38056. Do sibcall optimization across object file + boundery when -mconstant-gp is used. */ +/* { dg-do compile } */ +/* { dg-options "-O2 -mconstant-gp" } */ +/* { dg-final { scan-assembler-not "br.call.*bar" } } */ + +int bar(int x); + +int foo(int x) +{ + return (bar(x + 1)); +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/cpp0x/decltype16.C gcc-4.3.3/gcc/testsuite/g++.dg/cpp0x/decltype16.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/cpp0x/decltype16.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/cpp0x/decltype16.C 2009-02-13 13:53:38.261573000 -0800 @@ -0,0 +1,10 @@ +// PR c++/39070 +// { dg-options "-std=c++0x" } + +template struct junk { + template static Z y(); + template static int test(...); + template static char test(decltype(y())*); + static int const value=sizeof(test(0)); +}; +typedef char type[junk::value==sizeof(char) ? 1 : -1]; diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/other/pr38706.C gcc-4.3.3/gcc/testsuite/g++.dg/other/pr38706.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/other/pr38706.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/other/pr38706.C 2009-01-27 03:39:42.241832000 -0800 @@ -0,0 +1,19 @@ +// PR target/38706 +// { dg-do compile } +// { dg-options "-O2" } + +class ios_base +{ +public: + virtual ~ios_base (); + +}; + +class istrstream:virtual public ios_base +{ +public: + virtual ~istrstream (); + +}; + +istrstream::~istrstream () {} diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor14.C gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor14.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor14.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor14.C 2009-02-02 11:57:29.682708000 -0800 @@ -0,0 +1,8 @@ +// PR c++/39054 + +struct A {}; + +template void foo() +{ + A().~int(); // { dg-error "expected" } +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor15.C gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor15.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/parse/dtor15.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/parse/dtor15.C 2009-02-20 07:21:51.443104000 -0800 @@ -0,0 +1,16 @@ +// PR c++/39225 + +template +class A +{ +public: + A() {} + ~B() {} // { dg-error "~B" } +}; + +int main() +{ + A *a = new A; + + return 0; +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/array20.C gcc-4.3.3/gcc/testsuite/g++.dg/template/array20.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/array20.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/template/array20.C 2009-02-17 10:27:32.576290000 -0800 @@ -0,0 +1,10 @@ +// PR c++/38950 + +template void f(T(&)[N]); + +int main() { + int x[2]; + unsigned int y[2]; + f(x); // works + f(y); // ICE +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dependent-name5.C gcc-4.3.3/gcc/testsuite/g++.dg/template/dependent-name5.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dependent-name5.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/template/dependent-name5.C 2009-03-04 11:37:43.898064000 -0800 @@ -0,0 +1,45 @@ +// PR c++/9634, c++/29469, c++/29607 +// Contributed by: Giovanni Bajo +// DR224: Make sure that a name is *truly* semantically dependent. + +struct D { + typedef int K; +}; + +template +struct A +{ + typedef int Bar; + + template + struct N {}; + + typedef Bar type1; + typedef A::Bar type2; + typedef A::Bar type3; + typedef A::Bar type4; // { dg-error "" } + typedef typename A::Bar type5; + + typedef N type6; + typedef A::N type7; + typedef A::N type8; + typedef A::template N type9; // { dg-error "" } + typedef typename A::template N type10; + + typedef D Bar2; + struct N2 { typedef int K; }; + + // Check that A::N2 is still considered dependent (because it + // could be specialized), while A::Bar2 (being just ::D) is not. + typedef A::Bar2 type11; + typedef type11::K k3; + + typedef A::N2 type12; + typedef typename type12::K k2; + typedef type12::K k1; // { dg-error "" } + + // Check that A::Bar2 is not considered dependent even if we use + // the typename keyword. + typedef typename A::Bar2 type13; + typedef type13::K k4; +}; diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dtor5.C gcc-4.3.3/gcc/testsuite/g++.dg/template/dtor5.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/dtor5.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/template/dtor5.C 2009-01-26 10:24:45.754928000 -0800 @@ -0,0 +1,21 @@ +// PR c++/23287 + +template struct A +{ + int i; + ~A(); +}; + +template void f(A *ap) { + ap->~A(); +} + +template void g(A *ap) { + ap->~B(); // { dg-error "destructor name" } +} + +int main() +{ + f(new A); + g(new A); +} diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/func2.C gcc-4.3.3/gcc/testsuite/g++.dg/template/func2.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/func2.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/template/func2.C 2009-02-03 07:56:05.128711000 -0800 @@ -0,0 +1,12 @@ +// { dg-do compile } + +typedef void (*fptr)(); +fptr zeroptr = 0; +template struct foo { }; +template struct foo { }; +// { dg-error "not a valid template argument" "not valid" { target *-*-* } 6 } +// { dg-error "must be the address" "must be the address " { target *-*-* } 6 } + +// The rest is needed to trigger the ICE in 4.0 to 4.3: +void f() { } +foo m_foo; diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/pr39425.C gcc-4.3.3/gcc/testsuite/g++.dg/template/pr39425.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/pr39425.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/template/pr39425.C 2009-03-18 08:00:32.834440000 -0700 @@ -0,0 +1,18 @@ +// PR c++/39425 +// { dg-do compile } + +class a { + + template + struct _rec { + static const char size = _rec< (s >> 1) >::size; + }; + + template<> // { dg-error "explicit" } + struct _rec <0> { + static const char size = 0; + }; + + static const unsigned int value = _rec < 1 >::size; + +} // { dg-error "unqualified-id" } diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/spec33.C gcc-4.3.3/gcc/testsuite/g++.dg/template/spec33.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/spec33.C 2006-09-25 12:58:10.000000000 -0700 +++ gcc-4.3.3/gcc/testsuite/g++.dg/template/spec33.C 2009-03-18 08:00:32.834440000 -0700 @@ -3,5 +3,5 @@ struct A { template static void foo () {} - template<> static void foo<0>() {} // { dg-error "explicit" } + template<> static void foo<0>() {} // { dg-error "explicit|template" } }; diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename15.C gcc-4.3.3/gcc/testsuite/g++.dg/template/typename15.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename15.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/template/typename15.C 2009-02-03 07:56:05.128711000 -0800 @@ -0,0 +1,12 @@ +// PR37314 ice-on-valid-code, from w.doeringer +template +class Cdeque { + typedef T *pointer; + class iterator { + typedef typename Cdeque::pointer pointer; + pointer operator->(); + }; +}; +template T* Cdeque::iterator::operator->() { } + + diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename16.C gcc-4.3.3/gcc/testsuite/g++.dg/template/typename16.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/template/typename16.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/template/typename16.C 2009-02-03 07:56:05.128711000 -0800 @@ -0,0 +1,25 @@ +// PR37314 rejects-valid, from w.doeringer +template +struct A { + typedef __PTRDIFF_TYPE__ difference_type; + struct B { + typedef typename A::difference_type difference_type; + difference_type operator-(B const&) const; + T t; + }; +}; +// + +template +typename A::B::difference_type A::B::operator-(B const&) const { + return -1; +} + +// +int main() { + A::B i; + ++i.t; + return 0; +} + + diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.dg/torture/pr38745.C gcc-4.3.3/gcc/testsuite/g++.dg/torture/pr38745.C --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/torture/pr38745.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/torture/pr38745.C 2009-01-30 09:31:24.050790000 -0800 @@ -0,0 +1,36 @@ +/* { dg-do compile } */ + +union u_u16 +{ + unsigned short v; + struct + { + unsigned char lo8, hi8; + } __attribute__ ((__may_alias__)) u; +} __attribute__ ((__may_alias__)); +union u_u32 +{ + unsigned int v; + struct + { + u_u16 lo16, hi16; + } u; +} __attribute__ ((__may_alias__)); +union u_u64 +{ + struct + { + u_u32 lo32, hi32; + } u; +}; +struct Record +{ +}; +long long +UnpackFullKey (Record & rec, const char *&p) +{ + long long c64 = 0; + (*(u_u16 *) & (*(u_u32 *) & ( *(u_u64*)&c64).u.lo32.v).u.lo16.v).u.hi8 = 1; + return c64; +} + diff -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 --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wstrict-aliasing-bogus-placement-new.C 2009-01-30 09:31:24.050790000 -0800 @@ -0,0 +1,29 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -Wstrict-aliasing" } */ + +inline void *operator new (__SIZE_TYPE__, void *__p) throw() { return __p; } + +struct Y { + Y() {} + int i; +}; + +struct X { + X() {} + void construct(const Y& y) + { + new (&m_data[0]) Y(y); + } + bool initialized; + char m_data[sizeof (Y)]; +}; + +void bar(const X&); +void foo(Y& y) +{ + X x; + x.construct(y); + x.initialized = true; + bar(x); +} + diff -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 --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-1.C 2009-01-30 09:31:24.050790000 -0800 @@ -0,0 +1,15 @@ +/* { dg-options "-O2 -Wuninitialized" } */ + +struct Empty { Empty() {} }; /* { dg-bogus "uninitialized" } */ +struct Other { + Other(const Empty& e_) : e(e_) {} + Empty e; +}; +void bar(Other&); +void foo() +{ + Empty e; + Other o(e); + bar(o); +} + diff -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 --- gcc-4.3.3.orig/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/g++.dg/warn/Wuninitialized-2.C 2009-01-29 09:43:14.166860000 -0800 @@ -0,0 +1,53 @@ +/* { dg-do compile } */ +/* { dg-options "-O -Wuninitialized" } */ + +struct S8 { template S8(T) { } }; + +template struct S10; +template struct S10 { typedef T S12; typedef S8 S1(); }; + +template struct S3 { }; +template struct S11 { S11(S3); }; + +struct S2 +{ + template operator S11() { return S11(S5()); } + template struct S5:public S3 + { + virtual typename S10::S12 S13() { + return 0; + } + }; +}; + +template S11 S6(S3) { return S11(S3()); } +template struct S7 { typedef S12 S15(); }; + +struct S4 +{ + template operator S11() + { + struct S14:public S3 + { + S14(S2 x):S11_(x) { } + S11::S12>::S15> S11_; + }; + return S6(S14(S11_)); + } + S2 S11_; +}; + +struct S9 +{ + template operator S11() { return S11(S14(S11_)); } + template struct S14:public S3 + { + S14(S4 x):S11_(x) { } + S11::S1> S11_; + }; + S4 S11_; +}; + +void S15(S11); +void S16() { S9 x; S15(x); } + diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bound_6.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/bound_6.f90 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bound_6.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/bound_6.f90 2009-02-18 22:43:15.919035000 -0800 @@ -0,0 +1,48 @@ +! { dg-do run } +! Test the fix for PR38852 and PR39006 in which LBOUND did not work +! for some arrays with negative strides. +! +! Contributed by Dick Hendrickson +! and Clive Page +! +program try_je0031 + integer ida(4) + real dda(5,5,5,5,5) + integer, parameter :: nx = 4, ny = 3 + integer :: array1(nx,ny), array2(nx,ny) + data array2 / 1,2,3,4, 10,20,30,40, 100,200,300,400 / + array1 = array2 + call PR38852(IDA,DDA,2,5,-2) + call PR39006(array1, array2(:,ny:1:-1)) +contains + subroutine PR39006(array1, array2) + integer, intent(in) :: array1(:,:), array2(:,:) + integer :: j + do j = 1, ubound(array2,2) + if (any (array1(:,j) .ne. array2(:,4-j))) call abort + end do + end subroutine +end + +SUBROUTINE PR38852(IDA,DDA,nf2,nf5,mf2) + INTEGER IDA(4) + REAL DLA(:,:,:,:) + REAL DDA(5,5,5,5,5) + POINTER DLA + TARGET DDA + DLA => DDA(2:3, 1:3:2, 5:4:-1, NF2, NF5:NF2:MF2) + IDA = UBOUND(DLA) + if (any(ida /= 2)) call abort + DLA => DDA(2:3, 1:3:2, 5:4:-1, 2, 5:2:-2) + IDA = UBOUND(DLA) + if (any(ida /= 2)) call abort +! +! These worked. +! + DLA => DDA(2:3, 1:3:2, 5:4:-1, 2, 5:2:-2) + IDA = shape(DLA) + if (any(ida /= 2)) call abort + DLA => DDA(2:3, 1:3:2, 5:4:-1, 2, 5:2:-2) + IDA = LBOUND(DLA) + if (any(ida /= 1)) call abort +END SUBROUTINE diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bounds_5.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/bounds_5.f90 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/bounds_5.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/bounds_5.f90 2009-01-25 21:43:44.109708000 -0800 @@ -0,0 +1,26 @@ +! { dg-do run } +! +! PR fortran/38859 +! Wrong bounds simplification +! +! Contributed by Dick Hendrickson + + type x + integer I + end type x + type (x) A(0:5, 2:8) + integer ida(2) + + ida = lbound(a) + if (any(ida /= (/0,2/))) call abort + + ida = lbound(a%i) + if (any(ida /= (/1,1/))) call abort + + ida = ubound(a) + if (any(ida /= (/5,8/))) call abort + + ida = ubound(a%i) + if (any(ida /= (/6,7/))) call abort + + end diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_1.f90 2009-01-24 13:49:28.036442000 -0800 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR 38672 - this used to ICE. +MODULE globals + TYPE :: type1 + integer :: x + END TYPE type1 + TYPE (type1) :: pdm_bps +END module globals +BLOCK DATA + use globals +END BLOCK DATA diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_blockdata_2.f90 2009-01-24 13:49:28.036442000 -0800 @@ -0,0 +1,17 @@ +! { dg-do compile } +MODULE globals + TYPE :: type1 + sequence + integer :: x + END TYPE type1 + TYPE (type1) :: pdm_bps + common /co/ pdm_bps +END module globals +BLOCK DATA + use globals +END BLOCK DATA + +program main + use globals + common /co/ pdm_bps ! { dg-error "already in a COMMON block" } +end program main diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/host_assoc_function_7.f90 2009-01-25 22:15:41.225652000 -0800 @@ -0,0 +1,41 @@ +! { dg-do run } +! Tests the fix for PR38907, in which any expressions, including unary plus, +! in front of the call to S_REAL_SUM_I (marked) would throw the mechanism +! for correcting invalid host association. +! +! Contributed by Dick Hendrickson +! +module sa0054_stuff + REAL :: S_REAL_SUM_2(10) = [(REAL (I), I = 1, 10)] +contains + ELEMENTAL FUNCTION S_REAL_SUM_I (A) + REAL :: S_REAL_SUM_I + REAL, INTENT(IN) :: A + X = 1.0 + S_REAL_SUM_I = X + END FUNCTION S_REAL_SUM_I + SUBROUTINE SA0054 (RDA) + REAL RDA(:) + RDA = + S_REAL_SUM_I (RDA) ! Reported problem => ICE + RDA = RDA + S_REAL_SUM_2 (INT (RDA)) ! Also failed + CONTAINS + ELEMENTAL FUNCTION S_REAL_SUM_I (A) + REAL :: S_REAL_SUM_I + REAL, INTENT(IN) :: A + S_REAL_SUM_I = 2.0 * A + END FUNCTION S_REAL_SUM_I + ELEMENTAL FUNCTION S_REAL_SUM_2 (A) + REAL :: S_REAL_SUM_2 + INTEGER, INTENT(IN) :: A + S_REAL_SUM_2 = 2.0 * A + END FUNCTION S_REAL_SUM_2 + END SUBROUTINE +end module sa0054_stuff + + use sa0054_stuff + REAL :: RDA(10) = [(REAL(I), I = 1, 10)] + call SA0054 (RDA) + IF (ANY (INT (RDA) .ne. [(6 * I, I = 1, 10)])) print *, rda +END + +! { dg-final { cleanup-modules "sa0054_stuff" } } diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/initialization_22.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/initialization_22.f90 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/initialization_22.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/initialization_22.f90 2009-03-07 07:56:37.773017000 -0800 @@ -0,0 +1,10 @@ +! { dg-do run } +! tests the fix for PR39292, where the intitialization expression +! did not simplify and caused an ICE in gfc_conv_array_initializer. +! +! Contributed by Richard Guenther +! + integer :: n + real, dimension(2) :: a = (/ ( (float(n))**(1.0), n=1,2) /) + if (any (a .ne. (/ ( (float(n))**(1.0), n=1,2) /))) call abort +end diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/interface_25.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/interface_25.f90 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/interface_25.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/interface_25.f90 2009-03-07 07:58:49.569600000 -0800 @@ -0,0 +1,45 @@ +! { dg-do compile } +! Tests the fix for PR39295, in which the check of the interfaces +! at lines 25 and 42 failed because opfunc1 is identified as a +! function by usage, whereas opfunc2 is not. +! +! Contributed by Jon Hurst +! +MODULE funcs +CONTAINS + INTEGER FUNCTION test1(a,b,opfunc1) + INTEGER :: a,b + INTEGER, EXTERNAL :: opfunc1 + test1 = opfunc1( a, b ) + END FUNCTION test1 + INTEGER FUNCTION sumInts(a,b) + INTEGER :: a,b + sumInts = a + b + END FUNCTION sumInts +END MODULE funcs + +PROGRAM test + USE funcs + INTEGER :: rs + INTEGER, PARAMETER :: a = 2, b = 1 + rs = recSum( a, b, test1, sumInts ) + write(*,*) "Results", rs +CONTAINS + RECURSIVE INTEGER FUNCTION recSum( a,b,UserFunction,UserOp ) RESULT( res ) + IMPLICIT NONE + INTEGER :: a,b + INTERFACE + INTEGER FUNCTION UserFunction(a,b,opfunc2) + INTEGER :: a,b + INTEGER, EXTERNAL :: opfunc2 + END FUNCTION UserFunction + END INTERFACE + INTEGER, EXTERNAL :: UserOp + + res = UserFunction( a,b, UserOp ) + + if( res .lt. 10 ) then + res = recSum( a, res, UserFunction, UserOp ) + end if + END FUNCTION recSum +END PROGRAM test diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/interface_26.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/interface_26.f90 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/interface_26.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/interface_26.f90 2009-03-07 07:58:49.569600000 -0800 @@ -0,0 +1,46 @@ +! { dg-do compile } +! Tests the fix for PR39295, in which the check of the interfaces +! at lines 26 and 43 failed because opfunc1 is identified as a +! function by usage, whereas opfunc2 is not. This testcase checks +! that TKR is stll OK in these cases. +! +! Contributed by Jon Hurst +! +MODULE funcs +CONTAINS + INTEGER FUNCTION test1(a,b,opfunc1) + INTEGER :: a,b + INTEGER, EXTERNAL :: opfunc1 + test1 = opfunc1( a, b ) + END FUNCTION test1 + INTEGER FUNCTION sumInts(a,b) + INTEGER :: a,b + sumInts = a + b + END FUNCTION sumInts +END MODULE funcs + +PROGRAM test + USE funcs + INTEGER :: rs + INTEGER, PARAMETER :: a = 2, b = 1 + rs = recSum( a, b, test1, sumInts ) ! { dg-error "Type/rank mismatch in argument" } + write(*,*) "Results", rs +CONTAINS + RECURSIVE INTEGER FUNCTION recSum( a,b,UserFunction,UserOp ) RESULT( res ) + IMPLICIT NONE + INTEGER :: a,b + INTERFACE + INTEGER FUNCTION UserFunction(a,b,opfunc2) + INTEGER :: a,b + REAL, EXTERNAL :: opfunc2 + END FUNCTION UserFunction + END INTERFACE + INTEGER, EXTERNAL :: UserOp + + res = UserFunction( a,b, UserOp ) + + if( res .lt. 10 ) then + res = recSum( a, res, UserFunction, UserOp ) + end if + END FUNCTION recSum +END PROGRAM test diff -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 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/module_commons_3.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/module_commons_3.f90 2009-01-25 21:12:03.141287000 -0800 @@ -0,0 +1,57 @@ +! { dg-do run } +! +! PR fortran/38657, in which the mixture of PRIVATE and +! COMMON in TEST4, would mess up the association with +! TESTCHAR in TEST2. +! +! Contributed by Paul Thomas +! From a report in clf by Chris Bradley. +! +MODULE TEST4 + PRIVATE + CHARACTER(LEN=80) :: T1 = & + "Mary had a little lamb, Its fleece was white as snow;" + CHARACTER(LEN=80) :: T2 = & + "And everywhere that Mary went, The lamb was sure to go." + CHARACTER(LEN=80) :: TESTCHAR + COMMON /TESTCOMMON1/ TESTCHAR + PUBLIC T1, T2, FOOBAR +CONTAINS + subroutine FOOBAR (CHECK) + CHARACTER(LEN=80) :: CHECK + IF (TESTCHAR .NE. CHECK) CALL ABORT + end subroutine +END MODULE TEST4 + +MODULE TEST3 + CHARACTER(LEN=80) :: TESTCHAR + COMMON /TESTCOMMON1/ TESTCHAR +END MODULE TEST3 + +MODULE TEST2 + use TEST4 + USE TEST3, chr => testchar + PRIVATE + CHARACTER(LEN=80) :: TESTCHAR + COMMON /TESTCOMMON1/ TESTCHAR + PUBLIC TESTCHAR, FOO, BAR, CHR, T1, T2, FOOBAR +contains + subroutine FOO + TESTCHAR = T1 + end subroutine + subroutine BAR (CHECK) + CHARACTER(LEN=80) :: CHECK + IF (TESTCHAR .NE. CHECK) CALL ABORT + IF (CHR .NE. CHECK) CALL ABORT + end subroutine +END MODULE TEST2 + +PROGRAM TEST1 + USE TEST2 + call FOO + call BAR (T1) + TESTCHAR = T2 + call BAR (T2) + CALL FOOBAR (T2) +END PROGRAM TEST1 +! { dg-final { cleanup-modules "TEST2 TEST3 TEST4" } } diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_5.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_5.f90 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_5.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_5.f90 2009-01-29 09:43:14.166860000 -0800 @@ -0,0 +1,17 @@ +! { dg-do run } + +! PR fortran/38887 +! This aborted at runtime for the runtime zero-sized array arguments. + +! Contributed by Dick Hendrickson + +program try_ya0013 + integer ida(9) + call ya0013(ida,1,5,6) +end program + +SUBROUTINE YA0013(IDA,nf1,nf5,nf6) + INTEGER IDA(9) + IDA = 1 + CALL MVBITS(IDA(NF5:NF1), 0, 1, IDA(NF6:NF1),2) +END SUBROUTINE diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_6.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_6.f90 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_6.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_6.f90 2009-01-29 09:43:14.166860000 -0800 @@ -0,0 +1,33 @@ +! { dg-do compile } + +! PR fortran/38883 +! This ICE'd because the temporary-creation in the MVBITS call was wrong. +! This is the original test from the PR, the complicated version. + +! Contributed by Dick Hendrickson + + module yg0009_stuff + + type unseq + integer I + end type + + contains + + SUBROUTINE YG0009(TDA2L,NF4,NF3,NF1,MF1,MF4,MF3) + TYPE(UNSEQ) TDA2L(NF4,NF3) + + CALL MVBITS (TDA2L(NF4:NF1:MF1,NF1:NF3)%I,2, & + 4, TDA2L(-MF4:-MF1:-NF1,-MF1:-MF3)%I, 3) + + END SUBROUTINE + + end module yg0009_stuff + + program try_yg0009 + use yg0009_stuff + type(unseq) tda2l(4,3) + + call yg0009(tda2l,4,3,1,-1,-4,-3) + + end diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_7.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_7.f90 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_7.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_7.f90 2009-01-29 09:43:14.166860000 -0800 @@ -0,0 +1,30 @@ +! { dg-do run } + +! PR fortran/38883 +! This ICE'd because the temporary-creation in the MVBITS call was wrong. + +! Contributed by Paul Richard Thomas + + type t + integer :: I + character(9) :: chr + end type + type(t) :: x(4,3) + type(t) :: y(4,3) + x = reshape ([((t (i*j, "a"),i = 1,4), j=1,3)], [4,3]) + call foo (x) + y = reshape ([((t (i*j*2, "a"),i = 1,4), j=1,3)], [4,3]) + call bar(y, 4, 3, 1, -1, -4, -3) + if (any (x%i .ne. y%i)) call abort +contains + SUBROUTINE foo (x) + TYPE(t) x(4, 3) ! No dependency at all + CALL MVBITS (x%i, 0, 6, x%i, 8) + x%i = x%i * 2 + END SUBROUTINE + SUBROUTINE bar (x, NF4, NF3, NF1, MF1, MF4, MF3) + TYPE(t) x(NF4, NF3) ! Dependency through variable indices + CALL MVBITS (x(NF4:NF1:MF1, NF1:NF3)%i, 1, & + 6, x(-MF4:-MF1:-NF1, -MF1:-MF3)%i, 9) + END SUBROUTINE +end diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_8.f90 gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_8.f90 --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/mvbits_8.f90 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/mvbits_8.f90 2009-01-29 09:43:14.166860000 -0800 @@ -0,0 +1,36 @@ +! { dg-do run } + +! PR fortran/38883 +! This ICE'd because the temporary-creation in the MVBITS call was wrong. + +PROGRAM main + IMPLICIT NONE + + TYPE inner + INTEGER :: i + INTEGER :: j + END TYPE inner + + TYPE outer + TYPE(inner) :: comp(2) + END TYPE outer + + TYPE(outer) :: var + + var%comp%i = (/ 1, 2 /) + var%comp%j = (/ 3, 4 /) + + CALL foobar (var, 1, 2) + + IF (ANY (var%comp%i /= (/ 1, 2 /))) CALL abort () + IF (ANY (var%comp%j /= (/ 3, 4 /))) CALL abort () + +CONTAINS + + SUBROUTINE foobar (x, lower, upper) + TYPE(outer), INTENT(INOUT) :: x + INTEGER, INTENT(IN) :: lower, upper + CALL MVBITS (x%comp%i, 1, 2, x%comp(lower:upper)%i, 1) + END SUBROUTINE foobar + +END PROGRAM main diff -Naur gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/pr38868.f gcc-4.3.3/gcc/testsuite/gfortran.dg/pr38868.f --- gcc-4.3.3.orig/gcc/testsuite/gfortran.dg/pr38868.f 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/gcc/testsuite/gfortran.dg/pr38868.f 2009-01-24 07:26:14.936448000 -0800 @@ -0,0 +1,17 @@ +! { dg-do compile } +! { dg-options "-O2 -fdump-rtl-expand" } + PROGRAM testcase + IMPLICIT NONE + + CHARACTER*4 ANER(18) + CHARACTER*80 LINE + aner = '' + ANER(1)='A ' + ANER(2)=' ' + LINE=' ' + LINE(78:80)='xyz' + WRITE(*,'(A82)') "'"//LINE//"'" + END + +! { dg-final { scan-rtl-dump-times "line\\\+80" 0 "expand" } } +! { dg-final { cleanup-rtl-dump "expand" } } */ diff -Naur gcc-4.3.3.orig/gcc/testsuite/g++.old-deja/g++.jason/thunk2.C gcc-4.3.3/gcc/testsuite/g++.old-deja/g++.jason/thunk2.C --- gcc-4.3.3.orig/gcc/testsuite/g++.old-deja/g++.jason/thunk2.C 2005-10-22 13:57:01.000000000 -0700 +++ gcc-4.3.3/gcc/testsuite/g++.old-deja/g++.jason/thunk2.C 2009-03-11 10:53:13.287573000 -0700 @@ -1,6 +1,7 @@ // { dg-do run { target fpic } } // { dg-options "-fPIC" } // { dg-bogus "\[Uu\]nresolved symbol .(_GLOBAL_OFFSET_TABLE_|\[_.A-Za-z\]\[_.0-9A-Za-z\]*@(PLT|GOT|GOTOFF))|\[Bb\]ad fixup at .DATA.:" "PIC unsupported" { xfail *-*-netware* } 0 } +// { dg-skip-if "requires unsupported run-time relocation" { spu-*-* } { "*" } { "" } } // Test that non-variadic function calls using thunks and PIC work right. struct A { diff -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 --- gcc-4.3.3.orig/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp 2007-08-01 09:25:11.000000000 -0700 +++ gcc-4.3.3/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp 2009-01-26 10:13:58.227740000 -0800 @@ -37,8 +37,20 @@ set generator_src "$generator_src $srcdir/$subdir/generate-random.c" set generator_src "$generator_src $srcdir/$subdir/generate-random_r.c" set generator_cmd "-o $generator $generator_src" +# Temporarily unset GCC_EXEC_PREFIX from environment, as that might +# confuse the $HOSTCC. +set orig_gcc_exec_prefix_saved 0 +if [info exists env(GCC_EXEC_PREFIX)] { + set orig_gcc_exec_prefix "$env(GCC_EXEC_PREFIX)" + set orig_gcc_exec_prefix_saved 1 + unsetenv GCC_EXEC_PREFIX +} set status [remote_exec host "$HOSTCC $HOSTCFLAGS $generator_cmd"] set status [lindex $status 0] +if { $orig_gcc_exec_prefix_saved } { + set orig_gcc_exec_prefix_saved 0 + setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix" +} if { $status == 0 } then { file delete -force $tstobjdir file mkdir $tstobjdir diff -Naur gcc-4.3.3.orig/gcc/tree.h gcc-4.3.3/gcc/tree.h --- gcc-4.3.3.orig/gcc/tree.h 2008-02-08 11:10:25.000000000 -0800 +++ gcc-4.3.3/gcc/tree.h 2009-01-26 07:54:18.800086000 -0800 @@ -4753,6 +4753,7 @@ extern tree fold (tree); extern tree fold_unary (enum tree_code, tree, tree); +extern tree fold_unary_ignore_overflow (enum tree_code, tree, tree); extern tree fold_binary (enum tree_code, tree, tree, tree); extern tree fold_ternary (enum tree_code, tree, tree, tree, tree); extern tree fold_build1_stat (enum tree_code, tree, tree MEM_STAT_DECL); diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-ccp.c gcc-4.3.3/gcc/tree-ssa-ccp.c --- gcc-4.3.3.orig/gcc/tree-ssa-ccp.c 2008-05-11 11:54:15.000000000 -0700 +++ gcc-4.3.3/gcc/tree-ssa-ccp.c 2009-01-26 07:54:18.800086000 -0800 @@ -938,7 +938,7 @@ if ((code == NOP_EXPR || code == CONVERT_EXPR) && useless_type_conversion_p (TREE_TYPE (rhs), TREE_TYPE (op0))) return op0; - return fold_unary (code, TREE_TYPE (rhs), op0); + return fold_unary_ignore_overflow (code, TREE_TYPE (rhs), op0); } /* Binary and comparison operators. We know one or both of the diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-forwprop.c gcc-4.3.3/gcc/tree-ssa-forwprop.c --- gcc-4.3.3.orig/gcc/tree-ssa-forwprop.c 2008-03-14 09:34:11.000000000 -0700 +++ gcc-4.3.3/gcc/tree-ssa-forwprop.c 2009-02-28 10:33:27.113860000 -0800 @@ -487,28 +487,36 @@ forward_propagate_addr_into_variable_array_index (tree offset, tree def_rhs, tree use_stmt) { - tree index; + tree index, offset_def; - /* Try to find an expression for a proper index. This is either - a multiplication expression by the element size or just the - ssa name we came along in case the element size is one. */ + /* Get the offset's defining statement. */ + offset_def = SSA_NAME_DEF_STMT (offset); + + /* Try to find an expression for a proper index. This is either a + multiplication expression by the element size or just the ssa name we came + along in case the element size is one. In that case, however, we do not + allow multiplications because they can be computing index to a higher + level dimension (PR 37861). */ if (integer_onep (TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (def_rhs))))) - index = offset; - else { - /* Get the offset's defining statement. */ - offset = SSA_NAME_DEF_STMT (offset); + if (TREE_CODE (offset_def) == GIMPLE_MODIFY_STMT + && TREE_CODE (GIMPLE_STMT_OPERAND (offset_def, 1)) == MULT_EXPR) + return false; + index = offset; + } + else + { /* The statement which defines OFFSET before type conversion must be a simple GIMPLE_MODIFY_STMT. */ - if (TREE_CODE (offset) != GIMPLE_MODIFY_STMT) + if (TREE_CODE (offset_def) != GIMPLE_MODIFY_STMT) return false; /* The RHS of the statement which defines OFFSET must be a multiplication of an object by the size of the array elements. This implicitly verifies that the size of the array elements is constant. */ - offset = GIMPLE_STMT_OPERAND (offset, 1); + offset = GIMPLE_STMT_OPERAND (offset_def, 1); if (TREE_CODE (offset) != MULT_EXPR || TREE_CODE (TREE_OPERAND (offset, 1)) != INTEGER_CST || !simple_cst_equal (TREE_OPERAND (offset, 1), @@ -677,6 +685,7 @@ array elements, then the result is converted into the proper type for the arithmetic. */ if (TREE_CODE (TREE_OPERAND (rhs, 1)) == SSA_NAME + && useless_type_conversion_p (TREE_TYPE (name), TREE_TYPE (def_rhs)) /* Avoid problems with IVopts creating PLUS_EXPRs with a different type than their operands. */ && useless_type_conversion_p (TREE_TYPE (rhs), TREE_TYPE (name))) diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-sccvn.c gcc-4.3.3/gcc/tree-ssa-sccvn.c --- gcc-4.3.3.orig/gcc/tree-ssa-sccvn.c 2008-07-11 13:55:45.000000000 -0700 +++ gcc-4.3.3/gcc/tree-ssa-sccvn.c 2009-01-26 07:54:18.800086000 -0800 @@ -1507,7 +1507,7 @@ if (op0 == TREE_OPERAND (rhs, 0)) return rhs; - result = fold_unary (TREE_CODE (rhs), TREE_TYPE (rhs), op0); + result = fold_unary_ignore_overflow (TREE_CODE (rhs), TREE_TYPE (rhs), op0); if (result) { STRIP_USELESS_TYPE_CONVERSION (result); diff -Naur gcc-4.3.3.orig/gcc/tree-ssa-structalias.c gcc-4.3.3/gcc/tree-ssa-structalias.c --- gcc-4.3.3.orig/gcc/tree-ssa-structalias.c 2009-01-07 05:12:17.000000000 -0800 +++ gcc-4.3.3/gcc/tree-ssa-structalias.c 2009-02-05 03:10:02.086542000 -0800 @@ -1509,24 +1509,23 @@ varinfo_t v; unsigned int t; unsigned HOST_WIDE_INT fieldoffset = get_varinfo (j)->offset + loff; - bitmap tmp; v = first_vi_for_offset (get_varinfo (j), fieldoffset); /* If the access is outside of the variable we can ignore it. */ if (!v) continue; t = find (v->id); - tmp = get_varinfo (t)->solution; - - if (set_union_with_increment (tmp, sol, 0)) + if (add_graph_edge (graph, t, rhs)) { - get_varinfo (t)->solution = tmp; - if (t == rhs) - sol = get_varinfo (rhs)->solution; - if (!TEST_BIT (changed, t)) + if (bitmap_ior_into (get_varinfo (t)->solution, sol)) { - SET_BIT (changed, t); - changed_count++; + if (t == rhs) + sol = get_varinfo (rhs)->solution; + if (!TEST_BIT (changed, t)) + { + SET_BIT (changed, t); + changed_count++; + } } } } diff -Naur gcc-4.3.3.orig/gcc/version.c gcc-4.3.3/gcc/version.c --- gcc-4.3.3.orig/gcc/version.c 2007-08-21 08:35:30.000000000 -0700 +++ gcc-4.3.3/gcc/version.c 2009-03-23 00:37:55.451673138 -0700 @@ -14,4 +14,4 @@ Makefile. */ const char version_string[] = BASEVER DATESTAMP DEVPHASE REVISION; -const char pkgversion_string[] = PKGVERSION; +const char pkgversion_string[] = "(GCC for Cross-LFS 4.3.3.20090323) "; diff -Naur gcc-4.3.3.orig/libjava/ChangeLog gcc-4.3.3/libjava/ChangeLog --- gcc-4.3.3.orig/libjava/ChangeLog 2009-01-24 02:18:16.000000000 -0800 +++ gcc-4.3.3/libjava/ChangeLog 2009-03-13 11:19:59.111425000 -0700 @@ -1,3 +1,8 @@ +2009-03-13 Andrew Haley + + * java/lang/natClassLoader.cc (_Jv_RegisterClassHookDefault): Clear + INTERPRETED access modifier. + 2009-01-24 Release Manager * GCC 4.3.3 released. diff -Naur gcc-4.3.3.orig/libjava/classpath/ChangeLog.gcj gcc-4.3.3/libjava/classpath/ChangeLog.gcj --- gcc-4.3.3.orig/libjava/classpath/ChangeLog.gcj 2008-09-14 11:27:33.000000000 -0700 +++ gcc-4.3.3/libjava/classpath/ChangeLog.gcj 2009-03-16 05:11:32.360447000 -0700 @@ -1,3 +1,8 @@ +2009-03-16 Matthias Klose + + * configure.ac: Detect xulrunner-1.9. + * configure: Regenerate. + 2008-09-14 Matthias Klose Merge from classpath: diff -Naur gcc-4.3.3.orig/libjava/classpath/configure gcc-4.3.3/libjava/classpath/configure --- gcc-4.3.3.orig/libjava/classpath/configure 2008-02-29 15:47:54.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/configure 2009-03-16 05:11:32.360447000 -0700 @@ -22904,6 +22904,103 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for mozilla-plugin libxul-unstable" >&5 +echo $ECHO_N "checking for mozilla-plugin libxul-unstable... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "mozilla-plugin libxul-unstable" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5 +echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6 + MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin libxul-unstable"` + echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5 +echo "${ECHO_T}$MOZILLA_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5 +echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6 + MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin libxul-unstable"` + echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5 +echo "${ECHO_T}$MOZILLA_LIBS" >&6 + else + MOZILLA_CFLAGS="" + MOZILLA_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin libxul-unstable"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + MOZILLA_FOUND=yes + else + MOZILLA_FOUND=no + fi + + if test "x${MOZILLA_FOUND}" = xno; then + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo "$as_me:$LINENO: checking for mozilla-plugin" >&5 echo $ECHO_N "checking for mozilla-plugin... $ECHO_C" >&6 @@ -22946,6 +23043,7 @@ MOZILLA_FOUND=no fi + fi if test "x${MOZILLA_FOUND}" = xno; then succeeded=no diff -Naur gcc-4.3.3.orig/libjava/classpath/configure.ac gcc-4.3.3/libjava/classpath/configure.ac --- gcc-4.3.3.orig/libjava/classpath/configure.ac 2007-09-05 00:45:09.000000000 -0700 +++ gcc-4.3.3/libjava/classpath/configure.ac 2009-03-16 05:11:32.360447000 -0700 @@ -702,7 +702,10 @@ dnl Check for plugin support headers and libraries. if test "x${COMPILE_PLUGIN}" = xyes; then - PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + if test "x${MOZILLA_FOUND}" = xno; then + PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + fi if test "x${MOZILLA_FOUND}" = xno; then PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) fi diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/cp-tools.info gcc-4.3.3/libjava/classpath/doc/cp-tools.info --- gcc-4.3.3.orig/libjava/classpath/doc/cp-tools.info 2009-01-24 04:05:54.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/cp-tools.info 1969-12-31 16:00:00.000000000 -0800 @@ -1,1852 +0,0 @@ -This is cp-tools.info, produced by makeinfo version 4.12 from -/abuild/rguenther/tmp/gcc-4.3.3/gcc-4.3.3/libjava/classpath/doc/cp-tools.texinfo. - -This file documents the Tools included in a standard distribution of -the GNU Classpath project deliverables. - - Copyright (C) 2006, 2007 Free Software Foundation, Inc. - -INFO-DIR-SECTION GNU Libraries -START-INFO-DIR-ENTRY -* Classpath Tools: (cp-tools). GNU Classpath Tools Guide -END-INFO-DIR-ENTRY - - -File: cp-tools.info, Node: Top, Next: Applet Tools, Prev: (dir), Up: (dir) - -GNU Classpath Tools Guide -************************* - -This document contains important information you need to know in order -to use the tools included in the GNU Classpath project deliverables. - - The Tools aim at providing a free replacement, similar in their -behavior, to their counter-parts found in the Reference Implementation -(RI) of the Java Software Development Kit (SDK). - -* Menu: - -* Applet Tools:: Work with applets -* Security Tools:: Work securely with Java applications -* Other Tools:: Other tools in classpath -* I18N Issues:: How to add support for non-English languages - - --- The Detailed Node Listing --- - -Applet Tools - -* appletviewer Tool:: Load applets -* gcjwebplugin:: Load applets in a web browser - -Security Tools - -* jarsigner Tool:: Sign and verify .JAR files -* keytool Tool:: Manage private keys and public certificates - -jarsigner Tool - -* Common jarsigner Options:: Options used when signing or verifying a file -* Signing Options:: Options only used when signing a .JAR file -* Verification Options:: Options only used when verifying a .JAR file - -keytool Tool - -* Getting Help:: How to get help with keytool commands -* Common keytool Options:: Options used in more than one command -* Distinguished Names:: X.500 Distinguished Names used in certificates -* Add/Update Commands:: Commands for adding data to a Key Store -* Export Commands:: Commands for exporting data from a Key Store -* Display Commands:: Commands for displaying data in a Key Store -* Management Commands:: Commands for managing a Key Store - -Add/Update Commands - -* Command -genkey:: Generate private key and self-signed certificate -* Command -import:: Import certificates and certificate replies -* Command -selfcert:: Generate self-signed certificate -* Command -cacert:: Import a CA Trusted Certificate -* Command -identitydb:: Import JDK-1 style identities - -Export Commands - -* Command -certreq:: Generate Certificate Signing Requests (CSR) -* Command -export:: Export a certificate in a Key Store - -Display Commands - -* Command -list:: Display information about one or all Aliases -* Command -printcert:: Print a certificate or a certificate fingerprint - -Management Commands - -* Command -keyclone:: Clone a Key Entry in a Key Store -* Command -storepasswd:: Change the password protecting a Key Store -* Command -keypasswd:: Change the password protecting a Key Entry -* Command -delete:: Remove an entry in a Key Store - -Other Tools - -* jar Tool:: Archive tool for Java archives -* javah Tool:: A java header compiler -* gcjh Tool:: A java header compiler (old version) -* native2ascii Tool:: An encoding converter -* orbd Tool:: An object request broker daemon -* serialver Tool:: A serial version command -* rmid Tool:: RMI activation daemon -* rmiregistry Tool:: Remote object registry -* tnameserv Tool:: Naming service - -I18N Issues - -* Language Resources:: Where resources are located -* Message Formats:: How messages are internationalized - - -File: cp-tools.info, Node: Applet Tools, Next: Security Tools, Prev: Top, Up: Top - -1 Applet Tools -************** - -Two Applet Tools are available with GNU Classpath: appletviewer and -gcjwebplugin. - - To avoid conflicts with other implementations, the appletviewer -executable is called "gappletviewer". - -* Menu: - -* appletviewer Tool:: Load applets -* gcjwebplugin:: Load applets in a web browser - - If while using these tools you think you found a bug, then please -report it at classpath-bugs -(http://www.gnu.org/software/classpath/bugs.html). - - -File: cp-tools.info, Node: appletviewer Tool, Next: gcjwebplugin, Prev: Applet Tools, Up: Applet Tools - -1.1 The `appletviewer' Tool -=========================== - -SYNOPSIS - - appletviewer [OPTION]... URL... -appletviewer [OPTION]... `-code' CODE -appletviewer [OPTION]... `-plugin' INPUT,OUTPUT - - DESCRIPTION The `appletviewer' tool loads and runs an applet. - - Use the first form to test applets specified by tag. The URL should -resolve to an HTML document from which the `appletviewer' will extract -applet tags. The APPLET, EMBED and OBJECT tags are supported. If a -given document contains multiple applet tags, all the applets will be -loaded, with each applet appearing in its own window. Likewise, when -multiple URLs are specified, each applet tag instance is given its own -window. If a given document contains no recognized tags the -`appletviewer' does nothing. - - appletviewer http://www.gnu.org/software/classpath/ - - Use the second form to test an applet in development. This form -allows applet tag attributes to be supplied on the command line. Only -one applet may be specified using the `-code' option. The `-code' -option overrides the URL form - any URLs specified will be ignored. - - appletviewer -code Test.class -param datafile,data.txt - - `gcjwebplugin' uses the third form to communicate with the -`appletviewer' through named pipes. - - URL OPTIONS -`-debug' - This option is not yet implemented but is provided for - compatibility. - -`-encoding CHARSET' - Use this option to specify an alternate character encoding for the - specified HTML page. - - - APPLET TAG OPTIONS -`-code CODE' - Use the `-code' option to specify the value of the applet tag CODE - attribute. - -`-codebase CODEBASE' - Use the `-codebase' option to specify the value of the applet tag - CODEBASE attribute. - -`-archive ARCHIVE' - Use the `-archive' option to specify the value of the applet tag - ARCHIVE attribute. - -`-width WIDTH' - Use the `-width' option to specify the value of the applet tag - WIDTH attribute. - -`-height HEIGHT' - Use the `-height' option to specify the value of the applet tag - HEIGHT attribute. - -`-param NAME,VALUE' - Use the `-param' option to specify values for the NAME and VALUE - attributes of an applet PARAM tag. - - - PLUGIN OPTION -`-plugin INPUT,OUTPUT' - `gcjwebplugin' uses the `-plugin' option to specify the named pipe - the `appletviewer' should use for receiving commands (INPUT) and - the one it should use for sending commands to `gcjwebplugin' - (OUTPUT). - - - DEBUGGING OPTION -`-verbose' - Use the `-verbose' option to have the `appletviewer' print - debugging messages. - - - STANDARD OPTIONS - -`-help' - Use the `-help' option to have the `appletviewer' print a usage - message, then exit. - -`-version' - Use the `-version' option to have the `appletviewer' print its - version, then exit. - -`-JOPTION' - Use the `-J' option to pass OPTION to the virtual machine that - will run the `appletviewer'. Unlike other options, there must not - be a space between the `-J' and OPTION. - - - -File: cp-tools.info, Node: gcjwebplugin, Prev: appletviewer Tool, Up: Applet Tools - -1.2 The `gcjwebplugin' Tool -=========================== - -`gcjwebplugin' is a plugin that adds applet support to web browsers. -Currently `gcjwebplugin' only supports Mozilla-based browsers (e.g., -Firefox, Galeon, Mozilla). - - -File: cp-tools.info, Node: Security Tools, Next: Other Tools, Prev: Applet Tools, Up: Top - -2 Security Tools -**************** - -Two Security Tools are available with GNU Classpath: `jarsigner' and -`keytool'. - - To avoid conflicts with other implementations, the jarsigner -executable is called `gjarsigner' and the keytool executable is called -`gkeytool'. - -* Menu: - -* jarsigner Tool:: Sign and verify .JAR files -* keytool Tool:: Manage private keys and public certificates - - If while using these tools you think you found a bug, then please -report it at classpath-bugs -(http://www.gnu.org/software/classpath/bugs.html). - - -File: cp-tools.info, Node: jarsigner Tool, Next: keytool Tool, Prev: Security Tools, Up: Security Tools - -2.1 The `jarsigner' Tool -======================== - -The `jarsigner' tool is invoked from the command line, in one of two -forms, as follows: - - jarsigner [OPTION]... FILE ALIAS - - jarsigner `-verify' [OPTION]... FILE - - When the first form is used, the tool signs the designated JAR file. -The second form, on the other hand, is used to verify a previously -signed JAR file. - - FILE 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. - - ALIAS must be a known Alias of a Key Entry in the designated Key -Store. The private key material associated with this Alias is then used -for signing the designated .JAR file. - -* Menu: - -* Common jarsigner Options:: Options used when signing or verifying a file -* Signing Options:: Options only used when signing a .JAR file -* Verification Options:: Options only used when verifying a .JAR file - - -File: cp-tools.info, Node: Common jarsigner Options, Next: Signing Options, Prev: jarsigner Tool, Up: jarsigner Tool - -2.1.1 Common options --------------------- - -The following options may be used when the tool is used for either -signing, or verifying, a .JAR file. - -`-verbose' - Use this option to force the tool to generate more verbose - messages, during its processing. - -`-internalsf' - When present, the tool will include -which otherwise it does not- - the `.SF' file in the `.DSA' generated file. - -`-sectionsonly' - When present, the tool will include in the `.SF' 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. - -`-provider PROVIDER_CLASS_NAME' - A fully qualified class name of a Security Provider to add to the - current list of Security Providers already installed in the JVM - 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 Security - Provider before exiting. - -`-help' - Prints a help text similar to this one. - - - -File: cp-tools.info, Node: Signing Options, Next: Verification Options, Prev: Common jarsigner Options, Up: jarsigner Tool - -2.1.2 Signing options ---------------------- - -The following options may be specified when using the tool for signing -purposes. - -`-keystore URL' - Use this option to specify the location of the key store to use. - The default value is a file URL referencing the file named - `.keystore' located in the path returned by the call to - `java.lang.System#getProperty(String)' using `user.home' as - argument. - - If a URL was specified, but was found to be malformed -e.g. - missing protocol element- the tool will attempt to use the URL - value as a file-name (with absolute or relative path-name) of a - key store -as if the protocol was `file:'. - -`-storetype STORE_TYPE' - 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 - `keystore.type' in the security properties file, which is obtained - by invoking the static method call `getDefaultType()' in - `java.security.KeyStore'. - -`-storepass PASSWORD' - 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. - -`-keypass PASSWORD' - Use this option to specify the password which the tool will use to - unlock the Key Entry associated with the designated Alias. - - If this option is omitted, the tool will first attempt to unlock - the Key Entry using the same password protecting the key store. If - this fails, you will then be prompted to provide a password. - -`-sigfile NAME' - Use this option to designate a literal that will be used to - construct file names for both the `.SF' and `.DSA' signature - files. These files will be generated, by the tool, and placed in - the `META-INF' directory of the signed JAR. Permissible - characters for NAME must be in the range "a-zA-Z0-9_-". All - characters will be converted to upper-case ones. - - If this option is missing, the first eight characters of the ALIAS - argument will be used. When this is the case, any character in - ALIAS that is outside the permissible range of characters will be - replaced by an underscore. - -`-signedjar FILE' - Use this option to specify the file name of the signed JAR. If - this option is omitted, then the signed JAR will be named the same - as FILE; i.e. the input JAR file will be replaced with the signed - copy. - - - -File: cp-tools.info, Node: Verification Options, Prev: Signing Options, Up: jarsigner Tool - -2.1.3 Verification options --------------------------- - -The following options may be specified when using the tool for -verification purposes. - -`-verify' - Use this option to indicate that the tool is to be used for - verification purposes. - -`-certs' - This option is used in conjunction with the `-verbose' option. - When present, along with the `-verbose' option, the tool will - print more detailed information about the certificates of the - signer(s) being processed. - - - -File: cp-tools.info, Node: keytool Tool, Prev: jarsigner Tool, Up: Security Tools - -2.2 The `keytool' Tool -====================== - -Cryptographic credentials, in a Java environment, are usually stored in -a Key Store. The Java SDK specifies a Key Store as a persistent -container of two types of objects: Key Entries and Trusted -Certificates. The security tool `keytool' is a Java-based application -for managing those types of objects. - - A Key Entry 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. - - A Trusted Certificate is a signed X.509 certificate issued by a -trusted entity. The Trust in this context is relative to the User of -the `keytool'. In other words, the existence of a Trusted Certificate -in the Key Store processed by a `keytool' command implies that the User -trusts the Issuer of that Trusted Certificate to also sign, and hence -authenticates, other Subjects the tool may process. - - Trusted Certificates are important because they allow the tool to -mechanically construct Chains of Trust starting from one of the Trusted -Certificates in a Key Store and ending with a certificate whose Issuer -is potentially unknown. A valid chain is an ordered list, starting with -a Trusted Certificate (also called the anchor), ending with the target -certificate, and satisfying the condition that the Subject of -certificate `#i' is the Issuer of certificate `#i + 1'. - - The `keytool' is invoked from the command line as follows: - - keytool [COMMAND] ... - - Multiple COMMANDs may be specified at once, each complete with its -own options. `keytool' will parse all the arguments, before processing, -and executing, each `COMMAND'. If an exception occurs while executing -one COMMAND `keytool' 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 - - keytool -list -- -printcert -alias mykey - - Here is a summary of the commands supported by the tool: - - 1. Add/Update commands - `-genkey [OPTION]...' - Generate a new Key Entry, eventually creating a new key store. - - `-import [OPTION]...' - Add, to a key store, Key Entries (private keys and - certificate chains authenticating the public keys) and - Trusted Certificates (3rd party certificates which can be - used as Trust Anchors when building chains-of-trust). - - `-selfcert [OPTION]...' - Generate a new self-signed Trusted Certificate. - - `-cacert [OPTION]...' - Import a CA Trusted Certificate. - - `-identitydb [OPTION]...' - NOT IMPLEMENTED YET. - Import a JDK 1.1 style Identity Database. - - 2. Export commands - `-certreq [OPTION]...' - Issue a Certificate Signing Request (CSR) which can be then - sent to a Certification Authority (CA) to issue a certificate - signed (by the CA) and authenticating the Subject of the - request. - - `-export [OPTION]...' - Export a certificate from a key store. - - 3. Display commands - `-list [OPTION]...' - Print one or all certificates in a key store to `STDOUT'. - - `-printcert [OPTION]...' - Print a human-readable form of a certificate, in a designated - file, to `STDOUT'. - - 4. Management commands - `-keyclone [OPTION]...' - Clone a Key Entry in a key store. - - `-storepasswd [OPTION]...' - Change the password protecting a key store. - - `-keypasswd [OPTION]...' - Change the password protecting a Key Entry in a key store. - - `-delete [OPTION]...' - Delete a Key Entry or a Trusted Certificate from a key store. - -* Menu: - -* Getting Help:: How to get help with keytool commands -* Common keytool Options:: Options used in more than one command -* Distinguished Names:: X.500 Distinguished Names used in certificates -* Add/Update Commands:: Commands for adding data to a Key Store -* Export Commands:: Commands for exporting data from a Key Store -* Display Commands:: Commands for displaying data in a Key Store -* Management Commands:: Commands for managing a Key Store - - -File: cp-tools.info, Node: Getting Help, Next: Common keytool Options, Prev: keytool Tool, Up: keytool Tool - -2.2.1 Getting help ------------------- - -To get a general help text about the tool, use the `-help' option; e.g. - - `keytool -help' - - To get more specific help text about one of the tool's command use -the `-help' option for that command; e.g. - - `keytool -genkey -help' - - In both instances, the tool will print a help text and then will -exit the running JVM. - - It is worth noting here that the help messages printed by the tool -are I18N-ready. This means that if/when the contents of the tool's -Message Bundle properties file are available in languages other than -English, you may see those messages in that language. - - -File: cp-tools.info, Node: Common keytool Options, Next: Distinguished Names, Prev: Getting Help, Up: keytool Tool - -2.2.2 Common options --------------------- - -The following `OPTION's are used in more than one `COMMAND'. They are -described here to reduce redundancy. - -`-alias ALIAS' - Every entry, be it a Key Entry or a Trusted Certificate, in a key - store is uniquely identified by a user-defined ALIAS string. Use - this option to specify the ALIAS to use when referring to an entry - in the key store. Unless specified otherwise, a default value of - `mykey' shall be used when this option is omitted from the command - line. - -`-keyalg ALGORITHM' - Use this option to specify the canonical name of the key-pair - generation algorithm. The default value for this option is `DSS' - (a synonym for the Digital Signature Algorithm also known as DSA). - -`-keysize SIZE' - 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 `1024' will be used if - this option is omitted from the command line. - -`-validity DAY_COUNT' - Use this option to specify the number of days a newly generated - certificate will be valid for. The default value is `90' (days) if - this option is omitted from the command line. - -`-storetype STORE_TYPE' - 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 - `keystore.type' in the security properties file, which is obtained - by invoking the static method call `getDefaultType()' in - `java.security.KeyStore'. - -`-storepass PASSWORD' - 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. - -`-keystore URL' - Use this option to specify the location of the key store to use. - The default value is a file URL referencing the file named - `.keystore' located in the path returned by the call to - `java.lang.System#getProperty(String)' using `user.home' as - argument. - - If a URL was specified, but was found to be malformed -e.g. - missing protocol element- the tool will attempt to use the URL - value as a file-name (with absolute or relative path-name) of a - key store -as if the protocol was `file:'. - -`-provider PROVIDER_CLASS_NAME' - A fully qualified class name of a Security Provider to add to the - current list of Security Providers already installed in the JVM - 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 Security - Provider before exiting. - -`-file FILE' - 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, `STDIN' will be used - instead, as the source of input, and `STDOUT' will be used instead - as the output destination. - -`-v' - Unless specified otherwise, use this option to enable more verbose - output. - - - -File: cp-tools.info, Node: Distinguished Names, Next: Add/Update Commands, Prev: Common keytool Options, Up: keytool Tool - -2.2.3 X.500 Distinguished Names -------------------------------- - -A Distinguished Name (or DN) MUST be supplied with some of the -`COMMAND's using a `-dname' option. The syntax of a valid value for -this option MUST follow RFC-2253 specifications. Namely the following -components (with their accepted meaning) will be recognized. Note that -the component name is case-insensitive: - -CN - The Common Name; e.g. `host.domain.com' - -OU - The Organizational Unit; e.g. `IT Department' - -O - The Organization Name; e.g. `The Sample Company' - -L - The Locality Name; e.g. `Sydney' - -ST - The State Name; e.g. `New South Wales' - -C - The 2-letter Country identifier; e.g. `AU' - - When specified with a `-dname' option, each pair of component/value -will be separated from the other with a comma. Each component and value -pair MUST be separated by an equal sign. For example, the following is -a valid DN value: -CN=host.domain.com, O=The Sample Company, L=Sydney, ST=NSW, C=AU - -If the Distinguished Name is required, and no valid default value can -be used, the tool will prompt you to enter the information through the -console. - - -File: cp-tools.info, Node: Add/Update Commands, Next: Export Commands, Prev: Distinguished Names, Up: keytool Tool - -2.2.4 Add/Update commands -------------------------- - -* Menu: - -* Command -genkey:: Generate private key and self-signed certificate -* Command -import:: Import certificates and certificate replies -* Command -selfcert:: Generate self-signed certificate -* Command -cacert:: Import a CA Trusted Certificate -* Command -identitydb:: Import JDK-1 style identities - - -File: cp-tools.info, Node: Command -genkey, Next: Command -import, Prev: Add/Update Commands, Up: Add/Update Commands - -2.2.4.1 The `-genkey' command -............................. - -Use this command to generate a new key-pair (both private and public -keys), and save these credentials in the key store as a Key Entry, -associated with the designated (if was specified with the `-alias' -option) or default (if the `-alias' option is omitted) Alias. - - The private key material will be protected with a user-defined -password (see `-keypass' 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. - -`-alias ALIAS' - For more details *note ALIAS: alias. - -`-keyalg ALGORITHM' - For more details *note ALGORITHM: keyalg. - -`-keysize KEY_SIZE' - For more details *note KEY_SIZE: keysize. - -`-sigalg ALGORITHM' - 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 `DSA', the value for the - signature algorithm will be `SHA1withDSA'. If on the other hand - the key-pair generation algorithm is `RSA', then the tool will use - `MD5withRSA' as the signature algorithm. - -`-dname NAME' - This a mandatory value for the command. If no value is specified - -i.e. the `-dname' option is omitted- the tool will prompt you to - enter a Distinguished Name to use as both the Owner and Issuer of - the generated self-signed certificate. - - For more details *note X.500 DISTINGUISHED NAME: dn. - -`-keypass PASSWORD' - Use this option to specify the password which the tool will use to - protect the newly created Key Entry. - - If this option is omitted, you will be prompted to provide a - password. - -`-validity DAY_COUNT' - For more details *note DAY_COUNT: validity. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Command -import, Next: Command -selfcert, Prev: Command -genkey, Up: Add/Update Commands - -2.2.4.2 The `-import' command -............................. - -Use this command to read an X.509 certificate, or a PKCS#7 Certificate -Reply from a designated input source and incorporate the certificates -into the key store. - - If the Alias does not already exist in the key store, the tool -treats the certificate read from the input source as a new Trusted -Certificate. It then attempts to discover a chain-of-trust, starting -from that certificate and ending at another Trusted Certificate, -already stored in the key store. If the `-trustcacerts' option is -present, an additional key store, of type `JKS' named `cacerts', and -assumed to be present in `${JAVA_HOME}/lib/security' will also be -consulted if found -`${JAVA_HOME}' refers to the location of an -installed Java Runtime Environment (JRE). If no chain-of-trust can be -established, and unless the `-noprompt' option has been specified, the -certificate is printed to `STDOUT' and the user is prompted for a -confirmation. - - If Alias exists in the key store, the tool will treat the -certificate(s) read from the input source as a Certificate Reply, which -can be a chain of certificates, that eventually would replace the chain -of certificates associated with the Key Entry of that Alias. 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 Trusted Certificates already present in the key -store. Again, if the `-trustcacerts' option is specified, additional -Trusted Certificates in the same `cacerts' key store will be -considered. If no chain-of-trust can be established, the operation will -abort. - -`-alias ALIAS' - For more details *note ALIAS: alias. - -`-file FILE' - For more details *note FILE: file. - -`-keypass PASSWORD' - Use this option to specify the password which the tool will use to - protect the Key Entry associated with the designated Alias, when - replacing this Alias' chain of certificates with that found in the - certificate reply. - - 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 Key Entry using the same password protecting - the key store. If this fails, you will then be prompted to provide - a password. - -`-noprompt' - Use this option to prevent the tool from prompting the user. - -`-trustcacerts' - Use this option to indicate to the tool that a key store, of type - `JKS', named `cacerts', and usually located in `lib/security' in - an installed Java Runtime Environment should be considered when - trying to establish chain-of-trusts. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Command -selfcert, Next: Command -cacert, Prev: Command -import, Up: Add/Update Commands - -2.2.4.3 The `-selfcert' command -............................... - -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 Alias -(if `-alias' option was specified), or the default Alias (if `-alias' -option was omitted). - -`-alias ALIAS' - For more details *note ALIAS: alias. - -`-sigalg ALGORITHM' - 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 Alias. If the private key is a - `DSA' one, the value for the signature algorithm will be - `SHA1withDSA'. If on the other hand the private key is an `RSA' - one, then the tool will use `MD5withRSA' as the signature - algorithm. - -`-dname NAME' - Use this option to specify the Distinguished Name of the newly - generated self-signed certificate. If this option is omitted, the - existing Distinguished Name of the base certificate in the chain - associated with the designated Alias will be used instead. - - For more details *note X.500 DISTINGUISHED NAME: dn. - -`-validity DAY_COUNT' - For more details *note DAY_COUNT: validity. - -`-keypass PASSWORD' - Use this option to specify the password which the tool will use to - unlock the Key Entry associated with the designated Alias. - - If this option is omitted, the tool will first attempt to unlock - the Key Entry using the same password protecting the key store. If - this fails, you will then be prompted to provide a password. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Command -cacert, Next: Command -identitydb, Prev: Command -selfcert, Up: Add/Update Commands - -2.2.4.4 The `-cacert' command -............................. - -Use this command to import, a CA certificate and add it to the key -store as a Trusted Certificate. The Alias for this new entry will be -constructed from the FILE's base-name after replacing hyphens and dots -with underscores. - - This command is useful when used in a script that recursively visits -a directory of CA certificates to populate a `cacerts.gkr' Key Store of -trusted certificates which can then be used commands that specify the -`-trustcacerts' option. - -`-file FILE' - For more details *note FILE: file. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Command -identitydb, Prev: Command -cacert, Up: Add/Update Commands - -2.2.4.5 The `-identitydb' command -................................. - -NOT IMPLEMENTED YET. - - Use this command to import a JDK 1.1 style Identity Database. - -`-file FILE' - For more details *note FILE: file. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Export Commands, Next: Display Commands, Prev: Add/Update Commands, Up: keytool Tool - -2.2.5 Export commands ---------------------- - -* Menu: - -* Command -certreq:: Generate Certificate Signing Requests (CSR) -* Command -export:: Export a certificate in a Key Store - - -File: cp-tools.info, Node: Command -certreq, Next: Command -export, Prev: Export Commands, Up: Export Commands - -2.2.5.1 The `-certreq' command -.............................. - -Use this command to generate a PKCS#10 Certificate Signing Request -(CSR) and write it to a designated output destination. The contents of -the destination should look something like the following: - - -----BEGIN NEW CERTIFICATE REQUEST----- - MI...QAwXzEUMBIGA1UEAwwLcnNuQGdudS5vcmcxGzAZBgNVBAoMElUg - Q2...A0GA1UEBwwGU3lkbmV5MQwwCgYDVQQIDANOU1cxCzAJBgNVBACC - ... - FC...IVwNVOfQLRX+O5kAhQ/a4RTZme2L8PnpvgRwrf7Eg8D6w== - -----END NEW CERTIFICATE REQUEST----- - - IMPORTANT: Some documentation (e.g. RSA examples) claims that the -`Attributes' field, in the CSR is `OPTIONAL' while RFC-2986 implies the -opposite. This implementation considers this field, by default, as -`OPTIONAL', unless the option `-attributes' is specified on the command -line. - -`-alias ALIAS' - For more details *note ALIAS: alias. - -`-sigalg ALGORITHM' - 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 Alias. If the private key is a - `DSA' one, the value for the signature algorithm will be - `SHA1withDSA'. If on the other hand the private key is an `RSA' - one, then the tool will use `MD5withRSA' as the signature - algorithm. - -`-file FILE' - For more details *note FILE: file. - -`-keypass PASSWORD' - Use this option to specify the password which the tool will use to - unlock the Key Entry associated with the designated Alias. - - If this option is omitted, the tool will first attempt to unlock - the Key Entry using the same password protecting the key store. If - this fails, you will then be prompted to provide a password. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - -`-attributes' - Use this option to force the tool to encode a `NULL' DER value in - the CSR as the value of the `Attributes' field. - - - -File: cp-tools.info, Node: Command -export, Prev: Command -certreq, Up: Export Commands - -2.2.5.2 The `-export' command -............................. - -Use this command to export a certificate stored in a key store to a -designated output destination, either in binary format (if the `-v' -option is specified), or in RFC-1421 compliant encoding (if the `-rfc' -option is specified instead). - -`-alias ALIAS' - For more details *note ALIAS: alias. - -`-file FILE' - For more details *note FILE: file. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-rfc' - Use RFC-1421 specifications when encoding the output. - -`-v' - Output the certificate in binary DER encoding. This is the default - output format of the command if neither `-rfc' nor `-v' options - were detected on the command line. If both this option and the - `-rfc' option are detected on the command line, the tool will opt - for the RFC-1421 style encoding. - - - -File: cp-tools.info, Node: Display Commands, Next: Management Commands, Prev: Export Commands, Up: keytool Tool - -2.2.6 Display commands ----------------------- - -* Menu: - -* Command -list:: Display information about one or all Aliases -* Command -printcert:: Print a certificate or a certificate fingerprint - - -File: cp-tools.info, Node: Command -list, Next: Command -printcert, Prev: Display Commands, Up: Display Commands - -2.2.6.1 The `-list' command -........................... - -Use this command to print one or all of a key store entries to -`STDOUT'. Usually this command will only print a fingerprint of the -certificate, unless either the `-rfc' or the `-v' option is specified. - -`-alias ALIAS' - If this option is omitted, the tool will print ALL the entries - found in the key store. - - For more details *note ALIAS: alias. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-rfc' - Use RFC-1421 specifications when encoding the output. - -`-v' - Output the certificate in human-readable format. If both this - option and the `-rfc' option are detected on the command line, the - tool will opt for the human-readable form and will not abort the - command. - - - -File: cp-tools.info, Node: Command -printcert, Prev: Command -list, Up: Display Commands - -2.2.6.2 The `-printcert' command -................................ - -Use this command to read a certificate from a designated input source -and print it to `STDOUT' in a human-readable form. - -`-file FILE' - For more details *note FILE: file. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Management Commands, Prev: Display Commands, Up: keytool Tool - -2.2.7 Management commands -------------------------- - -* Menu: - -* Command -keyclone:: Clone a Key Entry in a Key Store -* Command -storepasswd:: Change the password protecting a Key Store -* Command -keypasswd:: Change the password protecting a Key Entry -* Command -delete:: Remove an entry in a Key Store - - -File: cp-tools.info, Node: Command -keyclone, Next: Command -storepasswd, Prev: Management Commands, Up: Management Commands - -2.2.7.1 The `-keyclone' command -............................... - -Use this command to clone an existing Key Entry and store it under a -new (different) Alias protecting, its private key material with -possibly a new password. - -`-alias ALIAS' - For more details *note ALIAS: alias. - -`-dest ALIAS' - Use this option to specify the new Alias which will be used to - identify the cloned copy of the Key Entry. - -`-keypass PASSWORD' - Use this option to specify the password which the tool will use to - unlock the Key Entry associated with the designated Alias. - - If this option is omitted, the tool will first attempt to unlock - the Key Entry using the same password protecting the key store. If - this fails, you will then be prompted to provide a password. - -`-new PASSWORD' - Use this option to specify the password protecting the private key - material of the newly cloned copy of the Key Entry. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Command -storepasswd, Next: Command -keypasswd, Prev: Command -keyclone, Up: Management Commands - -2.2.7.2 The `-storepasswd' command -.................................. - -Use this command to change the password protecting a key store. - -`-new PASSWORD' - The new, and different, password which will be used to protect the - designated key store. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Command -keypasswd, Next: Command -delete, Prev: Command -storepasswd, Up: Management Commands - -2.2.7.3 The `-keypasswd' command -................................ - -Use this command to change the password protecting the private key -material of a designated Key Entry. - -`-alias ALIAS' - For more details *note ALIAS: alias. - - Use this option to specify the password which the tool will use to - unlock the Key Entry associated with the designated Alias. - - If this option is omitted, the tool will first attempt to unlock - the Key Entry using the same password protecting the key store. If - this fails, you will then be prompted to provide a password. - -`-new PASSWORD' - The new, and different, password which will be used to protect the - private key material of the designated Key Entry. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Command -delete, Prev: Command -keypasswd, Up: Management Commands - -2.2.7.4 The `-delete' command -............................. - -Use this command to delete a designated key store entry. - -`-alias ALIAS' - For more details *note ALIAS: alias. - -`-storetype STORE_TYPE' - For more details *note STORE_TYPE: storetype. - -`-keystore URL' - For more details *note URL: keystore. - -`-storepass PASSWORD' - For more details *note PASSWORD: storepass. - -`-provider PROVIDER_CLASS_NAME' - For more details *note PROVIDER_CLASS_NAME: provider. - -`-v' - For more details *note verbose::. - - - -File: cp-tools.info, Node: Other Tools, Next: I18N Issues, Prev: Security Tools, Up: Top - -3 Other Tools -************* - -This is a list of currently undocumented classpath tools: jar, javah, -gcjh, native2ascii, orbd, serialver, rmid, rmiregistry and tnameserv. - -* Menu: - -* jar Tool:: Archive tool for Java archives -* javah Tool:: A java header compiler -* gcjh Tool:: A java header compiler (old version) -* native2ascii Tool:: An encoding converter -* orbd Tool:: An object request broker daemon -* serialver Tool:: A serial version command -* rmid Tool:: RMI activation daemon -* rmiregistry Tool:: Remote object registry -* tnameserv Tool:: Naming service - - -File: cp-tools.info, Node: jar Tool, Next: javah Tool, Up: Other Tools - -3.1 The `jar' Tool -================== - -`gjar' is an implementation of Sun's jar utility that comes with the -JDK. - - If any file is a directory then it is processed recursively. The -manifest file name and the archive file name needs to be specified in -the same order the `-m' and `-f' flags are specified. - - Operation mode: - -`-c' - Create new archive. - -`-t' - List table of contents for archive. - -`-x' - Extract named (or all) files from archive. - -`-u' - Update existing archive. - -`-i FILE' - Compute archive index. - - Operation modifiers: - -`-f FILE' - Specify archive file name. - -`-0' - Store only; use no ZIP compression. - -`-v' - Generate verbose output on standard output. - -`-M' - Do not create a manifest file for the entries. - -`-m MANIFEST' - Include manifest information from specified MANIFEST file. - - File name selection: - -`-C DIR FILE' - Change to the DIR and include the following FILE. - -`-@' - Read the names of the files to add to the archive from stdin. This - option is supported only in combination with `-c' or `-u'. Non - standard option added in the GCC version. - - Standard options: - -`-help' - Print help text, then exit. - -`-version' - Print version number, then exit. - -`-JOPTION' - Pass argument to the Java runtime. - - java(1), ... - - -File: cp-tools.info, Node: javah Tool, Next: gcjh Tool, Prev: jar Tool, Up: Other Tools - -3.2 The `javah' Tool -==================== - -The `gjavah' program is used to generate header files from class files. -It can generate both CNI and JNI header files, as well as stub -implementation files which can be used as a basis for implementing the -required native methods. - -`-d DIR' - Set output directory. - -`-o FILE' - Set output file (only one of `-d' or `-o' may be used). - -`-cmdfile FILE' - Read command file. - -`-all DIR' - Operate on all class files under directory DIR. - -`-stubs' - Emit stub implementation. - -`-jni' - Emit JNI stubs or header (default). - -`-cni' - Emit CNI stubs or header (default JNI). - -`-verbose' - Set verbose mode. - -`-force' - Output files should always be written. - - Class path options: -`-classpath PATH' - Set the class path. - -`-IDIR' - Add directory to class path. - -`-bootclasspath PATH' - Set the boot class path. - -`-extdirs PATH' - Set the extension directory path. - - Standard options: -`-help' - Print help text, then exit. - -`-version' - Print version number, then exit. - -`-JOPTION' - Pass argument to the Java runtime. - - javac(1), ... - - -File: cp-tools.info, Node: gcjh Tool, Next: native2ascii Tool, Prev: javah Tool, Up: Other Tools - -3.3 The `gcjh' Tool -=================== - -The `gcjh' program is used to generate header files from class files. -It can generate both CNI and JNI header files, as well as stub -implementation files which can be used as a basis for implementing the -required native methods. It is similar to `javah' but has slightly -different command line options, and defaults to CNI. - - See `javah' for a full description; this page only lists the -additional options provided by `gcjh'. - - CNI text options -`-add TEXT' - Insert TEXT into class body. - -`-append TEXT' - Append TEXT after class declaration. - -`-friend TEXT' - Insert TEXT as a `friend' declaration. - -`-prepend TEXT' - Insert TEXT before start of class. - - Compatibility options (unused) -`-td DIR' -`-M' -`-MM' -`-MD' -`-MMD' - Unused compatibility option. - - Standard options: -`-help' - Print help text, then exit. - -`-version' - Print version number, then exit. - -`-JOPTION' - Pass argument to the Java runtime. - - javac(1), javah(1), ... - - -File: cp-tools.info, Node: native2ascii Tool, Next: orbd Tool, Prev: gcjh Tool, Up: Other Tools - -3.4 The `native2ascii' Tool -=========================== - -To be written ... - -`-encoding NAME' - Set the encoding to use. - -`-reversed' - Convert from encoding to native. - - Standard options: -`-help' - Print help text, then exit. - -`-version' - Print version number, then exit. - -`-JOPTION' - Pass argument to the Java runtime. - - javac(1), ... - - -File: cp-tools.info, Node: orbd Tool, Next: serialver Tool, Prev: native2ascii Tool, Up: Other Tools - -3.5 The `orbd' object request broker daemon -=========================================== - -To be written ... - -`-ORBInitialPort PORT' - Port on which persistent naming service is to be started. - -`-ior FILE' - File in which to store persistent naming service's IOR reference - -`-directory DIR' - Directory in which to store persistent data. - -`-restart' - Restart persistent naming service, clearing persistent naming - database. - - Standard options: -`-help' - Print help text, then exit. - -`-version' - Print version number, then exit. - -`-JOPTION' - Pass argument to the Java runtime. - - java(1), ... - - -File: cp-tools.info, Node: serialver Tool, Next: rmid Tool, Prev: orbd Tool, Up: Other Tools - -3.6 The `serialver' version command -=================================== - -Print the serialVersionUID of the specified classes. - -`-classpath PATH' - Class path to use to find classes. - - Standard options: -`-help' - Print help text, then exit. - -`-version' - Print version number, then exit. - -`-JOPTION' - Pass argument to the Java runtime. - - javac(1), ... - - -File: cp-tools.info, Node: rmid Tool, Next: rmiregistry Tool, Prev: serialver Tool, Up: Other Tools - -3.7 The `rmid' RMI activation system daemon -=========================================== - -`rmiregistry' starts a remote object registry on the current host. If -no port number is specified, then port 1099 is used. - - Activation process control: -`-port PORT' - Port on which activation system is to be started. - -`-restart' - Restart activation system, clearing persistent naming database, if - any. - -`-stop' - Stop activation system. - - Persistence: -`-persistent' - Make activation system persistent. - -`-directory DIR' - Directory in which to store persistent data. - - Debugging: -`-verbose' - Log binding events to standard out. - - Standard options: -`-help' - Print help text, then exit. - -`-version' - Print version number, then exit. - -`-JOPTION' - Pass argument to the Java runtime. - - java(1), ... - - -File: cp-tools.info, Node: rmiregistry Tool, Next: tnameserv Tool, Prev: rmid Tool, Up: Other Tools - -3.8 The `rmiregistry' Tool -========================== - -`grmiregistry' starts a remote object registry on the current host. If -no port number is specified, then port 1099 is used. - - Registry process control: -`-restart' - Restart RMI naming service, clearing persistent naming database, if - any. - -`-stop' - Stop RMI naming service. - - Persistence: -`-persistent' - Make RMI naming service persistent. - -`-directory DIR' - Directory in which to store persistent data. - - Debugging: -`-verbose' - Log binding events to standard out. - - Standard options: -`-help' - Print help text, then exit. - -`-version' - Print version number, then exit. - -`-JOPTION' - Pass argument to the Java runtime. - - java(1), ... - - -File: cp-tools.info, Node: tnameserv Tool, Prev: rmiregistry Tool, Up: Other Tools - -3.9 The `tnameserv' Tool -======================== - -To be written ... - -`-ORBInitialPort PORT' - Port on which naming service is to be started. - -`-ior FILE' - File in which to store naming service's IOR reference. - - Standard options: -`-help' - Print help text, then exit. - -`-version' - Print version number, then exit. - -`-JOPTION' - Pass argument to the Java runtime. - - java(1), ... - - -File: cp-tools.info, Node: I18N Issues, Prev: Other Tools, Up: Top - -4 I18N Issues -************* - -Some tools -*note Security Tools::- allow using other than the English -language when prompting the User for input, and outputing messages. -This chapter describes the elements used to offer this support and how -they can be adapted for use with specific languages. - -* Menu: - -* Language Resources:: Where resources are located -* Message Formats:: How messages are internationalized - - -File: cp-tools.info, Node: Language Resources, Next: Message Formats, Prev: I18N Issues, Up: I18N Issues - -4.1 Language-specific resources -=============================== - -The Tools use Java `ResourceBundle's to store messages, and message -templates they use at runtime to generate the message text itself, -depending on the locale in use at the time. - - The Resource Bundles these tools use are essentially Java Properties -files consisting of a set of Name/Value pairs. The Name is the Propery -Name and the Value is a substitution string that is used when the code -references the associated Name. For example the following is a line in -a Resource Bundle used by the `keytool' Tool: - - Command.23=A correct key password MUST be provided - - When the tool needs to signal a mandatory but missing key password, -it would reference the property named `Command.23' and the message "`A -correct key password MUST be provided'" will be used instead. This -indirect referencing of "resources" permits replacing, as late as -possible, the English strings with strings in other languages, provided -of course Resource Bundles in those languages are provided. - - For the GNU Classpath Tools described in this Guide, the Resource -Bundles are files named `messages[_ll[_CC[_VV]]].properties' where: - -LL - Is the 2-letter code for the Language, - -CC - Is the 2-letter code for the Region, and - -VV - Is the 2-letter code for the Variant of the language. - - The complete list of language codes can be found at Code for the -representation of names of languages -(http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt). A similar -list for the region codes can be found at ISO 3166 Codes (Countries) -(http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html). - - The location of the Resource Bundles for the GNU Classpath Tools is -specific to each tool. The next table shows where these files are found -in a standard GNU Classpath distribution: - -`jarsigner' - `gnu/classpath/tools/jarsigner' - -`keytool' - `gnu/classpath/tools/keytool' - - The collection of Resource Bundles in a location act as an inverted -tree with a parent-child relationship. For example suppose in the -`gnu/classpath/tools/keytool' there are 3 message bundles named: - - 1. `messages.properties' - - 2. `messages_fr.properties' - - 3. `messages_fr_FR.properties' - - In the above example, bundle #1 will act as the parent of bundle #2, -which in turn will act as the parent for bundle #3. This ordering is -used by the Java runtime to choose which file to load based on the set -Locale. For example if the Locale is `fr_CH', `messages_fr.properties' -will be used because (a) `messages_fr_CH.properties' does not exist, -but (b) `messages_fr.properties' is the parent for the required bundle, -and it exists. As another example, suppose the Locale was set to -`en_AU'; then the tool will end up using `messages.properties' because -(a) `messages_en_AU.properties' does not exist, (b) -`messages_en.properties' which is the parent for the required bundle -does not exist, but (c) `messages.properties' exists and is the root of -the hierarchy. - - You can see from the examples above that `messages.properties' is -the safety net that the Java runtime falls back to when failing to find -a specific bunlde and its parent(s). This file is always provided with -the Tool. In time, more localized versions will be included to cater -for other languages. - - In the meantime, if you are willing to contribute localized versions -of these resources, grab the `messages.properties' for a specific tool; -translate it; save it with the appropriate language and region suffix -and mail it to `classpath@gnu.org'. - - -File: cp-tools.info, Node: Message Formats, Prev: Language Resources, Up: I18N Issues - -4.2 Message formats -=================== - -If you open any of the `messages.properties' described in the previous -section, you may see properties that look like so: - - Command.67=Issuer: {0} - Command.68=Serial number: {0,number} - Command.69=Valid from: {0,date,full} - {0,time,full} - Command.70=\ \ \ \ \ until: {0,date,full} - {0,time,full} - - These are Message Formats used by the tools to customize a text -string that will then be used either as a prompt for User input or as -output. - - If you are translating a `messages.properties' be careful not to -alter text between curly braces. - - - -Tag Table: -Node: Top445 -Node: Applet Tools3894 -Node: appletviewer Tool4467 -Node: gcjwebplugin7582 -Node: Security Tools7894 -Node: jarsigner Tool8547 -Node: Common jarsigner Options9594 -Node: Signing Options10909 -Node: Verification Options13491 -Node: keytool Tool14079 -Node: Getting Help18507 -Node: Common keytool Options19251 -Ref: alias19524 -Ref: keyalg19906 -Ref: keysize20136 -Ref: validity20401 -Ref: storetype20616 -Ref: storepass20947 -Ref: keystore21144 -Ref: provider21687 -Ref: file22094 -Ref: verbose22565 -Node: Distinguished Names22657 -Ref: dn22851 -Node: Add/Update Commands23914 -Node: Command -genkey24442 -Node: Command -import26850 -Node: Command -selfcert29994 -Node: Command -cacert32173 -Node: Command -identitydb33226 -Node: Export Commands33884 -Node: Command -certreq34200 -Node: Command -export36606 -Node: Display Commands37803 -Node: Command -list38135 -Node: Command -printcert39268 -Node: Management Commands39652 -Node: Command -keyclone40084 -Node: Command -storepasswd41487 -Node: Command -keypasswd42216 -Node: Command -delete43410 -Node: Other Tools44033 -Node: jar Tool44818 -Node: javah Tool46210 -Node: gcjh Tool47429 -Node: native2ascii Tool48542 -Node: orbd Tool49003 -Node: serialver Tool49733 -Node: rmid Tool50202 -Node: rmiregistry Tool51143 -Node: tnameserv Tool51983 -Node: I18N Issues52473 -Node: Language Resources52974 -Node: Message Formats56637 - -End Tag Table diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gappletviewer.1 gcc-4.3.3/libjava/classpath/doc/gappletviewer.1 --- gcc-4.3.3.orig/libjava/classpath/doc/gappletviewer.1 2009-01-24 04:05:54.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/gappletviewer.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,244 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GAPPLETVIEWER 1" -.TH GAPPLETVIEWER 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -gappletviewer \- Load and runs an applet -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -appletviewer [\fI\s-1OPTION\s0\fR]... \fI\s-1URL\s0\fR... -.PP -appletviewer [\fI\s-1OPTION\s0\fR]... \fB\-code\fR \fI\s-1CODE\s0\fR -.PP -appletviewer [\fI\s-1OPTION\s0\fR]... \fB\-plugin\fR \fI\s-1INPUT\s0\fR,\fI\s-1OUTPUT\s0\fR -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -The \fBappletviewer\fR tool loads and runs an applet. -.PP -Use the first form to test applets specified by tag. The \s-1URL\s0 should -resolve to an \s-1HTML\s0 document from which the \fBappletviewer\fR will -extract applet tags. The \s-1APPLET\s0, \s-1EMBED\s0 and \s-1OBJECT\s0 tags are supported. -If a given document contains multiple applet tags, all the applets -will be loaded, with each applet appearing in its own window. -Likewise, when multiple URLs are specified, each applet tag instance -is given its own window. If a given document contains no recognized -tags the \fBappletviewer\fR does nothing. -.PP -.Vb 1 -\& appletviewer http://www.gnu.org/software/classpath/ -.Ve -.PP -Use the second form to test an applet in development. This form -allows applet tag attributes to be supplied on the command line. Only -one applet may be specified using the \fB\-code\fR option. The -\&\fB\-code\fR option overrides the \s-1URL\s0 form \*(-- any URLs specified will -be ignored. -.PP -.Vb 1 -\& appletviewer \-code Test.class \-param datafile,data.txt -.Ve -.PP -\&\fBgcjwebplugin\fR uses the third form to communicate with the -\&\fBappletviewer\fR through named pipes. -.SH "OPTIONS" -.IX Header "OPTIONS" -\&\s-1URL\s0 \s-1OPTIONS\s0 -.IP "\fB\-debug\fR" 4 -.IX Item "-debug" -This option is not yet implemented but is provided for compatibility. -.IP "\fB\-encoding\fR \fI\s-1CHARSET\s0\fR" 4 -.IX Item "-encoding CHARSET" -Use this option to specify an alternate character encoding for the -specified \s-1HTML\s0 page. -.PP -\&\s-1APPLET\s0 \s-1TAG\s0 \s-1OPTIONS\s0 -.IP "\fB\-code\fR \fI\s-1CODE\s0\fR" 4 -.IX Item "-code CODE" -Use the \fB\-code\fR option to specify the value of the applet tag -\&\fI\s-1CODE\s0\fR attribute. -.IP "\fB\-codebase\fR \fI\s-1CODEBASE\s0\fR" 4 -.IX Item "-codebase CODEBASE" -Use the \fB\-codebase\fR option to specify the value of the applet tag -\&\fI\s-1CODEBASE\s0\fR attribute. -.IP "\fB\-archive\fR \fI\s-1ARCHIVE\s0\fR" 4 -.IX Item "-archive ARCHIVE" -Use the \fB\-archive\fR option to specify the value of the applet tag -\&\fI\s-1ARCHIVE\s0\fR attribute. -.IP "\fB\-width\fR \fI\s-1WIDTH\s0\fR" 4 -.IX Item "-width WIDTH" -Use the \fB\-width\fR option to specify the value of the applet tag -\&\fI\s-1WIDTH\s0\fR attribute. -.IP "\fB\-height\fR \fI\s-1HEIGHT\s0\fR" 4 -.IX Item "-height HEIGHT" -Use the \fB\-height\fR option to specify the value of the applet tag -\&\fI\s-1HEIGHT\s0\fR attribute. -.IP "\fB\-param\fR \fI\s-1NAME\s0\fR\fB,\fR\fI\s-1VALUE\s0\fR" 4 -.IX Item "-param NAME,VALUE" -Use the \fB\-param\fR option to specify values for the \fI\s-1NAME\s0\fR -and \fI\s-1VALUE\s0\fR attributes of an applet \s-1PARAM\s0 tag. -.PP -\&\s-1PLUGIN\s0 \s-1OPTION\s0 -.IP "\fB\-plugin\fR \fI\s-1INPUT\s0\fR\fB,\fR\fI\s-1OUTPUT\s0\fR" 4 -.IX Item "-plugin INPUT,OUTPUT" -\&\fBgcjwebplugin\fR uses the \fB\-plugin\fR option to specify the -named pipe the \fBappletviewer\fR should use for receiving commands -(\fI\s-1INPUT\s0\fR) and the one it should use for sending commands to -\&\fBgcjwebplugin\fR (\fI\s-1OUTPUT\s0\fR). -.PP -\&\s-1DEBUGGING\s0 \s-1OPTION\s0 -.IP "\fB\-verbose\fR" 4 -.IX Item "-verbose" -Use the \fB\-verbose\fR option to have the \fBappletviewer\fR print -debugging messages. -.PP -\&\s-1STANDARD\s0 \s-1OPTIONS\s0 -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Use the \fB\-help\fR option to have the \fBappletviewer\fR print a -usage message, then exit. -.IP "\fB\-version\fR" 4 -.IX Item "-version" -Use the \fB\-version\fR option to have the \fBappletviewer\fR print -its version, then exit. -.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4 -.IX Item "-JOPTION" -Use the \fB\-J\fR option to pass \fI\s-1OPTION\s0\fR to the virtual machine that -will run the \fBappletviewer\fR. Unlike other options, there must -not be a space between the \fB\-J\fR and \fI\s-1OPTION\s0\fR. -.SH "SEE ALSO" -.IX Header "SEE ALSO" diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gjar.1 gcc-4.3.3/libjava/classpath/doc/gjar.1 --- gcc-4.3.3.orig/libjava/classpath/doc/gjar.1 2009-01-24 04:05:54.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/gjar.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,211 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GJAR 1" -.TH GJAR 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -gjar \- \- Archive tool for Java archives -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -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... -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -\&\fBgjar\fR is an implementation of Sun's jar utility that comes with -the \s-1JDK\s0. -.PP -If any file is a directory then it is processed recursively. The -manifest file name and the archive file name needs to be specified in -the same order the \fB\-m\fR and \fB\-f\fR flags are specified. -.SH "OPTIONS" -.IX Header "OPTIONS" -Operation mode: -.IP "\fB\-c\fR" 4 -.IX Item "-c" -Create new archive. -.IP "\fB\-t\fR" 4 -.IX Item "-t" -List table of contents for archive. -.IP "\fB\-x\fR" 4 -.IX Item "-x" -Extract named (or all) files from archive. -.IP "\fB\-u\fR" 4 -.IX Item "-u" -Update existing archive. -.IP "\fB\-i\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-i FILE" -Compute archive index. -.PP -Operation modifiers: -.IP "\fB\-f\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-f FILE" -Specify archive file name. -.IP "\fB\-0\fR" 4 -.IX Item "-0" -Store only; use no \s-1ZIP\s0 compression. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -Generate verbose output on standard output. -.IP "\fB\-M\fR" 4 -.IX Item "-M" -Do not create a manifest file for the entries. -.IP "\fB\-m\fR \fImanifest\fR" 4 -.IX Item "-m manifest" -Include manifest information from specified \fImanifest\fR file. -.PP -File name selection: -.IP "\fB\-C\fR \fI\s-1DIR\s0\fR\fB \fR\fI\s-1FILE\s0\fR" 4 -.IX Item "-C DIR FILE" -Change to the \fI\s-1DIR\s0\fR and include the following \fI\s-1FILE\s0\fR. -.IP "\fB\-@\fR" 4 -.IX Item "-@" -Read the names of the files to add to the archive from stdin. This -option is supported only in combination with \fB\-c\fR or \fB\-u\fR. -Non standard option added in the \s-1GCC\s0 version. -.PP -Standard options: -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Print help text, then exit. -.IP "\fB\-version\fR" 4 -.IX Item "-version" -Print version number, then exit. -.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4 -.IX Item "-JOPTION" -Pass argument to the Java runtime. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIjava\fR\|(1), ... diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gjarsigner.1 gcc-4.3.3/libjava/classpath/doc/gjarsigner.1 --- gcc-4.3.3.orig/libjava/classpath/doc/gjarsigner.1 2009-01-24 04:05:55.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/gjarsigner.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,216 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GJARSIGNER 1" -.TH GJARSIGNER 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -gjarsigner \- Java ARchive (JAR) file signing and verification tool -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -jarsigner [\fI\s-1OPTION\s0\fR]... \fI\s-1FILE\s0\fR \fI\s-1ALIAS\s0\fR -.PP -jarsigner \fB\-verify\fR [\fI\s-1OPTION\s0\fR]... \fI\s-1FILE\s0\fR -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -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. -.PP -\&\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. -.PP -\&\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. -.SH "OPTIONS" -.IX Header "OPTIONS" -\fICommon options\fR -.IX Subsection "Common options" -.PP -The following options may be used when the tool is used for either signing, or verifying, a .JAR file. -.IP "\fB\-verbose\fR" 4 -.IX Item "-verbose" -Use this option to force the tool to generate more verbose messages, during its processing. -.IP "\fB\-internalsf\fR" 4 -.IX Item "-internalsf" -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. -.IP "\fB\-sectionsonly\fR" 4 -.IX Item "-sectionsonly" -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. -.IP "\fB\-provider \s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -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. -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Prints a help text similar to this one. -.PP -\fISigning options\fR -.IX Subsection "Signing options" -.PP -The following options may be specified when using the tool for signing purposes. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -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. -.Sp -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. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -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. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -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. -.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-keypass PASSWORD" -Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR. -.Sp -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. -.IP "\fB\-sigfile\fR \fI\s-1NAME\s0\fR" 4 -.IX Item "-sigfile NAME" -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. -.Sp -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. -.IP "\fB\-signedjar\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-signedjar FILE" -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. -.PP -\fIVerification options\fR -.IX Subsection "Verification options" -.PP -The following options may be specified when using the tool for verification purposes. -.IP "\fB\-verify\fR" 4 -.IX Item "-verify" -Use this option to indicate that the tool is to be used for verification purposes. -.IP "\fB\-certs\fR" 4 -.IX Item "-certs" -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. -.SH "SEE ALSO" -.IX Header "SEE ALSO" diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gjavah.1 gcc-4.3.3/libjava/classpath/doc/gjavah.1 --- gcc-4.3.3.orig/libjava/classpath/doc/gjavah.1 2009-01-24 04:05:55.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/gjavah.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,207 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GJAVAH 1" -.TH GJAVAH 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -gjavah \- \- generate header files from Java class files -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -gjavah ... -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -The \fBgjavah\fR program is used to generate header files from class -files. It can generate both \s-1CNI\s0 and \s-1JNI\s0 header files, as well as stub -implementation files which can be used as a basis for implementing the -required native methods. -.SH "OPTIONS" -.IX Header "OPTIONS" -.IP "\fB\-d\fR \fI\s-1DIR\s0\fR" 4 -.IX Item "-d DIR" -Set output directory. -.IP "\fB\-o\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-o FILE" -Set output file (only one of \fB\-d\fR or \fB\-o\fR may be used). -.IP "\fB\-cmdfile\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-cmdfile FILE" -Read command file. -.IP "\fB\-all\fR \fI\s-1DIR\s0\fR" 4 -.IX Item "-all DIR" -Operate on all class files under directory \fI\s-1DIR\s0\fR. -.IP "\fB\-stubs\fR" 4 -.IX Item "-stubs" -Emit stub implementation. -.IP "\fB\-jni\fR" 4 -.IX Item "-jni" -Emit \s-1JNI\s0 stubs or header (default). -.IP "\fB\-cni\fR" 4 -.IX Item "-cni" -Emit \s-1CNI\s0 stubs or header (default \s-1JNI\s0). -.IP "\fB\-verbose\fR" 4 -.IX Item "-verbose" -Set verbose mode. -.IP "\fB\-force\fR" 4 -.IX Item "-force" -Output files should always be written. -.PP -Class path options: -.IP "\fB\-classpath\fR \fI\s-1PATH\s0\fR" 4 -.IX Item "-classpath PATH" -Set the class path. -.IP "\fB\-I\fR\fI\s-1DIR\s0\fR" 4 -.IX Item "-IDIR" -Add directory to class path. -.IP "\fB\-bootclasspath\fR \fI\s-1PATH\s0\fR" 4 -.IX Item "-bootclasspath PATH" -Set the boot class path. -.IP "\fB\-extdirs\fR \fI\s-1PATH\s0\fR" 4 -.IX Item "-extdirs PATH" -Set the extension directory path. -.PP -Standard options: -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Print help text, then exit. -.IP "\fB\-version\fR" 4 -.IX Item "-version" -Print version number, then exit. -.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4 -.IX Item "-JOPTION" -Pass argument to the Java runtime. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIjavac\fR\|(1), ... diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gkeytool.1 gcc-4.3.3/libjava/classpath/doc/gkeytool.1 --- gcc-4.3.3.orig/libjava/classpath/doc/gkeytool.1 2009-01-24 04:05:55.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/gkeytool.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,692 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GKEYTOOL 1" -.TH GKEYTOOL 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -gkeytool \- Manage private keys and public certificates -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -keytool [\fI\s-1COMMAND\s0\fR] ... -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -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. -.PP -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. -.PP -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. -.PP -\&\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. -.PP -The \fBkeytool\fR is invoked from the command line as follows: -.PP -.Vb 1 -\& keytool [COMMAND] ... -.Ve -.PP -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 -.PP -.Vb 1 -\& keytool \-list \-\- \-printcert \-alias mykey -.Ve -.SH "OPTIONS" -.IX Header "OPTIONS" -.IP "\- Add/Update commands" 4 -.IX Item "- Add/Update commands" -.RS 4 -.PD 0 -.IP "\fB\-genkey [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-genkey [OPTION]..." -.PD -Generate a new \fIKey Entry\fR, eventually creating a new key store. -.IP "\fB\-import [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-import [OPTION]..." -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). -.IP "\fB\-selfcert [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-selfcert [OPTION]..." -Generate a new self-signed \fITrusted Certificate\fR. -.IP "\fB\-cacert [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-cacert [OPTION]..." -Import a \s-1CA\s0 \fITrusted Certificate\fR. -.IP "\fB\-identitydb [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-identitydb [OPTION]..." -\&\fB\s-1NOT\s0 \s-1IMPLEMENTED\s0 \s-1YET\s0\fR.Import a \s-1JDK\s0 1.1 style Identity Database. -.RE -.RS 4 -.RE -.IP "\- Export commands" 4 -.IX Item "- Export commands" -.RS 4 -.PD 0 -.IP "\fB\-certreq [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-certreq [OPTION]..." -.PD -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. -.IP "\fB\-export [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-export [OPTION]..." -Export a certificate from a key store. -.RE -.RS 4 -.RE -.IP "\- Display commands" 4 -.IX Item "- Display commands" -.RS 4 -.PD 0 -.IP "\fB\-list [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-list [OPTION]..." -.PD -Print one or all certificates in a key store to \f(CW\*(C`STDOUT\*(C'\fR. -.IP "\fB\-printcert [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-printcert [OPTION]..." -Print a human-readable form of a certificate, in a designated file, to \f(CW\*(C`STDOUT\*(C'\fR. -.RE -.RS 4 -.RE -.IP "\- Management commands" 4 -.IX Item "- Management commands" -.RS 4 -.PD 0 -.IP "\fB\-keyclone [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-keyclone [OPTION]..." -.PD -Clone a \fIKey Entry\fR in a key store. -.IP "\fB\-storepasswd [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-storepasswd [OPTION]..." -Change the password protecting a key store. -.IP "\fB\-keypasswd [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-keypasswd [OPTION]..." -Change the password protecting a \fIKey Entry\fR in a key store. -.IP "\fB\-delete [\fR\fI\s-1OPTION\s0\fR\fB]...\fR" 4 -.IX Item "-delete [OPTION]..." -Delete a \fIKey Entry\fR or a \fITrusted Certificate\fR from a key store. -.RE -.RS 4 -.RE -.PP -\fICommon options\fR -.IX Subsection "Common options" -.PP -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. -.IP "\fB\-alias\fR \fIAlias\fR" 4 -.IX Item "-alias Alias" -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. -.IP "\fB\-keyalg\fR \fI\s-1ALGORITHM\s0\fR" 4 -.IX Item "-keyalg ALGORITHM" -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). -.IP "\fB\-keysize\fR \fI\s-1SIZE\s0\fR" 4 -.IX Item "-keysize SIZE" -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. -.IP "\fB\-validity\fR \fI\s-1DAY_COUNT\s0\fR" 4 -.IX Item "-validity DAY_COUNT" -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. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -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. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -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. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -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. -.Sp -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. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -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. -.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-file FILE" -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. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -Unless specified otherwise, use this option to enable more verbose output. -.PP -\fIAdd/Update commands\fR -.IX Subsection "Add/Update commands" -.PP -The \fB\-genkey\fR command -.IX Subsection "The -genkey command" -.PP -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. -.PP -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. -.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-alias ALIAS" -See \fICommon Options\fR for more details. -.IP "\fB\-keyalg\fR \fI\s-1ALGORITHM\s0\fR" 4 -.IX Item "-keyalg ALGORITHM" -See \fICommon Options\fR for more details. -.IP "\fB\-keysize\fR \fI\s-1KEY_SIZE\s0\fR" 4 -.IX Item "-keysize KEY_SIZE" -See \fICommon Options\fR for more details. -.IP "\fB\-sigalg\fR \fI\s-1ALGORITHM\s0\fR" 4 -.IX Item "-sigalg ALGORITHM" -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. -.IP "\fB\-dname\fR \fI\s-1NAME\s0\fR" 4 -.IX Item "-dname NAME" -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. -.Sp -See \fICommon Options\fR for more details. -.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-keypass PASSWORD" -Use this option to specify the password which the tool will use to protect the newly created \fIKey Entry\fR. -.Sp -If this option is omitted, you will be prompted to provide a password. -.IP "\fB\-validity\fR \fI\s-1DAY_COUNT\s0\fR" 4 -.IX Item "-validity DAY_COUNT" -See \fICommon Options\fR for more details. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.PP -The \fB\-import\fR command -.IX Subsection "The -import command" -.PP -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. -.PP -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. -.PP -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. -.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-alias ALIAS" -See \fICommon Options\fR for more details. -.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-file FILE" -See \fICommon Options\fR for more details. -.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-keypass PASSWORD" -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. -.Sp -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. -.IP "\fB\-noprompt\fR" 4 -.IX Item "-noprompt" -Use this option to prevent the tool from prompting the user. -.IP "\fB\-trustcacerts\fR" 4 -.IX Item "-trustcacerts" -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. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.PP -The \fB\-selfcert\fR command -.IX Subsection "The -selfcert command" -.PP -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). -.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-alias ALIAS" -See \fICommon Options\fR for more details. -.IP "\fB\-sigalg\fR \fI\s-1ALGORITHM\s0\fR" 4 -.IX Item "-sigalg ALGORITHM" -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. -.IP "\fB\-dname\fR \fI\s-1NAME\s0\fR" 4 -.IX Item "-dname NAME" -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. -.Sp -See \fICommon Options\fR for more details. -.IP "\fB\-validity\fR \fI\s-1DAY_COUNT\s0\fR" 4 -.IX Item "-validity DAY_COUNT" -See \fICommon Options\fR for more details. -.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-keypass PASSWORD" -Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR. -.Sp -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. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.PP -The \fB\-cacert\fR command -.IX Subsection "The -cacert command" -.PP -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. -.PP -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. -.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-file FILE" -See \fICommon Options\fR for more details. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.PP -The \fB\-identitydb\fR command -.IX Subsection "The -identitydb command" -.PP -\&\fB\s-1NOT\s0 \s-1IMPLEMENTED\s0 \s-1YET\s0\fR. -.PP -Use this command to import a \s-1JDK\s0 1.1 style Identity Database. -.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-file FILE" -See \fICommon Options\fR for more details. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.PP -\fIExport commands\fR -.IX Subsection "Export commands" -.PP -The \fB\-certreq\fR command -.IX Subsection "The -certreq command" -.PP -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: -.PP -.Vb 6 -\& \-\-\-\-\-BEGIN NEW CERTIFICATE REQUEST\-\-\-\-\- -\& MI...QAwXzEUMBIGA1UEAwwLcnNuQGdudS5vcmcxGzAZBgNVBAoMElUg -\& Q2...A0GA1UEBwwGU3lkbmV5MQwwCgYDVQQIDANOU1cxCzAJBgNVBACC -\& ... -\& FC...IVwNVOfQLRX+O5kAhQ/a4RTZme2L8PnpvgRwrf7Eg8D6w== -\& \-\-\-\-\-END NEW CERTIFICATE REQUEST\-\-\-\-\- -.Ve -.PP -\&\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. -.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-alias ALIAS" -See \fICommon Options\fR for more details. -.IP "\fB\-sigalg\fR \fI\s-1ALGORITHM\s0\fR" 4 -.IX Item "-sigalg ALGORITHM" -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. -.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-file FILE" -See \fICommon Options\fR for more details. -.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-keypass PASSWORD" -Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR. -.Sp -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. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.IP "\fB\-attributes\fR" 4 -.IX Item "-attributes" -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. -.PP -The \fB\-export\fR command -.IX Subsection "The -export command" -.PP -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). -.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-alias ALIAS" -See \fICommon Options\fR for more details. -.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-file FILE" -See \fICommon Options\fR for more details. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-rfc\fR" 4 -.IX Item "-rfc" -Use \s-1RFC\-1421\s0 specifications when encoding the output. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -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. -.PP -\fIDisplay commands\fR -.IX Subsection "Display commands" -.PP -The \fB\-list\fR command -.IX Subsection "The -list command" -.PP -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. -.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-alias ALIAS" -If this option is omitted, the tool will print \s-1ALL\s0 the entries found in the key store. -.Sp -See \fICommon Options\fR for more details. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-rfc\fR" 4 -.IX Item "-rfc" -Use \s-1RFC\-1421\s0 specifications when encoding the output. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -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. -.PP -The \fB\-printcert\fR command -.IX Subsection "The -printcert command" -.PP -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. -.IP "\fB\-file\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-file FILE" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.PP -\fIManagement commands\fR -.IX Subsection "Management commands" -.PP -The \fB\-keyclone\fR command -.IX Subsection "The -keyclone command" -.PP -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. -.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-alias ALIAS" -See \fICommon Options\fR for more details. -.IP "\fB\-dest\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-dest ALIAS" -Use this option to specify the new \fIAlias\fR which will be used to identify the cloned copy of the \fIKey Entry\fR. -.IP "\fB\-keypass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-keypass PASSWORD" -Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR. -.Sp -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. -.IP "\fB\-new\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-new PASSWORD" -Use this option to specify the password protecting the private key material of the newly cloned copy of the \fIKey Entry\fR. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.PP -The \fB\-storepasswd\fR command -.IX Subsection "The -storepasswd command" -.PP -Use this command to change the password protecting a key store. -.IP "\fB\-new\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-new PASSWORD" -The new, and different, password which will be used to protect the designated key store. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.PP -The \fB\-keypasswd\fR command -.IX Subsection "The -keypasswd command" -.PP -Use this command to change the password protecting the private key material of a designated \fIKey Entry\fR. -.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-alias ALIAS" -See \fICommon Options\fR for more details. -.Sp -Use this option to specify the password which the tool will use to unlock the \fIKey Entry\fR associated with the designated \fIAlias\fR. -.Sp -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. -.IP "\fB\-new\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-new PASSWORD" -The new, and different, password which will be used to protect the private key material of the designated \fIKey Entry\fR. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.PP -The \fB\-delete\fR command -.IX Subsection "The -delete command" -.PP -Use this command to delete a designated key store entry. -.IP "\fB\-alias\fR \fI\s-1ALIAS\s0\fR" 4 -.IX Item "-alias ALIAS" -See \fICommon Options\fR for more details. -.IP "\fB\-storetype\fR \fI\s-1STORE_TYPE\s0\fR" 4 -.IX Item "-storetype STORE_TYPE" -See \fICommon Options\fR for more details. -.IP "\fB\-keystore\fR \fI\s-1URL\s0\fR" 4 -.IX Item "-keystore URL" -See \fICommon Options\fR for more details. -.IP "\fB\-storepass\fR \fI\s-1PASSWORD\s0\fR" 4 -.IX Item "-storepass PASSWORD" -See \fICommon Options\fR for more details. -.IP "\fB\-provider\fR \fI\s-1PROVIDER_CLASS_NAME\s0\fR" 4 -.IX Item "-provider PROVIDER_CLASS_NAME" -See \fICommon Options\fR for more details. -.IP "\fB\-v\fR" 4 -.IX Item "-v" -See \fICommon Options\fR for more details. -.SH "SEE ALSO" -.IX Header "SEE ALSO" diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gnative2ascii.1 gcc-4.3.3/libjava/classpath/doc/gnative2ascii.1 --- gcc-4.3.3.orig/libjava/classpath/doc/gnative2ascii.1 2009-01-24 04:05:55.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/gnative2ascii.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,169 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GNATIVE2ASCII 1" -.TH GNATIVE2ASCII 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -gnative2ascii \- \- An encoding converter -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -gnative2ascii [\fI\s-1OPTIONS\s0\fR]... [\fI\s-1INPUTFILE\s0\fR [\fI\s-1OUTPUTFILE\s0\fR]] -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -To be written ... -.SH "OPTIONS" -.IX Header "OPTIONS" -.IP "\fB\-encoding\fR \fI\s-1NAME\s0\fR" 4 -.IX Item "-encoding NAME" -Set the encoding to use. -.IP "\fB\-reversed\fR" 4 -.IX Item "-reversed" -Convert from encoding to native. -.PP -Standard options: -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Print help text, then exit. -.IP "\fB\-version\fR" 4 -.IX Item "-version" -Print version number, then exit. -.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4 -.IX Item "-JOPTION" -Pass argument to the Java runtime. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIjavac\fR\|(1), ... diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gorbd.1 gcc-4.3.3/libjava/classpath/doc/gorbd.1 --- gcc-4.3.3.orig/libjava/classpath/doc/gorbd.1 2009-01-24 04:05:56.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/gorbd.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,176 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GORBD 1" -.TH GORBD 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -gorbd \- \- An object request broker daemon -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -gorbd ... -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -To be written ... -.SH "OPTIONS" -.IX Header "OPTIONS" -.IP "\fB\-ORBInitialPort\fR \fI\s-1PORT\s0\fR" 4 -.IX Item "-ORBInitialPort PORT" -Port on which persistent naming service is to be started. -.IP "\fB\-ior\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-ior FILE" -File in which to store persistent naming service's \s-1IOR\s0 reference -.IP "\fB\-directory\fR \fI\s-1DIR\s0\fR" 4 -.IX Item "-directory DIR" -Directory in which to store persistent data. -.IP "\fB\-restart\fR" 4 -.IX Item "-restart" -Restart persistent naming service, clearing persistent naming -database. -.PP -Standard options: -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Print help text, then exit. -.IP "\fB\-version\fR" 4 -.IX Item "-version" -Print version number, then exit. -.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4 -.IX Item "-JOPTION" -Pass argument to the Java runtime. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIjava\fR\|(1), ... diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/grmid.1 gcc-4.3.3/libjava/classpath/doc/grmid.1 --- gcc-4.3.3.orig/libjava/classpath/doc/grmid.1 2009-01-24 04:05:56.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/grmid.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,188 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GRMID 1" -.TH GRMID 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -grmid \- \- RMI activation system daemon -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -grmid [\fI\s-1OPTIONS\s0\fR]... -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -\&\fBrmiregistry\fR starts a remote object registry on the current -host. If no port number is specified, then port 1099 is used. -.SH "OPTIONS" -.IX Header "OPTIONS" -Activation process control: -.IP "\fB\-port\fR \fI\s-1PORT\s0\fR" 4 -.IX Item "-port PORT" -Port on which activation system is to be started. -.IP "\fB\-restart\fR" 4 -.IX Item "-restart" -Restart activation system, clearing persistent naming database, if -any. -.IP "\fB\-stop\fR" 4 -.IX Item "-stop" -Stop activation system. -.PP -Persistence: -.IP "\fB\-persistent\fR" 4 -.IX Item "-persistent" -Make activation system persistent. -.IP "\fB\-directory\fR \fI\s-1DIR\s0\fR" 4 -.IX Item "-directory DIR" -Directory in which to store persistent data. -.PP -Debugging: -.IP "\fB\-verbose\fR" 4 -.IX Item "-verbose" -Log binding events to standard out. -.PP -Standard options: -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Print help text, then exit. -.IP "\fB\-version\fR" 4 -.IX Item "-version" -Print version number, then exit. -.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4 -.IX Item "-JOPTION" -Pass argument to the Java runtime. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIjava\fR\|(1), ... diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/grmiregistry.1 gcc-4.3.3/libjava/classpath/doc/grmiregistry.1 --- gcc-4.3.3.orig/libjava/classpath/doc/grmiregistry.1 2009-01-24 04:05:56.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/grmiregistry.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,185 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GRMIREGISTRY 1" -.TH GRMIREGISTRY 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -grmiregistry \- \- Remote object registry -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -grmiregistry [\fI\s-1OPTIONS\s0\fR]... \fI\s-1PORT\s0\fR -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -\&\fBgrmiregistry\fR starts a remote object registry on the current -host. If no port number is specified, then port 1099 is used. -.SH "OPTIONS" -.IX Header "OPTIONS" -Registry process control: -.IP "\fB\-restart\fR" 4 -.IX Item "-restart" -Restart \s-1RMI\s0 naming service, clearing persistent naming database, if -any. -.IP "\fB\-stop\fR" 4 -.IX Item "-stop" -Stop \s-1RMI\s0 naming service. -.PP -Persistence: -.IP "\fB\-persistent\fR" 4 -.IX Item "-persistent" -Make \s-1RMI\s0 naming service persistent. -.IP "\fB\-directory\fR \fI\s-1DIR\s0\fR" 4 -.IX Item "-directory DIR" -Directory in which to store persistent data. -.PP -Debugging: -.IP "\fB\-verbose\fR" 4 -.IX Item "-verbose" -Log binding events to standard out. -.PP -Standard options: -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Print help text, then exit. -.IP "\fB\-version\fR" 4 -.IX Item "-version" -Print version number, then exit. -.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4 -.IX Item "-JOPTION" -Pass argument to the Java runtime. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIjava\fR\|(1), ... diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gserialver.1 gcc-4.3.3/libjava/classpath/doc/gserialver.1 --- gcc-4.3.3.orig/libjava/classpath/doc/gserialver.1 2009-01-24 04:05:56.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/gserialver.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,166 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GSERIALVER 1" -.TH GSERIALVER 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -gserialver \- version command -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -gserialver [\fI\s-1OPTIONS\s0\fR]... \fI\s-1CLASS\s0\fR... -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -Print the serialVersionUID of the specified classes. -.SH "OPTIONS" -.IX Header "OPTIONS" -.IP "\fB\-classpath\fR \fI\s-1PATH\s0\fR" 4 -.IX Item "-classpath PATH" -Class path to use to find classes. -.PP -Standard options: -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Print help text, then exit. -.IP "\fB\-version\fR" 4 -.IX Item "-version" -Print version number, then exit. -.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4 -.IX Item "-JOPTION" -Pass argument to the Java runtime. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIjavac\fR\|(1), ... diff -Naur gcc-4.3.3.orig/libjava/classpath/doc/gtnameserv.1 gcc-4.3.3/libjava/classpath/doc/gtnameserv.1 --- gcc-4.3.3.orig/libjava/classpath/doc/gtnameserv.1 2009-01-24 04:05:56.000000000 -0800 +++ gcc-4.3.3/libjava/classpath/doc/gtnameserv.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,169 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "GTNAMESERV 1" -.TH GTNAMESERV 1 "2009-01-24" "0.96-pre" "GNU" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -gtnameserv \- Naming service -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -tnameserv [\fI\s-1OPTIONS\s0\fR] -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -To be written ... -.SH "OPTIONS" -.IX Header "OPTIONS" -.IP "\fB\-ORBInitialPort\fR \fI\s-1PORT\s0\fR" 4 -.IX Item "-ORBInitialPort PORT" -Port on which naming service is to be started. -.IP "\fB\-ior\fR \fI\s-1FILE\s0\fR" 4 -.IX Item "-ior FILE" -File in which to store naming service's \s-1IOR\s0 reference. -.PP -Standard options: -.IP "\fB\-help\fR" 4 -.IX Item "-help" -Print help text, then exit. -.IP "\fB\-version\fR" 4 -.IX Item "-version" -Print version number, then exit. -.IP "\fB\-J\fR\fI\s-1OPTION\s0\fR" 4 -.IX Item "-JOPTION" -Pass argument to the Java runtime. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIjava\fR\|(1), ... diff -Naur gcc-4.3.3.orig/libjava/java/lang/natClassLoader.cc gcc-4.3.3/libjava/java/lang/natClassLoader.cc --- gcc-4.3.3.orig/libjava/java/lang/natClassLoader.cc 2007-05-31 02:30:39.000000000 -0700 +++ gcc-4.3.3/libjava/java/lang/natClassLoader.cc 2009-03-13 11:19:59.111425000 -0700 @@ -325,6 +325,15 @@ if (! klass->engine) klass->engine = &_Jv_soleCompiledEngine; + /* FIXME: Way back before the dawn of time, we overloaded the + SYNTHETIC class access modifier to mean INTERPRETED. This was a + Bad Thing, but it didn't matter then because classes were never + marked synthetic. However, it is possible to redeem the + situation: _Jv_RegisterClassHookDefault is only called from + compiled classes, so we clear the INTERPRETED flag. This is a + kludge! */ + klass->accflags &= ~java::lang::reflect::Modifier::INTERPRETED; + if (system_class_list != SYSTEM_LOADER_INITIALIZED) { unsigned long abi = (unsigned long) klass->next_or_version; diff -Naur gcc-4.3.3.orig/libstdc++-v3/ChangeLog gcc-4.3.3/libstdc++-v3/ChangeLog --- gcc-4.3.3.orig/libstdc++-v3/ChangeLog 2009-01-24 02:16:26.000000000 -0800 +++ gcc-4.3.3/libstdc++-v3/ChangeLog 2009-03-14 17:43:46.944434000 -0700 @@ -1,3 +1,36 @@ +2009-03-14 Paolo Carlini + + PR libstdc++/39405 + * include/std/type_traits (__add_lvalue_reference_helper, + __add_rvalue_reference_helper): Avoid is_function. + * testsuite/20_util/shared_ptr/cons/39405.cc: New. + * testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc: Likewise. + +2009-02-09 Johannes Singler + + Backport from mainline: + 2009-02-03 Johannes Singler + + * include/parallel/algorithmfwd.h: + Add parallelism default for many declarations. + * include/parallel/numericfwd.h: Likewise. + * include/parallel/iterator.h: Use iterator_traits as usual. + * include/parallel/par_loop.h: + Include equally_split.h. + (for_each_template_random_access_ed): + Avoid calling the Result default constructor. + * include/parallel/numeric: Replace + for_each_template_random_access by + for_each_template_random_access_ed in numeric functions. + +2009-01-27 Uros Bizjak + + Backport from mainline: + 2009-01-13 Uros Bizjak + + * scripts/extract_symvers: Add sed script to remove ' [: xx] ' + field from readelf output. + 2009-01-24 Release Manager * GCC 4.3.3 released. diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/parallel/algorithmfwd.h gcc-4.3.3/libstdc++-v3/include/parallel/algorithmfwd.h --- gcc-4.3.3.orig/libstdc++-v3/include/parallel/algorithmfwd.h 2008-02-17 16:00:00.000000000 -0800 +++ gcc-4.3.3/libstdc++-v3/include/parallel/algorithmfwd.h 2009-02-09 02:08:11.942408000 -0800 @@ -99,7 +99,8 @@ template typename iterator_traits<_RAIter>::difference_type count_switch(_RAIter, _RAIter, const _Tp&, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_unbalanced); template @@ -121,7 +122,8 @@ template typename iterator_traits<_RAIter>::difference_type count_if_switch(_RAIter, _RAIter, _Predicate, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_unbalanced); // algobase.h template @@ -228,7 +230,8 @@ template _Function for_each_switch(_RAIter, _RAIter, _Function, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_balanced); template @@ -250,7 +253,8 @@ template void generate_switch(_RAIter, _RAIter, _Generator, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_balanced); template _OIter @@ -272,7 +276,8 @@ template _RAIter generate_n_switch(_RAIter, _Size, _Generator, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_balanced); template bool @@ -429,7 +434,8 @@ _RAOIter transform1_switch(_RAIIter, _RAIIter, _RAOIter, UnaryOperation, random_access_iterator_tag, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_balanced); template _RAIter max_element_switch(_RAIter, _RAIter, _Compare, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_balanced); template @@ -615,7 +623,8 @@ template _RAIter min_element_switch(_RAIter, _RAIter, _Compare, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_balanced); template void diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/parallel/iterator.h gcc-4.3.3/libstdc++-v3/include/parallel/iterator.h --- gcc-4.3.3.orig/libstdc++-v3/include/parallel/iterator.h 2008-01-09 10:27:27.000000000 -0800 +++ gcc-4.3.3/libstdc++-v3/include/parallel/iterator.h 2009-02-09 02:08:11.942408000 -0800 @@ -131,7 +131,8 @@ public: typedef IteratorCategory iterator_category; typedef void value_type; - typedef typename Iterator1::difference_type difference_type; + typedef typename std::iterator_traits::difference_type + difference_type; typedef type* pointer; typedef type& reference; diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/parallel/numeric gcc-4.3.3/libstdc++-v3/include/parallel/numeric --- gcc-4.3.3.orig/libstdc++-v3/include/parallel/numeric 2008-02-17 16:00:00.000000000 -0800 +++ gcc-4.3.3/libstdc++-v3/include/parallel/numeric 2009-02-09 02:08:11.942408000 -0800 @@ -103,13 +103,13 @@ __gnu_parallel::accumulate_selector<_RandomAccessIterator> my_selector; __gnu_parallel:: - for_each_template_random_access(begin, end, + for_each_template_random_access_ed(begin, end, __gnu_parallel::nothing(), my_selector, __gnu_parallel:: accumulate_binop_reduct (binary_op), - res, res, -1, parallelism_tag); + res, res, -1); return res; } else @@ -211,9 +211,9 @@ inner_product_selector my_selector(first1, first2); __gnu_parallel:: - for_each_template_random_access(first1, last1, binary_op2, + for_each_template_random_access_ed(first1, last1, binary_op2, my_selector, binary_op1, - res, res, -1, parallelism_tag); + res, res, -1); return res; } else @@ -432,10 +432,10 @@ end_pair(end, result + (end - begin)); __gnu_parallel::adjacent_difference_selector functionality; __gnu_parallel:: - for_each_template_random_access(begin_pair, end_pair, bin_op, + for_each_template_random_access_ed(begin_pair, end_pair, bin_op, functionality, __gnu_parallel::dummy_reduct(), - dummy, dummy, -1, parallelism_tag); + dummy, dummy, -1); return functionality.finish_iterator; } else diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/parallel/numericfwd.h gcc-4.3.3/libstdc++-v3/include/parallel/numericfwd.h --- gcc-4.3.3.orig/libstdc++-v3/include/parallel/numericfwd.h 2008-02-17 16:00:00.000000000 -0800 +++ gcc-4.3.3/libstdc++-v3/include/parallel/numericfwd.h 2009-02-09 02:08:11.942408000 -0800 @@ -83,7 +83,8 @@ _Tp accumulate_switch(_RAIter, _RAIter, _Tp, _BinaryOper, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_unbalanced); template _OIter @@ -124,7 +125,8 @@ adjacent_difference_switch(_IIter, _IIter, _OIter, _BinaryOper, random_access_iterator_tag, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism parallelism + = __gnu_parallel::parallel_unbalanced); template _Tp @@ -164,7 +166,8 @@ inner_product_switch(_RAIter1, _RAIter1, _RAIter2, _Tp, BinaryFunction1, BinaryFunction2, random_access_iterator_tag, random_access_iterator_tag, - __gnu_parallel::_Parallelism); + __gnu_parallel::_Parallelism + = __gnu_parallel::parallel_unbalanced); template #include #include +#include namespace __gnu_parallel { @@ -80,9 +81,9 @@ { typedef std::iterator_traits traits_type; typedef typename traits_type::difference_type difference_type; - const difference_type length = end - begin; Result *thread_results; + bool* constructed; thread_index_t num_threads = __gnu_parallel::min(get_max_threads(), length); @@ -92,13 +93,15 @@ # pragma omp single { num_threads = omp_get_num_threads(); - thread_results = new Result[num_threads]; + thread_results = static_cast( + ::operator new(num_threads * sizeof(Result))); + constructed = new bool[num_threads]; } thread_index_t iam = omp_get_thread_num(); // Neutral element. - Result reduct = Result(); + Result* reduct = static_cast(::operator new(sizeof(Result))); difference_type start = equally_split_point(length, num_threads, iam), @@ -106,23 +109,30 @@ if (start < stop) { - reduct = f(o, begin + start); + new(reduct) Result(f(o, begin + start)); ++start; + constructed[iam] = true; } + else + constructed[iam] = false; for (; start < stop; ++start) - reduct = r(reduct, f(o, begin + start)); + *reduct = r(*reduct, f(o, begin + start)); - thread_results[iam] = reduct; + thread_results[iam] = *reduct; } //parallel for (thread_index_t i = 0; i < num_threads; ++i) - output = r(output, thread_results[i]); + if (constructed[i]) + output = r(output, thread_results[i]); // Points to last element processed (needed as return value for // some algorithms like transform). f.finish_iterator = begin + length; + delete[] thread_results; + delete[] constructed; + return o; } diff -Naur gcc-4.3.3.orig/libstdc++-v3/include/std/type_traits gcc-4.3.3/libstdc++-v3/include/std/type_traits --- gcc-4.3.3.orig/libstdc++-v3/include/std/type_traits 2008-03-26 16:21:44.000000000 -0700 +++ gcc-4.3.3/libstdc++-v3/include/std/type_traits 2009-03-14 17:43:46.944434000 -0700 @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2007, 2008 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -107,7 +107,7 @@ { typedef _Tp type; }; template::value || is_function<_Tp>::value, + bool = !is_reference<_Tp>::value && !is_void<_Tp>::value, bool = is_rvalue_reference<_Tp>::value> struct __add_lvalue_reference_helper { typedef _Tp type; }; @@ -127,7 +127,7 @@ { }; template::value || is_function<_Tp>::value> + bool = !is_reference<_Tp>::value && !is_void<_Tp>::value> struct __add_rvalue_reference_helper { typedef _Tp type; }; diff -Naur gcc-4.3.3.orig/libstdc++-v3/scripts/extract_symvers gcc-4.3.3/libstdc++-v3/scripts/extract_symvers --- gcc-4.3.3.orig/libstdc++-v3/scripts/extract_symvers 2005-08-16 19:28:44.000000000 -0700 +++ gcc-4.3.3/libstdc++-v3/scripts/extract_symvers 2009-01-27 03:39:42.241832000 -0800 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc. # # This file is part of the GNU ISO C++ Library. This library is free # software; you can redistribute it and/or modify it under the @@ -52,7 +52,9 @@ tmp=extract.$$ -${readelf} ${lib} | sed '/\.dynsym/,/^$/p;d' | egrep -v ' (LOCAL|UND) ' |\ +${readelf} ${lib} |\ +sed -e 's/ \[: [A-Fa-f0-9]*\] //' -e '/\.dynsym/,/^$/p;d' |\ +egrep -v ' (LOCAL|UND) ' |\ awk '{ if ($4 == "FUNC" || $4 == "NOTYPE") printf "%s:%s\n", $4, $8; else if ($4 == "OBJECT") diff -Naur gcc-4.3.3.orig/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc gcc-4.3.3/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc --- gcc-4.3.3.orig/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc 2009-03-14 17:43:46.944434000 -0700 @@ -0,0 +1,31 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } + +// Copyright (C) 2009 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include + +// libstdc++/39405 +template + struct foo + { + std::shared_ptr > m_foo; + }; + +std::shared_ptr > t; diff -Naur gcc-4.3.3.orig/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc gcc-4.3.3/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc --- gcc-4.3.3.orig/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc 1969-12-31 16:00:00.000000000 -0800 +++ gcc-4.3.3/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc 2009-03-14 17:43:46.944434000 -0700 @@ -0,0 +1,30 @@ +// { dg-do compile } + +// Copyright (C) 2009 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include + +// libstdc++/39405 +template + struct foo + { + std::tr1::shared_ptr > m_foo; + }; + +std::tr1::shared_ptr > t;