mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-08 12:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

arm.h (NEED_PLT_GOT): New macro.

Browse Source 
* config/arm/arm.h (NEED_PLT_GOT): New macro.  Set to 0 if not
already defined.
* config/arm/elf.h (NEED_PLT_GOT): Define to flag_pic.
* config/arm/arm.md (call_symbol, call_value_symbol et al.): If
NEED_PLT_GOT is true, add explicit "(PLT)" to generated branches.
* config/arm/arm.c (output_func_epilogue,
output_return_instruction): Likewise for calls to abort.

From-SVN: r26839
This commit is contained in:
Philip Blundell 1999-05-08 09:40:05 +00:00 committed by Richard Earnshaw
parent 91ab104696
commit 86efdc8e6d
5 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
Sat May 8 06:23:21 1999 Philip Blundell <pb@nexus.co.uk>
Based on patch by Scott Bambrough:
* config/arm/arm.h (NEED_PLT_GOT): New macro. Set to 0 if not
already defined.
* config/arm/elf.h (NEED_PLT_GOT): Define to flag_pic.
* config/arm/arm.md (call_symbol, call_value_symbol et al.): If
NEED_PLT_GOT is true, add explicit "(PLT)" to generated branches.
* config/arm/arm.c (output_func_epilogue,
output_return_instruction): Likewise for calls to abort.
Sat May 8 01:57:58 1999 Donn Terry (donn@interix.com) Sat May 8 01:57:58 1999 Donn Terry (donn@interix.com)
* calls.c (rtx_for_function_call): Extend function pointer being * calls.c (rtx_for_function_call): Extend function pointer being

6
gcc/config/arm/arm.c
View File

@ -5299,7 +5299,8 @@ output_return_instruction (operand, really_return, reverse)
/* Otherwise, trap an attempted return by aborting. */ /* Otherwise, trap an attempted return by aborting. */
ops[0] = operand; ops[0] = operand;
ops[1] = gen_rtx_SYMBOL_REF (Pmode, "abort"); ops[1] = gen_rtx_SYMBOL_REF (Pmode, NEED_PLT_GOT ? "abort(PLT)"
: "abort");
assemble_external_libcall (ops[1]); assemble_external_libcall (ops[1]);
output_asm_insn (reverse ? "bl%D0\t%a1" : "bl%d0\t%a1", ops); output_asm_insn (reverse ? "bl%D0\t%a1" : "bl%d0\t%a1", ops);
return ""; return "";
@ -5553,7 +5554,8 @@ output_func_epilogue (f, frame_size)
/* A volatile function should never return. Call abort. */ /* A volatile function should never return. Call abort. */
if (TARGET_ABORT_NORETURN && volatile_func) if (TARGET_ABORT_NORETURN && volatile_func)
{ {
rtx op = gen_rtx_SYMBOL_REF (Pmode, "abort"); rtx op;
op = gen_rtx_SYMBOL_REF (Pmode, NEED_PLT_GOT ? "abort(PLT)" : "abort");
assemble_external_libcall (op); assemble_external_libcall (op);
output_asm_insn ("bl\t%a0", &op); output_asm_insn ("bl\t%a0", &op);
goto epilogue_done; goto epilogue_done;

5
gcc/config/arm/arm.h
View File

@ -476,6 +476,11 @@ extern int arm_is_6_or_7;
#define TARGET_MEM_FUNCTIONS 1 #define TARGET_MEM_FUNCTIONS 1
#define OVERRIDE_OPTIONS arm_override_options () #define OVERRIDE_OPTIONS arm_override_options ()
/* Nonzero if PIC code requires explicit qualifiers to generate
PLT and GOT relocs rather than the assembler doing so implicitly.
Subtargets can override this if required. */
#define NEED_PLT_GOT 0
/* Target machine storage Layout. */ /* Target machine storage Layout. */

14
gcc/config/arm/arm.md
View File

@ -4246,7 +4246,10 @@
(match_operand:SI 1 "general_operand" "g")) (match_operand:SI 1 "general_operand" "g"))
(clobber (reg:SI 14))] (clobber (reg:SI 14))]
"GET_CODE (operands[0]) == SYMBOL_REF" "GET_CODE (operands[0]) == SYMBOL_REF"
"bl%?\\t%a0" "*
{
return NEED_PLT_GOT ? \"bl%?\\t%a0(PLT)\" : \"bl%?\\t%a0\";
}"
[(set_attr "type" "call")]) [(set_attr "type" "call")])
(define_insn "*call_value_symbol" (define_insn "*call_value_symbol"
@ -4255,7 +4258,10 @@
(match_operand:SI 2 "general_operand" "g"))) (match_operand:SI 2 "general_operand" "g")))
(clobber (reg:SI 14))] (clobber (reg:SI 14))]
"GET_CODE(operands[1]) == SYMBOL_REF" "GET_CODE(operands[1]) == SYMBOL_REF"
"bl%?\\t%a1" "*
{
return NEED_PLT_GOT ? \"bl%?\\t%a1(PLT)\" : \"bl%?\\t%a1\";
}"
[(set_attr "type" "call")]) [(set_attr "type" "call")])
;; Often the return insn will be the same as loading from memory, so set attr ;; Often the return insn will be the same as loading from memory, so set attr
@ -5993,7 +5999,7 @@
} }
output_return_instruction (NULL, FALSE, FALSE); output_return_instruction (NULL, FALSE, FALSE);
return \"b%?\\t%a0\"; return NEED_PLT_GOT ? \"b%?\\t%a0(PLT)\" : \"b%?\\t%a0\";
}" }"
[(set_attr "type" "call") [(set_attr "type" "call")
(set_attr "length" "8")]) (set_attr "length" "8")])
@ -6021,7 +6027,7 @@
} }
output_return_instruction (NULL, FALSE, FALSE); output_return_instruction (NULL, FALSE, FALSE);
return \"b%?\\t%a1\"; return NEED_PLT_GOT ? \"b%?\\t%a1(PLT)\" : \"b%?\\t%a1\";
}" }"
[(set_attr "type" "call") [(set_attr "type" "call")
(set_attr "length" "8")]) (set_attr "length" "8")])

3
gcc/config/arm/elf.h
View File

@ -335,4 +335,7 @@ do { \
do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \ do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \
fputc ('\n', FILE); } while (0) fputc ('\n', FILE); } while (0)
/* For PIC code we need to explicitly specify (PLT) and (GOT) relocs. */
#define NEED_PLT_GOT flag_pic
#include "arm/aout.h" #include "arm/aout.h"