diff --git a/arch/avr/include/avr32/types.h b/arch/avr/include/avr32/types.h index ec18719c77..ad3be5ba95 100644 --- a/arch/avr/include/avr32/types.h +++ b/arch/avr/include/avr32/types.h @@ -79,7 +79,7 @@ typedef int _wchar_t; */ #define unsigned signed -typedef __SIZE_TYPE__ _ssize_t; +typedef int _ssize_t; /* Keep avr32-gcc 4.4.7 happy. */ #undef unsigned typedef __SIZE_TYPE__ _size_t; #elif defined(CONFIG_ARCH_SIZET_LONG) diff --git a/boards/avr/at32uc3/avr32dev1/include/board.h b/boards/avr/at32uc3/avr32dev1/include/board.h index 89862b3ade..947488cbae 100644 --- a/boards/avr/at32uc3/avr32dev1/include/board.h +++ b/boards/avr/at32uc3/avr32dev1/include/board.h @@ -124,7 +124,7 @@ /* Pin muliplexing selecion *************************************************/ #define PINMUX_USART1_RXD PINMUX_USART1_RXD_2 -#define PINMUX_USART1_TXD PINMUX_USART1_TXD_1 +#define PINMUX_USART1_TXD PINMUX_USART1_TXD_2 /* LED definitions **********************************************************/ diff --git a/boards/avr/at32uc3/avr32dev1/scripts/avr32dev1.ld b/boards/avr/at32uc3/avr32dev1/scripts/avr32dev1.ld index abe2d6c61c..bbf513faa2 100644 --- a/boards/avr/at32uc3/avr32dev1/scripts/avr32dev1.ld +++ b/boards/avr/at32uc3/avr32dev1/scripts/avr32dev1.ld @@ -39,7 +39,8 @@ MEMORY SECTIONS { .text : { - _stext = ABSOLUTE(.); + . = ALIGN(4); + _stext = .; *(.vectors) *(.text .text.*) *(.fixup) @@ -51,27 +52,29 @@ SECTIONS *(.got) *(.gcc_except_table) *(.gnu.linkonce.r.*) - _etext = ABSOLUTE(.); + . = ALIGN(4); + _etext = .; } > flash - _eronly = ABSOLUTE(.); /* See below */ + _eronly = .; /* See below */ - .data : { - _sdata = ABSOLUTE(.); + .data : AT(_etext) { + . = ALIGN(4); + _sdata = .; *(.data .data.*) *(.gnu.linkonce.d.*) CONSTRUCTORS . = ALIGN(4); - _edata = ABSOLUTE(.); - } > intram AT > flash + _edata = .; + } > intram .bss : { /* BSS */ - _sbss = ABSOLUTE(.); + _sbss = .; *(.bss .bss.*) *(.gnu.linkonce.b.*) *(COMMON) . = ALIGN(4); - _ebss = ABSOLUTE(.); + _ebss = .; } > intram /* Stabs debugging sections. */ .stab 0 : { *(.stab) } diff --git a/libs/libc/assert/Make.defs b/libs/libc/assert/Make.defs index 830a50c05f..87017b57c1 100644 --- a/libs/libc/assert/Make.defs +++ b/libs/libc/assert/Make.defs @@ -24,8 +24,10 @@ ifeq ($(CONFIG_STACK_CANARIES),y) CSRCS += lib_stackchk.c endif +ifeq ($(CONFIG_LTO_NONE),n) assert/lib_assert.c_CFLAGS += -fno-lto assert/lib_stackchk.c_CFLAGS += -fno-lto +endif # Add the assert directory to the build