Skip to content

Commit a48cedd

Browse files
lgirdwoodlgirdwood
authored
Merge pull request #67 from jajanusz/extraflags
autotools: replace user variables with automake variables
2 parents b51fefb + 17c929e commit a48cedd

16 files changed

Lines changed: 184 additions & 277 deletions

File tree

‎configure.ac‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,13 @@ case "$with_arch" in
8686
xtensa*)
8787

8888
ARCH_CFLAGS="-mtext-section-literals"
89-
AC_SUBST(ARCH_CFLAGS)
9089

9190
ARCH_LDFLAGS="-nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static"
92-
AC_SUBST(XTENSA_LDFLAGS)
9391

94-
# extra CFLAGS defined here otherwise configure working gcc tests fails.
95-
CFLAGS="${CFLAGS:+$CFLAGS }-fno-inline-functions -nostdlib -mlongcalls"
96-
LDFLAGS="${LDFLAGS:+$LDFLAGS }-nostdlib"
97-
98-
#ARCH_ASFLAGS=""
99-
AC_SUBST(ARCH_ASFLAGS)
92+
# automake FLAGS defined here
93+
AM_CFLAGS="-fno-inline-functions -nostdlib -mlongcalls"
94+
AM_LDFLAGS="-nostdlib"
95+
AM_CCASFLAGS="-fno-inline-functions -nostdlib -mlongcalls"
10096

10197
ARCH="xtensa"
10298
AC_SUBST(ARCH)
@@ -109,11 +105,11 @@ case "$with_arch" in
109105
host*)
110106

111107
ARCH_CFLAGS="-g"
112-
AC_SUBST(ARCH_CFLAGS)
113108

114-
# extra CFLAGS defined here otherwise configure working gcc tests fails.
115-
CFLAGS="${CFLAGS:+$CFLAGS } -O3"
116-
LDFLAGS="${LDFLAGS:+$LDFLAGS }-lpthread"
109+
# automake FLAGS defined here
110+
AM_CFLAGS="-O3"
111+
AM_LDFLAGS="-lpthread"
112+
AM_CCASFLAGS="-O3"
117113

118114
ARCH="host"
119115
AC_SUBST(ARCH)
@@ -125,6 +121,13 @@ case "$with_arch" in
125121
;;
126122
esac
127123

124+
AC_SUBST(ARCH_CFLAGS)
125+
AC_SUBST(ARCH_LDFLAGS)
126+
127+
AC_SUBST(AM_CFLAGS)
128+
AC_SUBST(AM_LDFLAGS)
129+
AC_SUBST(AM_CCASFLAGS)
130+
128131
AM_CONDITIONAL(BUILD_XTENSA, test "$ARCH" = "xtensa")
129132
AM_CONDITIONAL(BUILD_HOST, test "$ARCH" = "host")
130133

@@ -494,5 +497,8 @@ CFLAGS: ${CFLAGS}
494497
LDFLAGS: ${LDFLAGS}
495498
ARCH_CFLAGS: ${ARCH_CFLAGS}
496499
ARCH_LDFLAGS: ${ARCH_LDFLAGS}
500+
A@&t@M_CFLAGS: ${AM_CFLAGS}
501+
A@&t@M_LDFLAGS: ${AM_LDFLAGS}
502+
A@&t@M_CCASFLAGS: ${AM_CCASFLAGS}
497503
"
498504

‎src/arch/xtensa/Makefile.am‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ libreset_a_SOURCES = \
3131
libreset_a_CCASFLAGS = \
3232
$(ARCH_INCDIR) \
3333
$(ASFLAGS) \
34-
$(ARCH_ASFLAGS) \
34+
$(AM_CCASFLAGS) \
3535
$(PLATFORM_INCDIR) \
3636
-mtext-section-literals
3737

@@ -49,14 +49,15 @@ endif
4949

5050
sof_CFLAGS = \
5151
$(ARCH_INCDIR) \
52+
$(AM_CFLAGS) \
5253
$(ARCH_CFLAGS) \
5354
$(PLATFORM_INCDIR) \
5455
$(SOF_INCDIR)
5556

5657
sof_CCASFLAGS = \
5758
$(ARCH_INCDIR) \
5859
$(ASFLAGS) \
59-
$(ARCH_ASFLAGS) \
60+
$(AM_CCASFLAGS) \
6061
$(PLATFORM_INCDIR)
6162

6263
sof_LDADD = \
@@ -83,6 +84,7 @@ sof_LDADD += \
8384
endif
8485

8586
sof_LDFLAGS = \
87+
$(AM_LDFLAGS) \
8688
$(ARCH_LDFLAGS) -Wl,-Map=sof-$(FW_NAME).map \
8789
-T ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT)
8890

