* config/avr/avr.c (avr_asm_function_rodata_section):
        When merging something into a function-specific section, always
        add the SECTION_CODE flag.

Conflicts:
	gcc/ChangeLog.AVR
        * config/avr/avr.c (avr_asm_function_rodata_section):
        Distinguish between ".progmem.gcc_sw_table" and "".gnu.linkonce.t.*"
        sections when decide what section flags to set.