diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-02 10:50:38 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-02 10:50:38 +0000 |
| commit | 4453133d3c94b7727214631d83b2eddf641012c4 (patch) | |
| tree | 245bb7db8713f0bb7f37a5847907c81fca9ed487 /LUFA | |
| parent | 2b332d3231d54236e093dd6bfde5421ce26f7304 (diff) | |
| download | lufa-4453133d3c94b7727214631d83b2eddf641012c4.tar.gz lufa-4453133d3c94b7727214631d83b2eddf641012c4.tar.bz2 lufa-4453133d3c94b7727214631d83b2eddf641012c4.zip | |
Disable linker relaxations for the UC3 architecture, as this does not appear to be supported in the linker.
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/Build/lufa.build.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in index 158eb24c0..d39ab72aa 100644 --- a/LUFA/Build/lufa.build.in +++ b/LUFA/Build/lufa.build.in @@ -93,13 +93,13 @@ ASM_SOURCE = $(filter %.S, $(SRC)) OBJECT_FILES = $(filter %.o, $(C_SOURCE:%.c=%.o) $(CPP_SOURCE:%.cpp=%.o) $(ASM_SOURCE:%.S=%.o))
# Create a list of flags to pass to the compiler
-ifeq ($(ARCH),AVR8)
+ifneq ($(ARCH), AVR8)
CC_FLAGS += -mmcu=$(MCU) -gdwarf-2 -fshort-enums -fno-inline-small-functions -fpack-struct
CROSS = avr-
-else ifeq ($(ARCH),XMEGA)
+else ifeq ($(ARCH), XMEGA)
CC_FLAGS += -mmcu=$(MCU) -gdwarf-2 -fshort-enums -fno-inline-small-functions -fpack-struct
CROSS = avr-
-else ifeq ($(ARCH),UC3)
+else ifeq ($(ARCH), UC3)
CC_FLAGS += -mpart=$(MCU) -g3 -masm-addr-pseudos
CROSS = avr32-
endif
@@ -112,7 +112,10 @@ ifneq ($(F_CPU),) endif
# Create a list of flags to pass to the linker
-LD_FLAGS += -Wl,-Map=$(TARGET).map,--cref -Wl,--relax -Wl,--gc-sections -lm
+LD_FLAGS += -Wl,-Map=$(TARGET).map,--cref -Wl,--gc-sections -lm
+ifneq ($(F_CPU), UC3)
+ LD_FLAGS += -Wl,--relax
+endif
# Create a list of unknown source file types, if any are found throw an error
UNKNOWN_SOURCE = $(filter-out $(C_SOURCE) $(CPP_SOURCE) $(ASM_SOURCE), $(SRC))
|