@@ -110,14 +112,15 @@ boot_ldr_SOURCES = \
110112

111113
boot_ldr_CFLAGS = \
112114
$(ARCH_INCDIR) \
115+
$(AM_CFLAGS) \
113116
$(ARCH_CFLAGS) \
114117
$(PLATFORM_INCDIR) \
115118
$(SOF_INCDIR)
116119

117120
boot_ldr_CCASFLAGS = \
118121
$(ARCH_INCDIR) \
119122
$(ASFLAGS) \
120-
$(ARCH_ASFLAGS) \
123+
$(AM_CCASFLAGS) \
121124
$(PLATFORM_INCDIR)
122125

123126
boot_ldr_LDADD = \
@@ -126,6 +129,7 @@ boot_ldr_LDADD = \
126129
-lgcc
127130

128131
boot_ldr_LDFLAGS = \
132+
$(AM_LDFLAGS) \
129133
$(ARCH_LDFLAGS) \
130134
-T ../../platform/$(PLATFORM)/$(PLATFORM_BOOT_LDR_LDSCRIPT)
131135

‎src/arch/xtensa/hal/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,13 @@ libhal_a_SOURCES = \
223223

224224
libhal_a_CFLAGS = \
225225
$(ARCH_INCDIR) \
226+
$(AM_CFLAGS) \
226227
$(ARCH_CFLAGS) \
227228
$(PLATFORM_INCDIR) \
228229
$(PLATFORM_DEFS)
229230

230231
libhal_a_CCASFLAGS = \
231232
$(ARCH_INCDIR) \
232-
$(ARCH_ASFLAGS) \
233+
$(AM_CCASFLAGS) \
233234
$(PLATFORM_INCDIR) \
234235
$(PLATFORM_DEFS)

‎src/arch/xtensa/xtos/Makefile.am‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ libxlevel2_a_SOURCES = \
6262

6363
libxlevel2_a_CCASFLAGS = \
6464
$(ARCH_INCDIR) \
65-
$(ARCH_ASFLAGS) \
65+
$(AM_CCASFLAGS) \
6666
$(PLATFORM_INCDIR) \
6767
$(PLATFORM_DEFS) \
6868
-D_INTERRUPT_LEVEL=2
@@ -72,7 +72,7 @@ libxlevel3_a_SOURCES = \
7272

7373
libxlevel3_a_CCASFLAGS = \
7474
$(ARCH_INCDIR) \
75-
$(ARCH_ASFLAGS) \
75+
$(AM_CCASFLAGS) \
7676
$(PLATFORM_INCDIR) \
7777
$(PLATFORM_DEFS) \
7878
-D_INTERRUPT_LEVEL=3
@@ -82,7 +82,7 @@ libxlevel4_a_SOURCES = \
8282

8383
libxlevel4_a_CCASFLAGS = \
8484
$(ARCH_INCDIR) \
85-
$(ARCH_ASFLAGS) \
85+
$(AM_CCASFLAGS) \
8686
$(PLATFORM_INCDIR) \
8787
$(PLATFORM_DEFS) \
8888
-D_INTERRUPT_LEVEL=4
@@ -92,7 +92,7 @@ libxlevel5_a_SOURCES = \
9292

9393
libxlevel5_a_CCASFLAGS = \
9494
$(ARCH_INCDIR) \
95-
$(ARCH_ASFLAGS) \
95+
$(AM_CCASFLAGS) \
9696
$(PLATFORM_INCDIR) \
9797
$(PLATFORM_DEFS) \
9898
-D_INTERRUPT_LEVEL=5
@@ -103,7 +103,7 @@ libxlevel6_a_SOURCES = \
103103

104104
libxlevel6_a_CCASFLAGS = \
105105
$(ARCH_INCDIR) \
106-
$(ARCH_ASFLAGS) \
106+
$(AM_CCASFLAGS) \
107107
$(PLATFORM_INCDIR) \
108108
$(PLATFORM_DEFS) \
109109
-D_INTERRUPT_LEVEL=6
@@ -142,12 +142,13 @@ libxtos_a_SOURCES = \
142142

143143
libxtos_a_CFLAGS = \
144144
$(ARCH_INCDIR) \
145+
$(AM_CFLAGS) \
145146
$(ARCH_CFLAGS) \
146147
$(PLATFORM_INCDIR) \
147148
$(PLATFORM_DEFS)
148149

149150
libxtos_a_CCASFLAGS = \
150151
$(ARCH_INCDIR) \
151-
$(ARCH_ASFLAGS) \
152+
$(AM_CCASFLAGS) \
152153
$(PLATFORM_INCDIR) \
153154
$(PLATFORM_DEFS)

0 commit comments

Comments
 (0)