diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2021-07-08 20:46:11 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-07-08 20:47:30 -0400 |
commit | 2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d (patch) | |
tree | 612e9d9a70ed50088ee643b7ea3bc6e0edae1ae2 | |
parent | 2c984f3714067a38980dae51d1cb7d66d49f84f8 (diff) | |
download | rockbox-2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d.tar.gz rockbox-2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d.zip |
build: Nuke the ASMFLAGS workaround for gcc 3.4.x
Change-Id: I0f21e9539d39afd54916fa8d84ce798eef474a2c
-rw-r--r-- | lib/rbcodec/codecs/codecs.make | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libmad/libmad.make | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libspeex/libspeex.make | 4 | ||||
-rw-r--r-- | tools/make.inc | 2 | ||||
-rw-r--r-- | tools/root.make | 5 |
5 files changed, 8 insertions, 9 deletions
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make index 4f86db0d7d..f39c0b193f 100644 --- a/lib/rbcodec/codecs/codecs.make +++ b/lib/rbcodec/codecs/codecs.make | |||
@@ -206,7 +206,7 @@ $(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.c | |||
206 | $(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S | 206 | $(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S |
207 | $(SILENT)mkdir -p $(dir $@) | 207 | $(SILENT)mkdir -p $(dir $@) |
208 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ | 208 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ |
209 | -I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@ | 209 | -I$(dir $<) $(CODECFLAGS) -c $< -o $@ |
210 | 210 | ||
211 | $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECS_LIBS) | 211 | $(CODECDIR)/%-pre.map: $(CODEC_CRT0) $(CODECLINK_LDS) $(CODECDIR)/%.o $(CODECS_LIBS) |
212 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \ | 212 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*-pre.elf \ |
diff --git a/lib/rbcodec/codecs/libmad/libmad.make b/lib/rbcodec/codecs/libmad/libmad.make index fa6040d29a..6c50e1d201 100644 --- a/lib/rbcodec/codecs/libmad/libmad.make +++ b/lib/rbcodec/codecs/libmad/libmad.make | |||
@@ -45,7 +45,7 @@ $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.c | |||
45 | $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S | 45 | $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S |
46 | $(SILENT)mkdir -p $(dir $@) | 46 | $(SILENT)mkdir -p $(dir $@) |
47 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | 47 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ |
48 | $(CC) $(MPEGMADFLAGS) $(ASMFLAGS) -c $< -o $@ | 48 | $(CC) $(MPEGMADFLAGS) -c $< -o $@ |
49 | 49 | ||
50 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c | 50 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c |
51 | $(SILENT)mkdir -p $(dir $@) | 51 | $(SILENT)mkdir -p $(dir $@) |
@@ -55,4 +55,4 @@ $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c | |||
55 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.S | 55 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.S |
56 | $(SILENT)mkdir -p $(dir $@) | 56 | $(SILENT)mkdir -p $(dir $@) |
57 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | 57 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ |
58 | $(CC) $(MADFLAGS) $(ASMFLAGS) -c $< -o $@ | 58 | $(CC) $(MADFLAGS) -c $< -o $@ |
diff --git a/lib/rbcodec/codecs/libspeex/libspeex.make b/lib/rbcodec/codecs/libspeex/libspeex.make index c33fe1f9fa..9883c5d8fc 100644 --- a/lib/rbcodec/codecs/libspeex/libspeex.make +++ b/lib/rbcodec/codecs/libspeex/libspeex.make | |||
@@ -45,7 +45,7 @@ $(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.c | |||
45 | 45 | ||
46 | $(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.S | 46 | $(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.S |
47 | $(SILENT)mkdir -p $(dir $@) | 47 | $(SILENT)mkdir -p $(dir $@) |
48 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) $(ASMFLAGS) -c $< -o $@ | 48 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) -c $< -o $@ |
49 | 49 | ||
50 | $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c | 50 | $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c |
51 | $(SILENT)mkdir -p $(dir $@) | 51 | $(SILENT)mkdir -p $(dir $@) |
@@ -53,4 +53,4 @@ $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c | |||
53 | 53 | ||
54 | $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.S | 54 | $(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.S |
55 | $(SILENT)mkdir -p $(dir $@) | 55 | $(SILENT)mkdir -p $(dir $@) |
56 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) $(ASMFLAGS) -c $< -o $@ | 56 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) -c $< -o $@ |
diff --git a/tools/make.inc b/tools/make.inc index d03898b2e1..5521612f62 100644 --- a/tools/make.inc +++ b/tools/make.inc | |||
@@ -11,7 +11,7 @@ $(OBJDIR)/%.o: %.c | |||
11 | 11 | ||
12 | $(OBJDIR)/%.o: %.S | 12 | $(OBJDIR)/%.o: %.S |
13 | $(SILENT)mkdir -p $(dir $@) | 13 | $(SILENT)mkdir -p $(dir $@) |
14 | $(call PRINTS,CC $<)$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ | 14 | $(call PRINTS,CC $<)$(CC) $(CFLAGS) -c $< -o $@ |
15 | 15 | ||
16 | # The echo stuff last in the dep update shell magic is to prevent any compiler | 16 | # The echo stuff last in the dep update shell magic is to prevent any compiler |
17 | # errors/warnings to cause an error code to get returned and thus stop the | 17 | # errors/warnings to cause an error code to get returned and thus stop the |
diff --git a/tools/root.make b/tools/root.make index f1bd14b827..2a83a32292 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -16,7 +16,6 @@ INCLUDES = -I$(BUILDDIR) -I$(BUILDDIR)/lang $(TARGET_INC) | |||
16 | 16 | ||
17 | CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) | 17 | CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) |
18 | PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix | 18 | PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix |
19 | ASMFLAGS = -D__ASSEMBLER__ # work around gcc 3.4.x bug with -std=gnu99, only meant for .S files | ||
20 | CORE_LDOPTS = $(GLOBAL_LDOPTS) # linker ops specifically for core build | 19 | CORE_LDOPTS = $(GLOBAL_LDOPTS) # linker ops specifically for core build |
21 | 20 | ||
22 | TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ | 21 | TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ |
@@ -436,7 +435,7 @@ $(BUILDDIR)/%.o: $(ROOTDIR)/%.c | |||
436 | 435 | ||
437 | $(BUILDDIR)/%.o: $(ROOTDIR)/%.S | 436 | $(BUILDDIR)/%.o: $(ROOTDIR)/%.S |
438 | $(SILENT)mkdir -p $(dir $@) | 437 | $(SILENT)mkdir -p $(dir $@) |
439 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ | 438 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ |
440 | 439 | ||
441 | # generated definitions for use in .S files | 440 | # generated definitions for use in .S files |
442 | $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c | 441 | $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c |
@@ -451,7 +450,7 @@ $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c | |||
451 | 450 | ||
452 | %.o: %.S | 451 | %.o: %.S |
453 | $(SILENT)mkdir -p $(dir $@) | 452 | $(SILENT)mkdir -p $(dir $@) |
454 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ | 453 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ |
455 | 454 | ||
456 | Makefile: $(TOOLSDIR)/configure | 455 | Makefile: $(TOOLSDIR)/configure |
457 | ifneq (reconf,$(MAKECMDGOALS)) | 456 | ifneq (reconf,$(MAKECMDGOALS)) |