[klibc] Use += for KLIBCOPTFLAGS

Use += to set KLIBCOPTFLAGS, so that we can provide generic options
in scripts/Kbuild.klibc as necessary.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

17 files changed, 18 insertions, 18 deletions

diff --git a/usr/klibc/arch/alpha/MCONFIG b/usr/klibc/arch/alpha/MCONFIG
index 4420cdb599fd53..e7dc61a576f8a4 100644
--- a/usr/klibc/arch/alpha/MCONFIG
+++ b/usr/klibc/arch/alpha/MCONFIG
@@ -5,7 +5,7 @@
 # Build configuration for this architecture
 #
 
-KLIBCOPTFLAGS = -Os
+KLIBCOPTFLAGS += -Os
 KLIBCBITSIZE  = 64
 
 # Extra linkflags when building the shared version of the library
diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG
index fa3ada215beb51..1176fcd94c372a 100644
--- a/usr/klibc/arch/arm/MCONFIG
+++ b/usr/klibc/arch/arm/MCONFIG
@@ -10,7 +10,7 @@
 CPU_ARCH := armv4
 CPU_TUNE := strongarm
 
-KLIBCOPTFLAGS = -Os -march=$(CPU_ARCH) -mtune=$(CPU_TUNE)
+KLIBCOPTFLAGS += -Os -march=$(CPU_ARCH) -mtune=$(CPU_TUNE)
 KLIBCBITSIZE  = 32
 KLIBCREQFLAGS += -fno-exceptions
 KLIBCSTRIPFLAGS += -R .ARM.exidx
diff --git a/usr/klibc/arch/cris/MCONFIG b/usr/klibc/arch/cris/MCONFIG
index 659789b27870d8..20bfe73176b775 100644
--- a/usr/klibc/arch/cris/MCONFIG
+++ b/usr/klibc/arch/cris/MCONFIG
@@ -7,7 +7,7 @@
 # accordingly.
 #
 
-KLIBCOPTFLAGS = -Os -fomit-frame-pointer
+KLIBCOPTFLAGS += -Os -fomit-frame-pointer
 KLIBCBITSIZE  = 32
 
 # Extra linkflags when building the shared version of the library
diff --git a/usr/klibc/arch/i386/MCONFIG b/usr/klibc/arch/i386/MCONFIG
index e1732660acc672..ef112a45910b5a 100644
--- a/usr/klibc/arch/i386/MCONFIG
+++ b/usr/klibc/arch/i386/MCONFIG
@@ -19,7 +19,7 @@ gcc_align_option  := $(call cc-option, \
 		-malign-functions=0 -malign-jumps=0 -malign-loops=0)
 gcc_m32_option  := $(call cc-option, -m32, )
 
-KLIBCOPTFLAGS     = -march=i386 -Os -g -fomit-frame-pointer $(gcc_align_option)
+KLIBCOPTFLAGS     += -march=i386 -Os -g -fomit-frame-pointer $(gcc_align_option)
 KLIBCLDFLAGS      = -m elf_i386
 KLIBCREQFLAGS	  += $(REGPARM_OPT)
 KLIBCARCHREQFLAGS += $(gcc_m32_option)
diff --git a/usr/klibc/arch/ia64/MCONFIG b/usr/klibc/arch/ia64/MCONFIG
index 99dd4a51474aea..ad868ef8f0f28c 100644
--- a/usr/klibc/arch/ia64/MCONFIG
+++ b/usr/klibc/arch/ia64/MCONFIG
@@ -7,5 +7,5 @@
 # accordingly.
 #
 
-KLIBCOPTFLAGS = -Os
+KLIBCOPTFLAGS += -Os
 KLIBCBITSIZE  = 64
diff --git a/usr/klibc/arch/m32r/MCONFIG b/usr/klibc/arch/m32r/MCONFIG
index 2f9db0bae12b20..7ca27859f86344 100644
--- a/usr/klibc/arch/m32r/MCONFIG
+++ b/usr/klibc/arch/m32r/MCONFIG
@@ -7,7 +7,7 @@
 # accordingly.
 #
 
