* tlink.c (scan_linker_output): Skip the initial underscore in

	a mangled name if appropriate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29083 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 685 insertions, 1 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 43050d61962..edbc6d3643a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep  3 09:14:32 1999  Marc Espie <espie@tetto.liafa.jussieu.fr>
+
+	* tlink.c (scan_linker_output): Skip the initial underscore in
+	a mangled name if appropriate.
+
 Fri Sep  3 01:28:33 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* objc/objc-act.c (objc_tree_code_type, objc_tree_code_length,
@@ -2786,6 +2791,548 @@ Sat Jul 31 11:10:07 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
 	* Makefile.in: Update dependencies.
 
 Sat Jul 31 04:10:01 1999  Jeffrey A Law  (law@cygnus.com)
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+
+	* pa.c (compute_frame_size): Use STARTINg_FRAME_OFFSET instead
+	of depending on a magic constant value.  Update comments.
+	(hppa_expand_prologue): Similarly.
+
+	* pa.md (reload_indi, reload_outdi): Allow any register for the
+	original reload register.
+
+Fri Jul 30 19:41:35 1999  Jim Wilson  <wilson@cygnus.com>
+
+	* cccp.c (print_help): Change marcos to macros.
+
+1999-07-30  Richard Henderson  <rth@cygnus.com>
+
+	* c-typeck.c (initializer_constant_valid_p): Move ...
+	* c-common.c (initializer_constant_valid_p): ... here.  Use 
+	FOO_TYPE_P instead of tests against TREE_CODE.  Allow subtraction
+	of label addresses.
+	* c-common.h (initializer_constant_valid_p): Declare.
+	* c-tree.h (initializer_constant_valid_p): Remove.
+
+Fri Jul 30 16:33:42 1999  Mathias Froehlich  <frohlich@na.uni-tuebingen.de>
+
+	* config/i386/sol2-c1.asm: Align the stack.
+	* config/i386/sol2-gc1.asm: Likewise.
+
+1999-07-30  Vladimir Makarov  <vmakarov@loony.cygnus.com>
+
+	* config/sparc/sparc.h (ASM_CPU32_DEFAULT_SPEC): Change -Av8 onto
+ 	-Asparclite for sparc86x.
+	(CPP_CPU32_DEFAULT_SPEC, CPP_CPU_SPEC): Remove -D__sparc_v8__ for
+ 	sparc86x.
+	(ASM_CPU_SPEC): Use -Asparclite for sparc86x.
+
+Fri Jul 30 14:53:56 1999  Jakub Jelinek  <jj@ultra.linux.cz>
+
+	* config/sparc/linux64.h (CC1_SPEC): Preserve CPU specified by
+	the user if using the non-default arch size in BI_ARCH configuration.
+	* config/sparc/sol2-sld-64.h (CC1_SPEC): Ditto.
+
+	* config/sparc/sparc.md (cmp_mul_set, cmp_udiv_cc_set):
+	Fix patterns so that they actually match.
+	(cmp_sdiv_cc_set): Ditto, also don't require g0 to be zero.
+	(mulsidi3_sp64, const_mulsidi3_sp64): New patterns.
+	(const_mulsidi3_sp32): Renamed from const_mulsidi3, only on
+	TARGET_HARD_MUL32.
+	(mulsidi3): Reflect this in the expand.
+	(smulsi3_highpart): Only on TARGET_ARCH32.
+	(umulsidi3_sp64, const_umulsidi3_sp64): New patterns.
+	(const_umulsidi3_sp32): Renamed from const_umulsidi3.
+	(umulsidi3): Reflect this in the expand.
+	(umulsi3_highpart): Only on TARGET_ARCH32.
+	(divsi3_sp32): Renamed from divsi3, only on TARGET_ARCH32,
+	don't require g0 to be zero.
+	(udivsi3_sp32): Renamed from udivsi3, only on TARGET_ARCH32.
+	({,u}divsi3): New expands.
+	({,u}divsi3_sp64): New patterns.
+	(after lshrdi3_v8plus): Four new patterns to help combiner
+	optimizing nested mixed mode shifts.
+
+	* config/sparc/sparc.c (sparc_override_options): Use deprecated
+	v8 instructions if optimizing for UltraSPARC I, II, IIi, as it
+	speed things up. Don't use them by default on plain v9 in 64bit
+	mode, according to what SPAMv9 sais.
+
+	* config/sparc/sparc.h: Fix comments, e.g. Linux already preserves
+	top 32 bits of %[og][0-7] in signal handlers.
+	Also, TARGET_HARD_MUL32 now is only true for TARGET_ARCH32.
+
+Fri Jul 30 03:00:41 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* pa.md (zvdep_imm32): Renamed from zvdep_imm.
+	(ashlsi3): Corresponding changes.
+
+	* pa.c (compute_zdepwi_operands): Renamed from compute_zdepi_operands.
+
+Thu Jul 29 18:37:13 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* pa.h (FIRST_PARM_CALLER_OFFSET): Delete.
+
+Thu Jul 29 19:01:58 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* arm.h (Hint): Delete macro.
+	Substitute HOST_WIDE_INT for Hint in some prototypes.
+	* arm.c: Substitute HOST_WIDE_INT for Hint in one prototype.
+
+Thu Jul 29 09:21:42 1999  Nick Clifton  <nickc@cygnus.com>
+
+	* builtins.c (expand_builtin_setjmp): Use force_operand to
+	make sure that the buffer address is in a suitable form to be
+	passed to force_reg.
+
+Wed Jul 28 12:50:48 1999  Geoff Keating  <geoffk@cygnus.com>
+
+	* config/mips/mips.c: system.h handles MIN and MAX, don't undefine
+	them here.
+
+Wed Jul 28 13:18:35 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* pa.md (indirect_jump): Remove mode from match_operand.  Verify
+	proper mode in the condition string.
+	(icacheflush, dcacheflush): Remove modes from match_operands.
+
+	* pa.c (emit_move_sequence): Always convert scratch_reg to the
+	proper mode before using it.
+
+	* pa.md (adddi3, subdi3): Turn into a define_expand/define_insn
+	pair.
+
+	* pa.c (store_reg): Do not call add_high_const generator directly.
+	(load_reg, set_reg_plus_d): Likewise.
+	* pa.md (add_high_const): No longer a named pattern.
+
+	* pa.c (legitimize_address): Consistently use Pmode rather than
+	SImode.  Do not call gen_pic2_highpart directly anymore.
+	* pa.md (pic2_highpart): No longer a named pattern.
+	(pic2_lo_sum): Similarly.  Reformat to make more readable.
+
+	* pa.md (call, call_value): Use "word_mode" instead of "SImode" as
+	needed.
+
+	* README: Update.
+
+Wed Jul 28 11:28:04 1999  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+	* builtins.c (expand_builtin): Typo in call to expand_builtin_ffs.
+=======
+>>>>>>> 1.4237
+
+<<<<<<< ChangeLog
+Wed Jul 28 11:23:48 1999  Richard Henderson  <rth@cygnus.com>
+
+	* pa.c (hppa_builtin_saveregs):  Use get_varargs_alias_set
+	and tag the spill mems.
+	(hppa_va_start): New.
+	(hppa_va_arg): New.
+	* pa.h (EXPAND_BUILTIN_VA_START): New.
+	(EXPAND_BUILTIN_VA_ARG): New.
+
+Wed Jul 28 11:22:21 1999  Richard Henderson  <rth@cygnus.com>
+
+	* mn10300.c (mn10300_builtin_saveregs): Use get_varargs_alias_set
+	and tag the spill mems.
+	(mn10300_va_start): New.
+	(mn10300_va_arg): New.
+	* mn10300.h (EXPAND_BUILTIN_VA_START): New.
+	(EXPAND_BUILTIN_VA_ARG): New.
+
+Wed Jul 28 11:20:19 1999  Richard Henderson  <rth@cygnus.com>
+
+	* mn10200.c (mn10200_va_arg): New.
+	* mn10200.h (EXPAND_BUILTIN_VA_ARG): New.
+
+Wed Jul 28 11:19:06 1999  Richard Henderson  <rth@cygnus.com>
+
+	* builtins.c (std_expand_builtin_va_arg): Use int_size_in_bytes
+	rather than play with TREE_INT_CST_LOW.
+
+1999-07-27  Philip Blundell  <pb@nexus.co.uk>
+
+	* config/arm/telf.h: Include dbxelf.h.
+ 	(CPP_PREDEFINES): Only define if not already defined.
+	(ASM_IDENTIFY_GCC): Likewise.
+	(SUBTARGET_EXTRA_SECTIONS): Likewise.
+	(SUBTARGET_EXTRA_SECTION_FUNCTIONS): Likewise.
+	* config/arm/thumb.h (LINK_SPEC): Only define if not already
+	defined.
+	(DBX_DEBUGGING_INFO): Don't define.
+	* config/arm/linux-telf.h: New file.
+	* config/arm/linux-tgas.h: New file.
+	* config/arm/t-thumb-linux: New file.
+	* config/arm/uclinux-elf.h: New file.
+	* config/arm/uclinux-telf.h: New file.
+	* configure.in (arm-*-uclinux, thumb-*-linux-gnu,
+	thumb-*-uclinux): New targets.
+	* configure: Regenerate.
+
+Tue Jul 27 23:20:21 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* pa.md (post_store, pre_load): New expanders.
+	(post_stwm, pre_ldwm): Renamed to post_stw and pre_ldw respectively.
+	(post_ldwm, pre_stwm): Make these unnamed patterns since we never
+	need to directly generate RTL for them.
+	* pa.c (hppa_expand_prologue, hppa_expand_epilogue): Corresponding
+	changes.
+
+Tue Jul 27 16:05:52 1999  David Edelsohn  <edelsohn@gnu.org>
+
+	* aix43.h (ASM_CPU_SPEC, CPP_CPU_SPEC): Add rs64a and PPC630.
+	* rs6000.c (processor_target_table): Add powerpc64, rs64a, and PPC630.
+	(rs6000_cpu): Choose between 32-bit and 64-bit default processors.
+	(secndary_reload_class): Make TARGET_ELF conditional compile.
+	(print_operand_address): Similar.
+	(output_toc): Print all values as hex.
+	(get_issue_rate): Rearrange and add RS64A and PPC630.
+	* rs6000.h (processor_type): Add RS64A and PPC630.
+	(PROCESSOR_POWERPC64): New.
+	(PROMOTE_MODE): Use word_mode.
+	(RTX_COSTS): Add RS64A and PPC630.
+	* rs6000.md (scheduling information): Add lmul and ldiv
+	representing 64-bit integer multiply and divide.  Add rs64a and
+	PPC630 information.
+	(ashldi3): Add support for "rldic" instruction.
+	* sysv4.h (PROCESSOR_DEFAULT): Change to PROCESSOR_750.
+	
+Tue Jul 27 15:31:53 1999  Vladimir Makarov  <vmakarov@toad.to.cygnus.com>
+
+	* config/sparc/sparc.c (sparc_override_options): Enable SPARCLITE
+	instead of V8 for sparclite86x in cpu_table.
+
+Tue Jul 27 17:49:42 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* config/arm/coff.h (ASM_FILE_START): If generating SDB output, call
+	output_file_directive.
+
+Tue Jul 27 03:15:33 1999  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* expr.c (expand_expr, case PLUS_EXPR): Get the mode from the 
+	tree for op1, not the rtl.
+
+Tue Jul 27 00:18:34 1999  Richard Henderson  <rth@cygnus.com>
+
+	* m88k.c (m88k_builtin_saveregs): Break out the constructor code
+	to m88k_va_start, leaving only the register spill.
+	(m88k_build_va_list): New.
+	(m88k_va_start): New.
+	(m88k_va_arg): New.
+	* m88k.h (BUILD_VA_LIST_TYPE): New.
+	(EXPAND_BUILTIN_VA_START): New.
+	(EXPAND_BUILTIN_VA_ARG): New.
+
+Mon Jul 26 19:07:11 1999  Geoff Keating  <geoffk@cygnus.com>
+
+	* config/rs6000/rs6000.c (rs6000_expand_builtin_saveregs):
+	Rename from expand_builtin_saveregs.
+	* config/rs6000/rs6000.h (EXPAND_BUILTIN_SAVEREGS): Change caller.
+
+Mon Jul 26 22:52:47 1999  Richard Henderson  <rth@cygnus.com>
+
+	* i960.c (i960_setup_incoming_varargs): Use get_varargs_alias_set
+	for the register spill block.
+	(i960_build_va_list): New.
+	(i960_va_start): New.
+	(i960_va_arg): New.
+	* i960.h (BUILD_VA_LIST_TYPE): New.
+	(EXPAND_BUILTIN_VA_START): New.
+	(EXPAND_BUILTIN_VA_ARG): New.
+	* i960.md (store_multiple): Use change_address on individul mems.
+
+Mon Jul 26 22:43:12 1999  Richard Henderson  <rth@cygnus.com>
+
+	* builtins.c (stabilize_va_list): Don't INDIRECT_REF through
+	an ARRAY_TYPE.
+	(std_expand_builtin_va_start): Back out one word if !stdarg_p.
+	(expand_builtin_va_end): Evaluate arg for side effects.
+	* c-common.c (c_common_nodes_and_builtins): Construct a
+	va_list_arg_type_node to handle array decomposition to pointer.
+
+Mon Jul 26 18:51:34 1999  Richard Henderson  <rth@cygnus.com>
+
+	* except.c (start_dynamic_cleanup): Use force_operand on the
+	buffer's address.
+
+Mon Jul 26 16:43:26 1999  Richard Henderson  <rth@cygnus.com>
+
+	* c4x.h (EXPAND_BUILTIN_VA_ARG): New.
+	* c4x.c (c4x_va_arg): New.
+
+Mon Jul 26 12:30:09 1999  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cpplib.c (cpp_get_token): Don't return a CPP_POP if the buffer
+	has manual_pop set.
+
+1999-07-26  Nathan Sidwell  <nathan@acm.org>
+
+	* eh-common.h (__eh_matcher): Prototype correctly.
+
+Mon Jul 26 17:24:51 1999  Philip Blundell  <pb@nexus.co.uk>
+
+	* config/arm/thumb.h (THUMB_FLAG_SINGLE_PIC_BASE): Define.
+	(TARGET_SINGLE_PIC_BASE): Likewise.
+	(GOT_PCREL, NEED_GOT_RELOC, NEED_PLT_RELOC): Provide default
+	definitions.
+	(TARGET_CALLEE_INTERWORKING): Fix typo in comment.
+	(TARGET_SWITCHES): Add -m{no-}single-pic-base.
+	(TARGET_OPTIONS): Add -mpic-register=N.
+	(OUTPUT_INT_ADDR_CONST): New macro.
+	(INDEX_REGISTER_RTX_P, PIC_OFFSET_TABLE_REGNUM, FINALIZE_PIC,
+	LEGITIMATE_PIC_OPERAND_P): Likewise.
+	(LEGITIMIZE_ADDRESS, GOT_IF_LEGITIMATE_ADDRESS): Support PIC.
+	(ASM_OUTPUT_INT): Use OUTPUT_INT_ADDR_CONST rather than calling
+	output_addr_const directly.
+	(PRINT_OPERAND_PUNCT_VALID_P): Accept `|' for compatibility with 
+	ARM port.
+	(thumb_pic_register, thumb_pic_register_string): Declare.
+	
+	* config/arm/thumb.c (symbol_mentioned_p): New function: Imported
+	from arm.c.
+	(label_mentioned_p): New function: Imported from arm.c.
+	(legitimize_pic_address): New function: Imported from arm.c.
+	(is_pic):New function: Imported	from arm.c.
+	(thumb_finalize_pic):New function: Imported from arm.c.
+	(add_constant): Cope with PIC constants.
+	(fixit): Cope with PIC constants.
+	(output_return): Do not treat the PIC register as live if
+	TARGET_SINGLE_PIC_BASE is true.
+	(thumb_function_prologue): Do not treat the PIC register as live if
+	TARGET_SINGLE_PIC_BASE is true.
+	(thumb_expand_prologue): Do not treat the PIC register as live if
+	TARGET_SINGLE_PIC_BASE is true.
+	(thumb_unexpand_epilogue): Do not treat the PIC register as live if
+	TARGET_SINGLE_PIC_BASE is true.
+	(thumb_print_operand): Accept '|'.
+	(thumb_override_options): Process PIC options.
+	
+	* config/arm/thumb.md (movsi): Support PIC.
+	(call_insn): Change "i" constraint to "X".
+	(call_value_insn): Likewise.
+	(consttable_4, consttable_8, consttable_end): Set and clear
+	"making_const_table" as appropriate.
+	(pic_load_addr, pic_add_dot_plus_four): New insns.
+	
+	* invoke.texi (Thumb Options): Fix spelling.  Document new 
+	options -msingle-pic-base and -mpic-register=.
+	
+1999-07-26  Andrew Haley  <aph@cygnus.com>
+
+	* config/m32r/initfini.c (__init): Use a full word immediate for
+	__fini: this allows it to be placed in any memory region.
+
+	* config/m32r/t-m32r: Compile crtinit.o and crtfini.o for
+	-mmodel=medium.  This is OK for all memory models.
+
+Mon Jul 26 11:58:46 1999  Nick Clifton  <nickc@cygnus.com>
+
+	* config/arm/arm.c: Replace %R%s in asm_fprintf strings with %r.
+	* config/arm/arm.h: Replace %R%s in asm_fprintf strings with %r.
+
+Mon Jul 26 10:23:36 1999  Nick Clifton  <nickc@cygnus.com>
+
+	* final.c (asm_fprintf): Accept ASM_FPRINTF_EXTENSIONS, if
+	defined.
+
+	* tm.texi: Document ASM_FPRINTF_EXTENSIONS.
+
+Sun Jul 25 23:51:59 1999  Richard Henderson  <rth@cygnus.com>
+
+	* i860.h (EXPAND_BUILTIN_SAVEREGS): New.
+	(BUILD_VA_LIST_TYPE): New.
+	(EXPAND_BUILTIN_VA_START): New.
+	(EXPAND_BUILTIN_VA_ARG): New.
+	* i860.c (output_delayed_branch): Disable.
+	(output_delay_insn): Likewise.
+	(i860_saveregs): New.
+	(i860_build_va_list): New.
+	(i860_va_start): New.
+	(i860_va_arg): New.
+	* i860.md: Disable all peepholes using output_delayed_branch.
+	* i860/sysv4.h (I860_SVR4_VA_LIST): New.
+
+Sun Jul 25 23:44:13 1999  Richard Henderson  <rth@cygnus.com>
+
+	* clipper.h (EXPAND_BUILTIN_SAVEREGS): Remove argument.
+	(BUILD_VA_LIST_TYPE): New.
+	(EXPAND_BUILTIN_VA_START): New.
+	(EXPAND_BUILTIN_VA_ARG): New.
+	* clipper.c (clipper_builtin_saveregs): Only dump registers.
+	Return the address of the save area.
+	(clipper_build_va_list): New.
+	(clipper_va_start): New.
+	(clipper_va_arg): New.
+
+Sun Jul 25 22:56:47 1999  Richard Henderson  <rth@cygnus.com>
+
+	* arc.h (EXPAND_BUILTIN_VA_START): New.
+	(EXPAND_BUILTIN_VA_ARG): New.
+	* arc.c (arc_setup_incoming_varargs): Set alias set of 
+	varargs save area.
+	(arc_va_start): New.
+	(arc_va_arg): New.
+
+Sun Jul 25 22:45:55 1999  Richard Henderson  <rth@cygnus.com>
+
+	* alpha.h (EXPAND_BUILTIN_SAVEREGS): Delete.
+	(BUILD_VA_LIST_TYPE): New.
+	(EXPAND_BUILTIN_VA_START): New.
+	(EXPAND_BUILTIN_VA_ARG): New.
+	* alpha.c (alpha_builtin_saveregs): Delete.
+	(alpha_build_va_list): New.
+	(alpha_va_start): New.
+	(alpha_va_arg): New.
+
+Sun Jul 25 21:40:33 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* config/svr4.h (CTORS_SECTION_ASM_OP): Do not emit directives in
+	column zero.
+	(DTORS_SECTION_ASM_OP, INIT_SECTION_ASM_OP): Likewise.
+	(FINI_SECTION_ASM_OP, ASM_OUTPUT_SECTION_NAME): Likewise.
+
+	* gcc.texi: More changes related to list conversion.
+	* invoke.texi: Likewise.
+
+Sun Jul 25 18:15:39 1999  Richard Henderson  <rth@cygnus.com>
+
+	* builtins.c (expand_builtin_saveregs): Remove static, remove exp
+	and ignore arguments, bail if no EXPAND_BUILTIN_SAVEREGS.
+	(expand_builtin_next_arg): Accept ARGLIST not EXP.
+	(stabilize_va_list): New function.
+	(std_expand_builtin_va_start): New function.
+	(expand_builtin_va_start): New function.
+	(get_varargs_alias_set): New function.
+	(std_expand_builtin_va_arg): New function.
+	(expand_builtin_va_arg): New function.
+	(expand_builtin_va_end): New function.
+	(expand_builtin_va_copy): New function.
+	(expand_builtin): Call them.
+	* c-common.c (c_common_nodes_and_builtins): Build __builtin_va_list,
+	__builtin_{varargs_start,stdarg_start,end,copy}.
+	(build_va_arg): New function.
+	* c-common.h (CTI_PTR_TYPE, ptr_type_node): Delete.
+	(build_va_arg): Declare.
+	* c-decl.c (ptr_type_node, va_list_type_node): New.
+	* c-parse.gperf (__builtin_va_arg): New.
+	* c-parse.in (VA_ARG): New token.
+	(unary_expr): Recognize it.
+	* expr.c (expand_expr): Expand VA_ARG_EXPR.
+	* expr.h (std_expand_builtin_va_start): Declare.
+	(std_expand_builtin_va_arg): Declare.
+	(expand_builtin_va_arg): Declare.
+	(get_varargs_alias_set): Declare.
+	* tree.def (VA_ARG_EXPR): New.
+	* tree.h (BUILT_IN_VARARGS_START): New.
+	(BUILT_IN_STDARG_START, BUILT_IN_VA_END): New.
+	(ptr_type_node, va_list_type_node): Declare.
+	* tm.texi (EXPAND_BUILTIN_SAVEREGS): Kill unused ARGLIST argument.
+	* m32r.h (EXPAND_BUILTIN_SAVEREGS): Likewise.
+	* m88k.h, m88k.c: Likewise.
+	* mn10300.h, mn10300.c: Likewise.
+	* pa.h, pa.c: Likewise.
+	* rs6000.h, rs6000.c: Likewise.
+	* sh.h, sh.c: Likewise.
+	* sparc.h, sparc.c: Likewise.
+
+	* emit-rtl.c (operand_subword): Copy alias set.
+	(change_address): Likewise.
+
+Sun Jul 25 15:04:37 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* pa.c (compute_frame_size): Scan all the used callee saved registers,
+	not just the first one.
+
+Fri Jul 23 14:09:58 1999  Philip Blundell  <pb@nexus.co.uk>
+
+	* config/arm/arm.h (TARGET_SWITCHES): Add 
+	-m{no-}single-pic-base.  Correct help string for -mshort-load-words.
+	(TARGET_OPTIONS): Add -mpic-register=.
+	(ARM_FLAG_SINGLE_PIC_BASE, TARGET_SINGLE_PIC_BASE): Define.
+	(arm_pic_register_string): Declare.
+	(NEED_PLT_GOT): Delete, replace with ...
+	(NEED_GOT_RELOC, NEED_PLT_RELOC): ... these.  New macros.
+	(OUTPUT_INT_ADDR_CONST): Replace NEED_PLT_GOT with NEED_GOT_RELOC.
+	(ASM_OUTPUT_MI_THUNK): Replace NEED_PLT_GOT with NEED_PLT_RELOC.
+	* config/arm/arm.c (arm_override_options): Add new option
+ 	-mpic-register=N.
+	(arm_pic_register_string): New variable.
+	(arm_finalize_pic): Respect TARGET_SINGLE_PIC_BASE.
+	(output_func_prologue): If TARGET_SINGLE_PIC_BASE, treat the PIC
+	register as never live.  Use NEED_PLT_RELOC not NEED_PLT_GOT.
+	(output_return_instruction): Likewise. 
+	* config/arm/elf.h (NEED_PLT_GOT): Delete, replace with ...
+	(NEED_GOT_RELOC, NEED_PLT_RELOC): ... these.  Define to flag_pic.
+	* config/arm/arm.md: Use NEED_PLT_RELOC in place of NEED_PLT_GOT.
+
+	* invoke.texi (ARM Options): Fix spelling.  Remove duplicate
+	mention of -msched-prolog.  Document new options -msingle-pic-base 
+	and -mpic-register=.
+
+Thu Jul 22 18:23:56 1999  Richard Henderson  <rth@cygnus.com>
+
+	* haifa-sched.c (reemit_notes): Tidy.
+	* sched.c (reemit_notes): Duplicate 1998-08-31 patch to
+	haifa's routine.
+
+Thu Jul 22 18:21:04 1999  Richard Henderson  <rth@cygnus.com>
+
+	* explow.c (trunc_int_for_mode): New function.
+	(plus_constant_wide): Use it.
+	* combine.c (simplify_and_const_int): Likewise.
+	(merge_outer_ops): Likewise.
+	(simplify_shift_const): Likewise.
+	* cse.c (simplify_unary_operation): Likewise.
+	(simplify_binary_operation): Likewise.
+	* emit-rtl.c (operand_subword): Likewise.
+	* rtl.h: Declare it.
+
+Thu Jul 22 14:34:59 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* config/arm/arm.c (arm_print_operand): Fix typo in 'M' case
+	(use NUM_REGS instead of NUM_INTS).
+
+Thu Jul 22 11:25:20 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* builtins.c: New file.
+	* expr.c (saveregs_value, apply_args_value):  Delete definition,
+	moved into builtins.c.
+	(string_constant): No longer static.
+	(get_pointer_alignment, c_strlen, get_memory_rtx, expand_builtin,
+	apply_args_size, apply_result_size, result_vector,
+	expand_builtin_apply_args, expand_builtin_apply,
+	expand_builtin_return): Delete functions, moved into builtins.c.
+	(INCOMING_REGNO, OUTGOING_REGNO): Delete unused macros.
+	* expr.h (saveregs_value, apply_args_value): Declare variables.
+	(expand_builtin, string_constant): Declare functions.
+	* Makefile.in: Update to build builtin.o.
+
+Wed Jul 21 00:46:58 1999  Mark P. Mitchell  <mark@codesourcery.com>
+
+	* defaults.h (DWARF2_GENERATE_TEXT_SECTION_LABEL): New macro.
+	* tm.texi (DWARF2_GENERATE_TEXT_SECTION_LABEL): Define it.
+ 	* dwarf2out.c (dwarf2out_init): Don't output a label to mark the
+ 	start of the text section if DWARF2_GENERATE_TEXT_SECTION_LABEL is
+	false.
+	* config/mips/iris6.h (DWARF2_GENERATE_TEXT_SECTION_LABEL): 
+	Define to zero.
+	
+1999-07-21  Michael Meissner  <meissner@cygnus.com>
+
+	* print-rtl.c (print_rtx): Print the names of the virtual
+	registers.
+
+Wed Jul 21 16:00:32 1999  Nick Clifton  <nickc@cygnus.com>
+
+	* config/arm/arm.h (INITIAL_ELIMINATION_OFFSET): Fix typo
+	introduced in previous delta.
+
+Wed Jul 21 14:30:51 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* c-lang.c (finish_file): Rename void_list_node to void_list_node_1
+	to avoid name clash.
+=======
 
 	* pa.c (compute_frame_size): Use STARTINg_FRAME_OFFSET instead
 	of depending on a magic constant value.  Update comments.
@@ -3322,7 +3869,139 @@ Wed Jul 21 14:30:51 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
 
 	* c-lang.c (finish_file): Rename void_list_node to void_list_node_1
 	to avoid name clash.
+>>>>>>> 1.4250
 
+<<<<<<< ChangeLog
+Wed Jul 21 08:39:22 1999  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* c-lex.c (yylex) : Correct the test for overflow when lexing
+	integer literals.
+
+Tue Jul 20 18:02:42 1999  Richard Henderson  <rth@cygnus.com>
+
+	* haifa-sched.c (insn_cost): FREE implies cost 0 and vice versa.
+	(adjust_priority): Always call ADJUST_PRIORITY.
+	(schedule_insn): Only put insns into the ready at cost 0.
+	(schedule_block): Remove redundant initial sort.  Give clock_var
+	and can_issue_more to MD_SCHED_REORDER.  Requeue if hazard cost
+	is not 0.
+	* tm.texi (MD_SCHED_REORDER): Update docs.
+
+	* sparc.h (MD_SCHED_REORDER): Update.  Set CAN_ISSUE_MORE.
+	* sparc.c (ultra_reorder_called_this_block): Delete.
+	(ultrasparc_sched_init): Don't set it.
+	(ultrasparc_sched_reorder): Don't check it.
+	
+Tue Jul 20 17:07:54 1999  Richard Henderson  <rth@cygnus.com>
+
+	* rs6000.h (struct rs6000_args): Add sysv_gregno.
+	* rs6000.c (init_cumulative_args): Init sysv_gregno.
+	(function_arg_boundary): Align DFmode.
+	(function_arg_advance): Restructure for ABI_V4; use sysv_gregno
+	to get fp reg and stack overflow correct.
+	(function_arg): Likewise.
+	(function_arg_pass_by_reference): True for TFmode for ABI_V4.
+	(setup_incoming_varargs): Restructure for ABI_V4; use 
+	function_arg_advance to skip final named argument.
+	(expand_builtin_saveregs): Properly unskip the last integer arg
+	when doing varargs.  Adjust overflow location calculation.
+
+	* ginclude/va-ppc.h (struct __va_list_tag): Make gpr and fpr 
+	explicitly unsigned.
+	(__VA_FP_REGSAVE): Use new OFS argument instead of AP->fpr directly.
+	(__VA_GP_REGSAVE): Similarly.
+	(__va_longlong_p): Delete.
+	(__va_arg_type_violation): New declaration.
+	(va_arg): Restructure.  Flag promotion errors.  Align double. 
+	TFmode passed by reference.
+
+	* rs6000.md (movdi_32+1): Use GEN_INT after arithmetic
+	in the HOST_BITS_PER_WIDE_INT > 32 case.
+
+Tue Jul 20 12:37:30 1999  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* dwarf2out.c (output_abbrev_section): Terminate with a zero.
+
+Tue Jul 20 12:12:27 1999  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* gcc.c (default_compilers, cpp-output): Pass -fpreprocessed.
+	* toplev.c (documented_lang_options): Add -fpreprocessed.
+	* cpplib.h (struct cpp_buffer): Add preprocessed.
+	* cppinit.c (cpp_handle_option): Handle -fpreprocessed.
+	(cpp_start_read): Don't expand macros or emit an initial #line
+	directive if -fpreprocessed.
+
+Tue Jul 20 12:12:09 1999  Michael Tiemann  <tiemann@holodeck.cygnus.com>
+
+	* cpplib.h (struct cpp_buffer): Added manual_pop for
+	better C++ tokenization.
+	* cpplib.c (cpp_get_token): Return CPP_EOF if manual_pop.
+	Also, support C++ tokenization for ->*, .*, <?, and >? operators.
+	* c-common.c (cpp_token): Make non-static.
+
+Tue Jul 20 11:24:19 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
+
+	* c-common.h: New file.
+	* c-common.c (permanent_obstack): Delete unused declaration.
+	(c_global_trees): New array.
+	(c_common_nodes_and_builtins): New function; split off common code
+	from init_decl_processing in both c-decl.c and cp/decl.c.
+	* c-tree.h: Delete lots of declarations of tree nodes; replaced by
+	c_global_trees and accessor macros defined in c-common.h.
+	Include c-common.h.
+	* c-decl.c: Delete definitions for tree nodes that were replaced by
+	c_global_trees.
+	(init_decl_processing): Build void_list_node.
+	Call c_common_nodes_and_builtins; delete code to generate the common
+	builtins here.
+	* objc/objc-act.c (build_module_descriptor): Rename variable
+	void_list_node to avoid clash with c-common.h.
+
+	* Makefile.in: Update dependencies.
+	* objc/Make-lang.in: Likewise.
+
+Mon Jul 19 14:22:18 1999  Mark P. Mitchell  <mark@codesourcery.com>
+
+	* config/mips/iris6gld.h (MAKE_DECL_ONE_ONLY): Define.
+	(UNIQUE_SECTION_P): Likewise.
+	(UNIQUE_SECTION): Likewise.
+
+1999-07-19  Linas Vepstas  <linas@linas.org>
+
+	* config/i370/README: New file.
+	* config/i370/linux.h: New file.
+	* config/i370/mvs.h: New file.
+	* config/i370/oe.h: New file.
+	* config/i370/t-linux: New file.
+	* config/i370/t-mvs: New file.
+	* config/i370/t-oe: New file.
+	* config/i370/x-oe: New file.
+	* config/i370/xm-linux.h: New file.
+	* config/i370/xm-mvs.h: New file.
+	* config/i370/xm-oe.h: New file.
+
+	* i370.c (label_node_t): Add first_ref_page, label_addr, 
+	label_first_ref, label_last_ref members.
+	(mvs_need_base_reload): Renamed from mvs_label_emitted.
+	(MAX_MVS_LABEL_SIZE): Define.
+	(MAX_LONG_LABEL_SIZE): Define.
+	(alias_node_t, alias_anchor, alias_number): New.
+	(mvs_function_table): Reorder for EBCDIC.
+	(ascebc, ebcasc): Unconditionally define.
+	(i370_branch_dest, i370_branch_length): New functions.
+	(i370_short_branch, i370_label_scan): New functions.
+	(mvs_get_label): Renamed from mvs_add_label.  Search for
+	an existing label before creating a new one.
+	(mvs_add_label): New function.
+	(mvs_get_label_page): New function.
+	(mvs_free_label_list): Renamed from mvs_free_label.  Iterate
+	over the entire list.
+	(mvs_check_page) [TARGET_HLASM]: Use BASR not BALR.
+	(mvs_check_page) [TARGET_ELF_ABI]: New function.
+=======
+	* pa.c (compute_frame_size): Use STARTINg_FRAME_OFFSET instea
+>>>>>>> 1.4237
+=======
 Wed Jul 21 08:39:22 1999  Gavin Romig-Koch  <gavin@cygnus.com>
 
 	* c-lex.c (yylex) : Correct the test for overflow when lexing
@@ -3449,6 +4128,7 @@ Mon Jul 19 14:22:18 1999  Mark P. Mitchell  <mark@codesourcery.com>
 	over the entire list.
 	(mvs_check_page) [TARGET_HLASM]: Use BASR not BALR.
 	(mvs_check_page) [TARGET_ELF_ABI]: New function.
+>>>>>>> 1.4250
 	(mvs_add_alias, mvs_need_alias): New functions.
 	(mvs_get_alias, mvs_check_alias): New functions.
 	(handle_pragma): New function.
diff --git a/gcc/tlink.c b/gcc/tlink.c
index e0972705042..55c66dca1b8 100644
--- a/gcc/tlink.c
+++ b/gcc/tlink.c
@@ -654,7 +654,11 @@ scan_linker_output (fname)
 	      if (dem)
 		sym = symbol_hash_lookup (dem->mangled, false);
 	      else
-		sym = symbol_hash_lookup (p, false);
+	        {
+	          if (*p == '_' && prepends_underscore)
+		    ++p;
+		  sym = symbol_hash_lookup (p, false);
+		}
 	    }
 	}