Skip to content

Commit 03ebc73

Browse files
author
whitequark
committedJul 28, 2015
Pass -integrated-as to clang.
This avoids misdetection of target assembler by clang.
1 parent 50cf701 commit 03ebc73

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed
 

Diff for: ‎software/common.mak

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ TARGET_PREFIX=$(TRIPLE)-
44
RM ?= rm -f
55

66
ifeq ($(CLANG),1)
7-
CC_normal := clang -target $(TRIPLE)
8-
CX_normal := clang++ -target $(TRIPLE)
7+
CC_normal := clang -target $(TRIPLE) -integrated-as
8+
CX_normal := clang++ -target $(TRIPLE) -integrated-as
99
else
1010
CC_normal := $(TARGET_PREFIX)gcc
1111
CX_normal := $(TARGET_PREFIX)g++
@@ -39,7 +39,7 @@ endif
3939
# Toolchain options
4040
#
4141
INCLUDES = -I$(MSCDIR)/software/include/base -I$(MSCDIR)/software/include -I$(MSCDIR)/common
42-
COMMONFLAGS = -Os $(CPUFLAGS) -Wall -fno-builtin -nostdinc -DMSC_GIT_ID=$(MSC_GIT_ID) $(INCLUDES)
42+
COMMONFLAGS = -Os $(CPUFLAGS) -fomit-frame-pointer -Wall -fno-builtin -nostdinc -DMSC_GIT_ID=$(MSC_GIT_ID) $(INCLUDES)
4343
CFLAGS = $(COMMONFLAGS) -fexceptions -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes
4444
CXXFLAGS = $(COMMONFLAGS) -std=c++11 -I$(MSCDIR)/software/include/basec++ -fexceptions -fno-rtti -ffreestanding
4545
LDFLAGS = -nostdlib -nodefaultlibs -L$(MSCDIR)/software/include

0 commit comments

Comments
 (0)