From: danglin Date: Fri, 16 Mar 2007 23:12:46 +0000 (+0000) Subject: * pa.c (attr_length_call): Partially revert change of 2007-03-09. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec94117da0f841107969a49cce421312f5cbd298;p=thirdparty%2Fgcc.git * pa.c (attr_length_call): Partially revert change of 2007-03-09. (output_call): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123002 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b664cdf9be2c..5d00c1574756 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2007-03-16 John David Anglin + + * pa.c (attr_length_call): Partially revert change of 2007-03-09. + (output_call): Likewise. + 2007-03-16 Richard Sandiford * config/vxworks.h (SUPPORTS_INIT_PRIORITY): Define. diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c index c69652020cbd..ce38cf15da97 100644 --- a/gcc/config/pa/pa.c +++ b/gcc/config/pa/pa.c @@ -7273,7 +7273,7 @@ attr_length_call (rtx insn, int sibcall) length += 12; /* long pc-relative branch sequence. */ - else if ((TARGET_SOM && (TARGET_LONG_PIC_SDIFF_CALL || local_call)) + else if ((TARGET_SOM && TARGET_LONG_PIC_SDIFF_CALL) || (TARGET_64BIT && !TARGET_GAS) || (TARGET_GAS && !TARGET_SOM && (TARGET_LONG_PIC_PCREL_CALL || local_call))) @@ -7386,7 +7386,7 @@ output_call (rtx insn, rtx call_dest, int sibcall) of increasing length and complexity. In most cases, they don't allow an instruction in the delay slot. */ if (!((TARGET_LONG_ABS_CALL || local_call) && !flag_pic) - && !(TARGET_SOM && (TARGET_LONG_PIC_SDIFF_CALL || local_call)) + && !(TARGET_SOM && TARGET_LONG_PIC_SDIFF_CALL) && !(TARGET_GAS && !TARGET_SOM && (TARGET_LONG_PIC_PCREL_CALL || local_call)) && !TARGET_64BIT) @@ -7434,7 +7434,7 @@ output_call (rtx insn, rtx call_dest, int sibcall) } else { - if ((TARGET_SOM && (TARGET_LONG_PIC_SDIFF_CALL || local_call)) + if ((TARGET_SOM && TARGET_LONG_PIC_SDIFF_CALL) || (TARGET_64BIT && !TARGET_GAS)) { /* The HP assembler and linker can handle relocations