Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

autotools: replace user variables with automake variables #67

Merged
merged 1 commit into from
Jul 9, 2018
Merged

autotools: replace user variables with automake variables #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 18 additions & 12 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,13 @@ case "$with_arch" in
xtensa*)

ARCH_CFLAGS="-mtext-section-literals"
AC_SUBST(ARCH_CFLAGS)

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

# extra CFLAGS defined here otherwise configure working gcc tests fails.
CFLAGS="${CFLAGS:+$CFLAGS }-fno-inline-functions -nostdlib -mlongcalls"
LDFLAGS="${LDFLAGS:+$LDFLAGS }-nostdlib"

#ARCH_ASFLAGS=""
AC_SUBST(ARCH_ASFLAGS)
# automake FLAGS defined here
AM_CFLAGS="-fno-inline-functions -nostdlib -mlongcalls"
AM_LDFLAGS="-nostdlib"
AM_CCASFLAGS="-fno-inline-functions -nostdlib -mlongcalls"

ARCH="xtensa"
AC_SUBST(ARCH)
Expand All @@ -109,11 +105,11 @@ case "$with_arch" in
host*)

ARCH_CFLAGS="-g"
AC_SUBST(ARCH_CFLAGS)

# extra CFLAGS defined here otherwise configure working gcc tests fails.
CFLAGS="${CFLAGS:+$CFLAGS } -O3"
LDFLAGS="${LDFLAGS:+$LDFLAGS }-lpthread"
# automake FLAGS defined here
AM_CFLAGS="-O3"
AM_LDFLAGS="-lpthread"
AM_CCASFLAGS="-O3"

ARCH="host"
AC_SUBST(ARCH)
Expand All @@ -125,6 +121,13 @@ case "$with_arch" in
;;
esac

AC_SUBST(ARCH_CFLAGS)
AC_SUBST(ARCH_LDFLAGS)

AC_SUBST(AM_CFLAGS)
AC_SUBST(AM_LDFLAGS)
AC_SUBST(AM_CCASFLAGS)

AM_CONDITIONAL(BUILD_XTENSA, test "$ARCH" = "xtensa")
AM_CONDITIONAL(BUILD_HOST, test "$ARCH" = "host")

Expand Down Expand Up @@ -494,5 +497,8 @@ CFLAGS: ${CFLAGS}
LDFLAGS: ${LDFLAGS}
ARCH_CFLAGS: ${ARCH_CFLAGS}
ARCH_LDFLAGS: ${ARCH_LDFLAGS}
A@&t@M_CFLAGS: ${AM_CFLAGS}
A@&t@M_LDFLAGS: ${AM_LDFLAGS}
A@&t@M_CCASFLAGS: ${AM_CCASFLAGS}
"

10 changes: 7 additions & 3 deletions src/arch/xtensa/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ libreset_a_SOURCES = \
libreset_a_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ASFLAGS) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR) \
-mtext-section-literals

Expand All @@ -49,14 +49,15 @@ endif

sof_CFLAGS = \
$(ARCH_INCDIR) \
$(AM_CFLAGS) \
$(ARCH_CFLAGS) \
$(PLATFORM_INCDIR) \
$(SOF_INCDIR)

sof_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ASFLAGS) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR)

sof_LDADD = \
Expand All @@ -83,6 +84,7 @@ sof_LDADD += \
endif

sof_LDFLAGS = \
$(AM_LDFLAGS) \
$(ARCH_LDFLAGS) -Wl,-Map=sof-$(FW_NAME).map \
-T ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT)

Expand Down Expand Up @@ -110,14 +112,15 @@ boot_ldr_SOURCES = \

boot_ldr_CFLAGS = \
$(ARCH_INCDIR) \
$(AM_CFLAGS) \
$(ARCH_CFLAGS) \
$(PLATFORM_INCDIR) \
$(SOF_INCDIR)

boot_ldr_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ASFLAGS) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR)

boot_ldr_LDADD = \
Expand All @@ -126,6 +129,7 @@ boot_ldr_LDADD = \
-lgcc

boot_ldr_LDFLAGS = \
$(AM_LDFLAGS) \
$(ARCH_LDFLAGS) \
-T ../../platform/$(PLATFORM)/$(PLATFORM_BOOT_LDR_LDSCRIPT)

Expand Down
3 changes: 2 additions & 1 deletion src/arch/xtensa/hal/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,13 @@ libhal_a_SOURCES = \

libhal_a_CFLAGS = \
$(ARCH_INCDIR) \
$(AM_CFLAGS) \
$(ARCH_CFLAGS) \
$(PLATFORM_INCDIR) \
$(PLATFORM_DEFS)

libhal_a_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR) \
$(PLATFORM_DEFS)
13 changes: 7 additions & 6 deletions src/arch/xtensa/xtos/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ libxlevel2_a_SOURCES = \

libxlevel2_a_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR) \
$(PLATFORM_DEFS) \
-D_INTERRUPT_LEVEL=2
Expand All @@ -72,7 +72,7 @@ libxlevel3_a_SOURCES = \

libxlevel3_a_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR) \
$(PLATFORM_DEFS) \
-D_INTERRUPT_LEVEL=3
Expand All @@ -82,7 +82,7 @@ libxlevel4_a_SOURCES = \

libxlevel4_a_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR) \
$(PLATFORM_DEFS) \
-D_INTERRUPT_LEVEL=4
Expand All @@ -92,7 +92,7 @@ libxlevel5_a_SOURCES = \

libxlevel5_a_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR) \
$(PLATFORM_DEFS) \
-D_INTERRUPT_LEVEL=5
Expand All @@ -103,7 +103,7 @@ libxlevel6_a_SOURCES = \

libxlevel6_a_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR) \
$(PLATFORM_DEFS) \
-D_INTERRUPT_LEVEL=6
Expand Down Expand Up @@ -142,12 +142,13 @@ libxtos_a_SOURCES = \

libxtos_a_CFLAGS = \
$(ARCH_INCDIR) \
$(AM_CFLAGS) \
$(ARCH_CFLAGS) \
$(PLATFORM_INCDIR) \
$(PLATFORM_DEFS)

libxtos_a_CCASFLAGS = \
$(ARCH_INCDIR) \
$(ARCH_ASFLAGS) \
$(AM_CCASFLAGS) \
$(PLATFORM_INCDIR) \
$(PLATFORM_DEFS)