-KLIBCOPTFLAGS = -Os
+KLIBCOPTFLAGS += -Os
 KLIBCBITSIZE  = 32
 
 # Extra linkflags when building the shared version of the library
diff --git a/usr/klibc/arch/m68k/MCONFIG b/usr/klibc/arch/m68k/MCONFIG
index 43604084473598..ef97b5659344c9 100644
--- a/usr/klibc/arch/m68k/MCONFIG
+++ b/usr/klibc/arch/m68k/MCONFIG
@@ -7,5 +7,5 @@
 # accordingly.
 #
 
-KLIBCOPTFLAGS = -Os -fomit-frame-pointer
+KLIBCOPTFLAGS += -Os -fomit-frame-pointer
 KLIBCBITSIZE  = 32
diff --git a/usr/klibc/arch/mips/MCONFIG b/usr/klibc/arch/mips/MCONFIG
index fd705002bea540..c6331a1dcacc6d 100644
--- a/usr/klibc/arch/mips/MCONFIG
+++ b/usr/klibc/arch/mips/MCONFIG
@@ -8,7 +8,7 @@
 #
 
 KLIBCARCHREQFLAGS = -fno-pic -mno-abicalls -G 0
-KLIBCOPTFLAGS     = -Os
+KLIBCOPTFLAGS     += -Os
 KLIBCBITSIZE      = 32
 
 # Extra linkflags when building the shared version of the library
diff --git a/usr/klibc/arch/mips64/MCONFIG b/usr/klibc/arch/mips64/MCONFIG
index 3b55625c30f893..5c50b8d2656613 100644
--- a/usr/klibc/arch/mips64/MCONFIG
+++ b/usr/klibc/arch/mips64/MCONFIG
@@ -7,5 +7,5 @@
 # accordingly.
 #
 
-KLIBCOPTFLAGS = -Os
+KLIBCOPTFLAGS += -Os
 KLIBCBITSIZE  = 64
diff --git a/usr/klibc/arch/parisc/MCONFIG b/usr/klibc/arch/parisc/MCONFIG
index 83c2e9e5a3c21b..628e98773d6630 100644
--- a/usr/klibc/arch/parisc/MCONFIG
+++ b/usr/klibc/arch/parisc/MCONFIG
@@ -7,6 +7,6 @@
 # accordingly.
 #
 
-KLIBCOPTFLAGS = -Os -fomit-frame-pointer
+KLIBCOPTFLAGS += -Os -fomit-frame-pointer
 KLIBCBITSIZE  = 32
 KLIBCSHAREDFLAGS	= -Ttext 0x40001000
diff --git a/usr/klibc/arch/ppc/MCONFIG b/usr/klibc/arch/ppc/MCONFIG
index 541093304a4451..e973389d8b5a55 100644
--- a/usr/klibc/arch/ppc/MCONFIG
+++ b/usr/klibc/arch/ppc/MCONFIG
@@ -9,7 +9,7 @@
 
 gcc_m32_option  := $(call cc-option, -m32, )
 
-KLIBCOPTFLAGS	   = -Os
+KLIBCOPTFLAGS	   += -Os
 KLIBCLDFLAGS       = -m elf32ppclinux
 KLIBCARCHREQFLAGS += $(gcc_m32_option)
 
diff --git a/usr/klibc/arch/ppc64/MCONFIG b/usr/klibc/arch/ppc64/MCONFIG
index 6d8e1361ec734d..eb2d07a39f80df 100644
--- a/usr/klibc/arch/ppc64/MCONFIG
+++ b/usr/klibc/arch/ppc64/MCONFIG
@@ -8,7 +8,7 @@
 #
 
 KLIBCARCHREQFLAGS = -m64 -mcall-aixdesc
