From 17ab889ed12ac34f38d602998a55470645814324 Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Sun, 21 Sep 2003 19:41:57 +0000
Subject: Fix "subst -g,," problem for SAFECFLAGS.

---
 libc/sysdeps/linux/arm/Makefile     | 2 +-
 libc/sysdeps/linux/common/Makefile  | 2 +-
 libc/sysdeps/linux/i386/Makefile    | 2 +-
 libc/sysdeps/linux/powerpc/Makefile | 2 +-
 libc/sysdeps/linux/sh/Makefile      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index 5fd0bbe85..beed16b23 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -55,7 +55,7 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 ifeq ($(strip $(UCLIBC_PROFILING)),y)
-SAFECFLAGS := $(subst -g,,$(CFLAGS))
+SAFECFLAGS := $(filter-out -g,$(CFLAGS))
 gmon-start.S: ../common/gmon-start.c
 	$(CC) $(SAFECFLAGS) -c $< -S -o $*.S
 gcrt1.o: $(CRT0_DEPS)
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile
index 3135172c0..5323df366 100644
--- a/libc/sysdeps/linux/common/Makefile
+++ b/libc/sysdeps/linux/common/Makefile
@@ -44,7 +44,7 @@ SAFECFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) -fno-built
 # on SH4 addition of -g kills the initfini stuff, removed here for all
 # platforms as I suspect no one want initfini compiled -g :-) - davidm
 #
-SAFECFLAGS := $(subst -g,,$(SAFECFLAGS))
+SAFECFLAGS := $(filter-out -g,$(SAFECFLAGS))
 ifeq ($(strip $(DOPIC)),y)
 SAFECFLAGS+=$(PICFLAG)
 endif
diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile
index b3bb06df6..11df4cbb0 100644
--- a/libc/sysdeps/linux/i386/Makefile
+++ b/libc/sysdeps/linux/i386/Makefile
@@ -58,7 +58,7 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 ifeq ($(strip $(UCLIBC_PROFILING)),y)
-SAFECFLAGS := $(subst -g,,$(CFLAGS))
+SAFECFLAGS := $(filter-out -g,$(CFLAGS))
 gmon-start.S: ../common/gmon-start.c
 	$(CC) $(SAFECFLAGS) -c $< -S -o $*.S
 gcrt1.o: $(CRT0_DEPS)
diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile
index e19da0fba..c1cd0055c 100644
--- a/libc/sysdeps/linux/powerpc/Makefile
+++ b/libc/sysdeps/linux/powerpc/Makefile
@@ -58,7 +58,7 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 ifeq ($(strip $(UCLIBC_PROFILING)),y)
-SAFECFLAGS := $(subst -g,,$(CFLAGS))
+SAFECFLAGS := $(filter-out -g,$(CFLAGS))
 gmon-start.S: ../common/gmon-start.c
 	$(CC) $(SAFECFLAGS) -c $< -S -o $*.S
 gcrt1.o: $(CRT0_DEPS)
diff --git a/libc/sysdeps/linux/sh/Makefile b/libc/sysdeps/linux/sh/Makefile
index 9a4560336..758d4462d 100644
--- a/libc/sysdeps/linux/sh/Makefile
+++ b/libc/sysdeps/linux/sh/Makefile
@@ -57,7 +57,7 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 ifeq ($(strip $(UCLIBC_PROFILING)),y)
-SAFECFLAGS := $(subst -g,,$(CFLAGS))
+SAFECFLAGS := $(filter-out -g,$(CFLAGS))
 gmon-start.S: ../common/gmon-start.c
 	$(CC) $(SAFECFLAGS) -c $< -S -o $*.S
 gcrt1.o: $(CRT0_DEPS)
-- 
cgit v1.2.3