Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit e2584d8

Browse files
authored
Merge pull request #376 from turon/pr/nrf5/asm-fix
[nrf5] Add proper build flags for building ASM files.
2 parents ce09da7 + dc0ad7d commit e2584d8

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

build/nrf5/nrf5-app.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ STD_ASFLAGS = \
122122
-mthumb \
123123
-mabi=aapcs \
124124
-mfloat-abi=hard \
125-
-mfpu=fpv4-sp-d16
125+
-mfpu=fpv4-sp-d16 \
126+
-x assembler-with-cpp
126127

127128
STD_LDFLAGS = \
128129
-mthumb \

build/nrf5/nrf5-openthread.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ USE_PREBUILT_OPENTHREAD ?= 0
109109

110110
OPENTHREAD_CPPFLAGS = $(STD_CFLAGS) $(DEBUG_FLAGS) $(OPT_FLAGS) -Wno-expansion-to-defined $(OPENTHREAD_DEFINE_FLAGS) $(OPENTHREAD_INC_FLAGS)
111111
OPENTHREAD_CXXFLAGS = $(STD_CXXFLAGS) -Wno-expansion-to-defined
112+
OPENTHREAD_CCASFLAGS = $(STD_ASFLAGS)
112113
OPENTHREAD_DEFINE_FLAGS = $(foreach def,$(OPENTHREAD_DEFINES),-D$(def))
113114
OPENTHREAD_INC_FLAGS = $(foreach dir,$(OPENTHREAD_INC_DIRS),-I$(dir))
114115

@@ -152,6 +153,7 @@ OPENTHREAD_CONFIGURE_OPTIONS = \
152153
SIZE="$(SIZE)" RANLIB="$(RANLIB)" INSTALL="$(INSTALL) $(INSTALLFLAGS) -m644" \
153154
CPPFLAGS=$(call DoubleQuoteStr, $(OPENTHREAD_CPPFLAGS)) \
154155
CXXFLAGS=$(call DoubleQuoteStr, $(OPENTHREAD_CXXFLAGS)) \
156+
CCASFLAGS=$(call DoubleQuoteStr, $(OPENTHREAD_CCASFLAGS)) \
155157
LDFLAGS="" \
156158
--prefix=$(OPENTHREAD_OUTPUT_DIR) \
157159
--exec-prefix=$(OPENTHREAD_OUTPUT_DIR) \

0 commit comments

Comments
 (0)