diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 08:38:10 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 08:38:10 +0100 |
| commit | 472137e23297f72a1710718ff86d961e5c310720 (patch) | |
| tree | 255406e633ae7685761004b42a26190ea0d54750 | |
| parent | 3c6ebdbf8fdc455b39563132bac8b547e7d960af (diff) | |
| download | px4-firmware-472137e23297f72a1710718ff86d961e5c310720.tar.gz px4-firmware-472137e23297f72a1710718ff86d961e5c310720.tar.bz2 px4-firmware-472137e23297f72a1710718ff86d961e5c310720.zip | |
Fixup during rebase: Fix merge fail
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index ed56aca44..d4d73fb84 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -95,8 +95,6 @@ ARCHINSTRUMENTATIONDEFINES_CORTEXM4 = ARCHINSTRUMENTATIONDEFINES_CORTEXM3 = endif -endif - # Pick the right set of flags for the architecture. # ARCHCPUFLAGS = $(ARCHCPUFLAGS_$(CONFIG_ARCH)) |