-KLIBCOPTFLAGS     = -Os
+KLIBCOPTFLAGS     += -Os
 KLIBCBITSIZE      = 64
 KLIBCLDFLAGS      = -m elf64ppc
 
diff --git a/usr/klibc/arch/s390/MCONFIG b/usr/klibc/arch/s390/MCONFIG
index dd4495ad3245de..a697243a2355d2 100644
--- a/usr/klibc/arch/s390/MCONFIG
+++ b/usr/klibc/arch/s390/MCONFIG
@@ -7,7 +7,7 @@
 # accordingly.
 #
 
-KLIBCOPTFLAGS = -Os
+KLIBCOPTFLAGS += -Os
 
 ifneq ("$(KLIBCARCH)", "s390x")
 	KLIBCBITSIZE	= 32
diff --git a/usr/klibc/arch/sh/MCONFIG b/usr/klibc/arch/sh/MCONFIG
index f0106e1ad1c1a7..ba9085005e247a 100644
--- a/usr/klibc/arch/sh/MCONFIG
+++ b/usr/klibc/arch/sh/MCONFIG
@@ -8,7 +8,7 @@
 #
 
 ARCHREGFLAGS = -m4 -mno-implicit-fp
-KLIBCOPTFLAGS     = -Os -fomit-frame-pointer
+KLIBCOPTFLAGS     += -Os -fomit-frame-pointer
 KLIBCBITSIZE      = 32
 
 # Extra linkflags when building the shared version of the library
diff --git a/usr/klibc/arch/sparc/MCONFIG b/usr/klibc/arch/sparc/MCONFIG
index 9bb7592b977431..235ce60cc290b0 100644
--- a/usr/klibc/arch/sparc/MCONFIG
+++ b/usr/klibc/arch/sparc/MCONFIG
@@ -7,7 +7,7 @@
 # accordingly.
 #
 
-KLIBCOPTFLAGS		 = -Os -m32 -mptr32
+KLIBCOPTFLAGS		 += -Os -m32 -mptr32
 KLIBCBITSIZE		 = 32
 KLIBCARCHREQFLAGS	+= -D__sparc32__
 
diff --git a/usr/klibc/arch/sparc64/MCONFIG b/usr/klibc/arch/sparc64/MCONFIG
index 443250a34ad8ce..bd6f0047e977ca 100644
--- a/usr/klibc/arch/sparc64/MCONFIG
+++ b/usr/klibc/arch/sparc64/MCONFIG
@@ -8,7 +8,7 @@
 #
 
 KLIBCARCHREQFLAGS = -m64 -mptr64 -D__sparc64__
-KLIBCOPTFLAGS     = -Os
+KLIBCOPTFLAGS     += -Os
 KLIBCBITSIZE      = 64
 
 KLIBCLDFLAGS      = -m elf64_sparc
diff --git a/usr/klibc/arch/x86_64/MCONFIG b/usr/klibc/arch/x86_64/MCONFIG
index edcd63855b621c..d01f5e3803e437 100644
--- a/usr/klibc/arch/x86_64/MCONFIG
+++ b/usr/klibc/arch/x86_64/MCONFIG
@@ -16,10 +16,10 @@
 #
 KLIBCARCHREQFLAGS = -m64
 ifeq ($(DEBUG),y)
-KLIBCOPTFLAGS     = -Os -fomit-frame-pointer \
+KLIBCOPTFLAGS     += -Os -fomit-frame-pointer \
 		-falign-functions=1 -falign-jumps=1 -falign-loops=1
 else
-KLIBCOPTFLAGS     = -Os -fno-asynchronous-unwind-tables -fomit-frame-pointer \
+KLIBCOPTFLAGS     += -Os -fno-asynchronous-unwind-tables -fomit-frame-pointer \
 		-falign-functions=1 -falign-jumps=1 -falign-loops=1
 endif
 KLIBCBITSIZE      = 64