summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-01-09 23:08:56 +0000
committerdim <dim@FreeBSD.org>2014-01-09 23:08:56 +0000
commit01c13c7d48e84e413da6bd014d32c8f5f0787d69 (patch)
tree64c554f66dfcadcb722052a83873055a9d9cabd5 /lib
parent999774a8ef8eaa6132d3de64eebac307c223d29c (diff)
downloadFreeBSD-src-01c13c7d48e84e413da6bd014d32c8f5f0787d69.zip
FreeBSD-src-01c13c7d48e84e413da6bd014d32c8f5f0787d69.tar.gz
MFC r260334:
Split the last gcc-specific flags off into CFLAGS.gcc. This also removes the need to use -Qunused-arguments for clang throughout the tree. MFC r260369: Apply band-aid for 32-bit compat libs failures after r260334: put back -Qunused-arguments for clang for now, until I can figure out a way to make it unneeded in all scenarios. Sorry about the breakage.
Diffstat (limited to 'lib')
-rw-r--r--lib/libiconv/Makefile3
-rw-r--r--lib/libiconv_modules/BIG5/Makefile2
-rw-r--r--lib/libiconv_modules/EUC/Makefile2
-rw-r--r--lib/libiconv_modules/EUCTW/Makefile2
-rw-r--r--lib/libiconv_modules/GBK2K/Makefile2
-rw-r--r--lib/libiconv_modules/ISO2022/Makefile2
-rw-r--r--lib/libiconv_modules/JOHAB/Makefile2
-rw-r--r--lib/libiconv_modules/UES/Makefile2
-rw-r--r--lib/libiconv_modules/UTF1632/Makefile2
-rw-r--r--lib/libiconv_modules/UTF7/Makefile2
-rw-r--r--lib/libiconv_modules/iconv_std/Makefile2
-rw-r--r--lib/libiconv_modules/mapper_parallel/Makefile2
-rw-r--r--lib/libiconv_modules/mapper_serial/Makefile2
-rw-r--r--lib/libiconv_modules/mapper_std/Makefile2
-rw-r--r--lib/libiconv_modules/mapper_zone/Makefile2
15 files changed, 16 insertions, 15 deletions
diff --git a/lib/libiconv/Makefile b/lib/libiconv/Makefile
index 71c2885..1949597 100644
--- a/lib/libiconv/Makefile
+++ b/lib/libiconv/Makefile
@@ -19,6 +19,7 @@ SRCS= citrus_bcs.c citrus_bcs_strtol.c citrus_bcs_strtoul.c \
citrus_module.c citrus_none.c citrus_pivot_factory.c \
citrus_prop.c citrus_stdenc.c iconv.c
-CFLAGS+= --param max-inline-insns-single=128 -I ${.CURDIR}/../../include -I${.CURDIR}/../libc/include
+CFLAGS.gcc+= --param max-inline-insns-single=128
+CFLAGS+= -I ${.CURDIR}/../../include -I${.CURDIR}/../libc/include
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/BIG5/Makefile b/lib/libiconv_modules/BIG5/Makefile
index 0f755fc..cdaf9dd 100644
--- a/lib/libiconv_modules/BIG5/Makefile
+++ b/lib/libiconv_modules/BIG5/Makefile
@@ -2,6 +2,6 @@
SHLIB= BIG5
SRCS+= citrus_big5.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/EUC/Makefile b/lib/libiconv_modules/EUC/Makefile
index 422aab3..aeceff4 100644
--- a/lib/libiconv_modules/EUC/Makefile
+++ b/lib/libiconv_modules/EUC/Makefile
@@ -2,6 +2,6 @@
SHLIB= EUC
SRCS+= citrus_euc.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/EUCTW/Makefile b/lib/libiconv_modules/EUCTW/Makefile
index b85c035..4808ca3 100644
--- a/lib/libiconv_modules/EUCTW/Makefile
+++ b/lib/libiconv_modules/EUCTW/Makefile
@@ -2,6 +2,6 @@
SHLIB= EUCTW
SRCS+= citrus_euctw.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/GBK2K/Makefile b/lib/libiconv_modules/GBK2K/Makefile
index 28dc796..39b3947 100644
--- a/lib/libiconv_modules/GBK2K/Makefile
+++ b/lib/libiconv_modules/GBK2K/Makefile
@@ -2,6 +2,6 @@
SHLIB= GBK2K
SRCS+= citrus_gbk2k.c
-CFLAGS+= --param max-inline-insns-single=16
+CFLAGS.gcc+= --param max-inline-insns-single=16
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/ISO2022/Makefile b/lib/libiconv_modules/ISO2022/Makefile
index 1e865ac..8eba7d3 100644
--- a/lib/libiconv_modules/ISO2022/Makefile
+++ b/lib/libiconv_modules/ISO2022/Makefile
@@ -2,6 +2,6 @@
SHLIB= ISO2022
SRCS+= citrus_iso2022.c
-CFLAGS+= --param max-inline-insns-single=128
+CFLAGS.gcc+= --param max-inline-insns-single=128
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/JOHAB/Makefile b/lib/libiconv_modules/JOHAB/Makefile
index b945445..6a11f73 100644
--- a/lib/libiconv_modules/JOHAB/Makefile
+++ b/lib/libiconv_modules/JOHAB/Makefile
@@ -2,6 +2,6 @@
SHLIB= JOHAB
SRCS+= citrus_johab.c
-CFLAGS+= --param max-inline-insns-single=16
+CFLAGS.gcc+= --param max-inline-insns-single=16
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/UES/Makefile b/lib/libiconv_modules/UES/Makefile
index 972e496..dc8f2d9 100644
--- a/lib/libiconv_modules/UES/Makefile
+++ b/lib/libiconv_modules/UES/Makefile
@@ -2,6 +2,6 @@
SHLIB= UES
SRCS+= citrus_ues.c
-CFLAGS+= --param max-inline-insns-single=64
+CFLAGS.gcc+= --param max-inline-insns-single=64
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/UTF1632/Makefile b/lib/libiconv_modules/UTF1632/Makefile
index 71e9f88..485d070 100644
--- a/lib/libiconv_modules/UTF1632/Makefile
+++ b/lib/libiconv_modules/UTF1632/Makefile
@@ -2,6 +2,6 @@
SHLIB= UTF1632
SRCS+= citrus_utf1632.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/UTF7/Makefile b/lib/libiconv_modules/UTF7/Makefile
index 8bedb73..733cb26 100644
--- a/lib/libiconv_modules/UTF7/Makefile
+++ b/lib/libiconv_modules/UTF7/Makefile
@@ -2,6 +2,6 @@
SHLIB= UTF7
SRCS+= citrus_utf7.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/iconv_std/Makefile b/lib/libiconv_modules/iconv_std/Makefile
index a873cfa..88d68aa 100644
--- a/lib/libiconv_modules/iconv_std/Makefile
+++ b/lib/libiconv_modules/iconv_std/Makefile
@@ -2,6 +2,6 @@
SHLIB= iconv_std
SRCS+= citrus_iconv_std.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/mapper_parallel/Makefile b/lib/libiconv_modules/mapper_parallel/Makefile
index 000c1cd..b79c3ad 100644
--- a/lib/libiconv_modules/mapper_parallel/Makefile
+++ b/lib/libiconv_modules/mapper_parallel/Makefile
@@ -4,6 +4,6 @@
SHLIB= mapper_parallel
SRCS+= citrus_mapper_serial.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/mapper_serial/Makefile b/lib/libiconv_modules/mapper_serial/Makefile
index 67d4bb0..0b5907b 100644
--- a/lib/libiconv_modules/mapper_serial/Makefile
+++ b/lib/libiconv_modules/mapper_serial/Makefile
@@ -2,6 +2,6 @@
SHLIB= mapper_serial
SRCS+= citrus_mapper_serial.c
-CFLAGS+= --param max-inline-insns-single=32
+CFLAGS.gcc+= --param max-inline-insns-single=32
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/mapper_std/Makefile b/lib/libiconv_modules/mapper_std/Makefile
index 0d35e90..aa46ad2 100644
--- a/lib/libiconv_modules/mapper_std/Makefile
+++ b/lib/libiconv_modules/mapper_std/Makefile
@@ -2,6 +2,6 @@
SHLIB= mapper_std
SRCS+= citrus_mapper_std.c
-CFLAGS+= --param max-inline-insns-single=8
+CFLAGS.gcc+= --param max-inline-insns-single=8
.include <bsd.lib.mk>
diff --git a/lib/libiconv_modules/mapper_zone/Makefile b/lib/libiconv_modules/mapper_zone/Makefile
index 287bc24..4bdeef6 100644
--- a/lib/libiconv_modules/mapper_zone/Makefile
+++ b/lib/libiconv_modules/mapper_zone/Makefile
@@ -2,6 +2,6 @@
SHLIB= mapper_zone
SRCS+= citrus_mapper_zone.c
-CFLAGS+= --param max-inline-insns-single=8
+CFLAGS.gcc+= --param max-inline-insns-single=8
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud