diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-03-28 22:57:13 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-28 23:02:39 +0200 |
commit | 7b1a369cf7801f98139189ade463f3a460f78d85 (patch) | |
tree | 27f7fb3628f5692f508c1e3e439fa9d657869c77 /apps/codecs | |
parent | c56950ea3a9e0244461ce445f25bd7a80c8f7199 (diff) | |
download | rockbox-7b1a369cf7801f98139189ade463f3a460f78d85.tar.gz rockbox-7b1a369cf7801f98139189ade463f3a460f78d85.zip |
build system: completely autodetect target cpu architecture.
The existing ARCH Makefile variable is exported to the C code as well.
Additionally the version (arm-only for now) is detected as well. This
allows to for complete autodetection, i.e. that optimized ASM is picked up
if determined by preprocessor (CPU_ARM, etc).
Building a sim/raaa on a arm host will now automatically generate a arm
optmized build like we have for native targets.
Change-Id: I0b35393f8fb3ebd20beaa9e7371fa57bf3782107
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/codecs.make | 4 | ||||
-rw-r--r-- | apps/codecs/demac/libdemac.make | 2 | ||||
-rw-r--r-- | apps/codecs/lib/libcodec.make | 2 | ||||
-rw-r--r-- | apps/codecs/libmad/libmad.make | 2 | ||||
-rw-r--r-- | apps/codecs/libspeex/libspeex.make | 2 | ||||
-rw-r--r-- | apps/codecs/libwmavoice/libwmavoice.make | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 605d8a3556..f2d2f13794 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -88,7 +88,7 @@ $(WMAPROLIB) : CODECFLAGS += -O1 | |||
88 | $(WMAVOICELIB) : CODECFLAGS += -O1 | 88 | $(WMAVOICELIB) : CODECFLAGS += -O1 |
89 | 89 | ||
90 | # fine-tuning of CODECFLAGS per cpu arch | 90 | # fine-tuning of CODECFLAGS per cpu arch |
91 | ifeq ($(ARCH),arm) | 91 | ifeq ($(ARCH),arch_arm) |
92 | # redo per arm generation | 92 | # redo per arm generation |
93 | $(ALACLIB) : CODECFLAGS += -O2 | 93 | $(ALACLIB) : CODECFLAGS += -O2 |
94 | $(AYLIB) : CODECFLAGS += -O1 | 94 | $(AYLIB) : CODECFLAGS += -O1 |
@@ -100,7 +100,7 @@ ifeq ($(ARCH),arm) | |||
100 | $(VGMLIB) : CODECFLAGS += -O1 | 100 | $(VGMLIB) : CODECFLAGS += -O1 |
101 | $(EMU2413LIB) : CODECFLAGS += -O3 | 101 | $(EMU2413LIB) : CODECFLAGS += -O3 |
102 | $(WAVPACKLIB) : CODECFLAGS += -O3 | 102 | $(WAVPACKLIB) : CODECFLAGS += -O3 |
103 | else ifeq ($(ARCH),m68k) | 103 | else ifeq ($(ARCH),arch_m68k) |
104 | $(A52LIB) : CODECFLAGS += -O2 | 104 | $(A52LIB) : CODECFLAGS += -O2 |
105 | $(ASFLIB) : CODECFLAGS += -O3 | 105 | $(ASFLIB) : CODECFLAGS += -O3 |
106 | $(ATRACLIB) : CODECFLAGS += -O2 | 106 | $(ATRACLIB) : CODECFLAGS += -O2 |
diff --git a/apps/codecs/demac/libdemac.make b/apps/codecs/demac/libdemac.make index 4614344849..62ad53dfcc 100644 --- a/apps/codecs/demac/libdemac.make +++ b/apps/codecs/demac/libdemac.make | |||
@@ -12,7 +12,7 @@ DEMACLIB := $(CODECDIR)/libdemac.a | |||
12 | DEMACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/demac/libdemac/SOURCES) | 12 | DEMACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/demac/libdemac/SOURCES) |
13 | DEMACLIB_OBJ := $(call c2obj, $(DEMACLIB_SRC)) | 13 | DEMACLIB_OBJ := $(call c2obj, $(DEMACLIB_SRC)) |
14 | OTHER_SRC += $(DEMACLIB_SRC) | 14 | OTHER_SRC += $(DEMACLIB_SRC) |
15 | ifeq ($(CPU),arm) | 15 | ifeq ($(ARCH),arch_arm) |
16 | OTHER_SRC += $(APPSDIR)/codecs/demac/libdemac/udiv32_arm-pre.S | 16 | OTHER_SRC += $(APPSDIR)/codecs/demac/libdemac/udiv32_arm-pre.S |
17 | endif | 17 | endif |
18 | DEMACLIB_PRE := $(subst .a,-pre.a,$(DEMACLIB)) | 18 | DEMACLIB_PRE := $(subst .a,-pre.a,$(DEMACLIB)) |
diff --git a/apps/codecs/lib/libcodec.make b/apps/codecs/lib/libcodec.make index ca9b2c4fe2..7aef72f2b1 100644 --- a/apps/codecs/lib/libcodec.make +++ b/apps/codecs/lib/libcodec.make | |||
@@ -20,7 +20,7 @@ CODECLIBFLAGS = $(filter-out -O%,$(CODECFLAGS)) | |||
20 | 20 | ||
21 | ifeq ($(MEMORYSIZE),2) | 21 | ifeq ($(MEMORYSIZE),2) |
22 | CODECLIBFLAGS += -Os | 22 | CODECLIBFLAGS += -Os |
23 | else ifeq ($(CPU),coldfire) | 23 | else ifeq ($(ARCH),arch_m68k) |
24 | CODECLIBFLAGS += -O2 | 24 | CODECLIBFLAGS += -O2 |
25 | else | 25 | else |
26 | CODECLIBFLAGS += -O1 | 26 | CODECLIBFLAGS += -O1 |
diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make index f8423b88fe..4ed8ab1e8c 100644 --- a/apps/codecs/libmad/libmad.make +++ b/apps/codecs/libmad/libmad.make | |||
@@ -16,7 +16,7 @@ MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmad | |||
16 | MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H | 16 | MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H |
17 | 17 | ||
18 | # libmad is faster on ARM-targets with -O1 than -O2 | 18 | # libmad is faster on ARM-targets with -O1 than -O2 |
19 | ifeq ($(CPU),arm) | 19 | ifeq ($(ARCH),arch_arm) |
20 | MADFLAGS += -O1 | 20 | MADFLAGS += -O1 |
21 | else | 21 | else |
22 | MADFLAGS += -O2 | 22 | MADFLAGS += -O2 |
diff --git a/apps/codecs/libspeex/libspeex.make b/apps/codecs/libspeex/libspeex.make index cc2c3caee1..1089982d27 100644 --- a/apps/codecs/libspeex/libspeex.make +++ b/apps/codecs/libspeex/libspeex.make | |||
@@ -23,7 +23,7 @@ VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(_SPEE | |||
23 | # libspeex is faster on ARM-targets with -O1 instead of -O2 | 23 | # libspeex is faster on ARM-targets with -O1 instead of -O2 |
24 | SPEEXFLAGS = $(filter-out -O%,$(_SPEEXFLAGS)) | 24 | SPEEXFLAGS = $(filter-out -O%,$(_SPEEXFLAGS)) |
25 | 25 | ||
26 | ifeq ($(CPU),arm) | 26 | ifeq ($(ARCH),arch_arm) |
27 | SPEEXFLAGS += -O1 | 27 | SPEEXFLAGS += -O1 |
28 | else | 28 | else |
29 | SPEEXFLAGS += -O2 | 29 | SPEEXFLAGS += -O2 |
diff --git a/apps/codecs/libwmavoice/libwmavoice.make b/apps/codecs/libwmavoice/libwmavoice.make index 0497e18e1b..b35756c64a 100644 --- a/apps/codecs/libwmavoice/libwmavoice.make +++ b/apps/codecs/libwmavoice/libwmavoice.make | |||
@@ -19,7 +19,7 @@ $(WMAVOICELIB): $(WMAVOICELIB_OBJ) | |||
19 | 19 | ||
20 | WMAVOICEFLAGS = -I$(APPSDIR)/codecs/libwmavoice $(filter-out -O%,$(CODECFLAGS)) | 20 | WMAVOICEFLAGS = -I$(APPSDIR)/codecs/libwmavoice $(filter-out -O%,$(CODECFLAGS)) |
21 | 21 | ||
22 | ifeq ($(CPU),coldfire) | 22 | ifeq ($(ARCH),arch_m68k) |
23 | WMAVOICEFLAGS += -O2 | 23 | WMAVOICEFLAGS += -O2 |
24 | else | 24 | else |
25 | WMAVOICEFLAGS += -O1 | 25 | WMAVOICEFLAGS += -O1 |