mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 22:30:38 -04:00
c25da1631f
microcontrollers. It includes patches from the WinAVR project to support the ATmega32C1, ATmega32M1, ATmega32U4, and ATtiny167 controllers, and in particular the next generation AVRs ATxmega64A1 and ATxmega128A1. The port has been carefully crafted to peacefully coexist with the non-devel avr-gcc port. All executables installed have the suffix "-43" added for that reason.
65 lines
2.2 KiB
Text
65 lines
2.2 KiB
Text
Patch to fix GCC bug #35013.
|
|
|
|
Index: avr-protos.h
|
|
===================================================================
|
|
--- gcc/config/avr/avr-protos.h (revision 132369)
|
|
+++ gcc/config/avr/avr-protos.h (working copy)
|
|
@@ -111,6 +111,7 @@
|
|
extern int _reg_unused_after (rtx insn, rtx reg);
|
|
extern int avr_jump_mode (rtx x, rtx insn);
|
|
extern int byte_immediate_operand (rtx op, enum machine_mode mode);
|
|
+extern int text_segment_operand (rtx op, enum machine_mode mode);
|
|
extern int test_hard_reg_class (enum reg_class class, rtx x);
|
|
extern int jump_over_one_insn_p (rtx insn, rtx dest);
|
|
|
|
Index: avr.c
|
|
===================================================================
|
|
--- gcc/config/avr/avr.c (revision 132366)
|
|
+++ gcc/config/avr/avr.c (working copy)
|
|
@@ -1116,8 +1116,7 @@
|
|
|
|
default:
|
|
if (CONSTANT_ADDRESS_P (addr)
|
|
- && ((GET_CODE (addr) == SYMBOL_REF && SYMBOL_REF_FUNCTION_P (addr))
|
|
- || GET_CODE (addr) == LABEL_REF))
|
|
+ && text_segment_operand (addr, VOIDmode))
|
|
{
|
|
fprintf (file, "pm(");
|
|
output_addr_const (file,addr);
|
|
@@ -1428,6 +1427,26 @@
|
|
&& INTVAL (op) <= 0xff && INTVAL (op) >= 0);
|
|
}
|
|
|
|
+/* Return true if OP is a program memory reference.*/
|
|
+int
|
|
+text_segment_operand (rtx op, enum machine_mode mode ATTRIBUTE_UNUSED)
|
|
+{
|
|
+ switch (GET_CODE (op))
|
|
+ {
|
|
+ case LABEL_REF :
|
|
+ return true;
|
|
+ case SYMBOL_REF :
|
|
+ return SYMBOL_REF_FUNCTION_P (op);
|
|
+ case PLUS :
|
|
+ /* Assume canonical format of symbol + constant.
|
|
+ Fall through. */
|
|
+ case CONST :
|
|
+ return text_segment_operand (XEXP (op, 0), VOIDmode);
|
|
+ default :
|
|
+ return false;
|
|
+ }
|
|
+}
|
|
+
|
|
/* Output all insn addresses and their sizes into the assembly language
|
|
output file. This is helpful for debugging whether the length attributes
|
|
in the md file are correct.
|
|
@@ -4465,8 +4484,7 @@
|
|
avr_assemble_integer (rtx x, unsigned int size, int aligned_p)
|
|
{
|
|
if (size == POINTER_SIZE / BITS_PER_UNIT && aligned_p
|
|
- && ((GET_CODE (x) == SYMBOL_REF && SYMBOL_REF_FUNCTION_P (x))
|
|
- || GET_CODE (x) == LABEL_REF))
|
|
+ && text_segment_operand (x, VOIDmode) )
|
|
{
|
|
fputs ("\t.word\tpm(", asm_out_file);
|
|
output_addr_const (asm_out_file, x);
|