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 /tools/root.make | |
parent | 2c984f3714067a38980dae51d1cb7d66d49f84f8 (diff) | |
download | rockbox-2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d.tar.gz rockbox-2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d.zip |
build: Nuke the ASMFLAGS workaround for gcc 3.4.x
Change-Id: I0f21e9539d39afd54916fa8d84ce798eef474a2c
Diffstat (limited to 'tools/root.make')
-rw-r--r-- | tools/root.make | 5 |
1 files changed, 2 insertions, 3 deletions
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)) |