Author: bdrewery
Date: Sat Mar 26 03:46:12 2016
New Revision: 297283
URL: https://svnweb.freebsd.org/changeset/base/297283
Log:
Implement (ACFLAGS|CFLAGS|CXXFLAGS).SRC globally.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/lib/clang/libllvmsupport/Makefile
head/lib/libc/net/Makefile.inc
head/lib/libc/stdtime/Makefile.inc
head/lib/libclang_rt/asan_dynamic/Makefile
head/lib/libz/Makefile
head/lib/msun/arm/Makefile.inc
head/share/mk/bsd.README
head/share/mk/bsd.sys.mk
head/sys/boot/i386/boot0/Makefile
head/sys/boot/i386/boot2/Makefile
head/sys/boot/i386/btx/btx/Makefile
head/sys/boot/i386/btx/btxldr/Makefile
head/sys/boot/i386/cdboot/Makefile
head/sys/boot/i386/gptboot/Makefile
head/sys/boot/i386/gptzfsboot/Makefile
head/sys/boot/i386/libi386/Makefile
head/sys/boot/i386/pxeldr/Makefile
head/sys/boot/i386/zfsboot/Makefile
head/sys/boot/pc98/boot2/Makefile
head/sys/boot/pc98/btx/btx/Makefile
head/sys/boot/pc98/btx/btxldr/Makefile
head/sys/boot/pc98/cdboot/Makefile
Modified: head/lib/clang/libllvmsupport/Makefile
==============================================================================
--- head/lib/clang/libllvmsupport/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/lib/clang/libllvmsupport/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -113,4 +113,3 @@ SRCS+= StringPool.cpp
# Ugly hack to work around CLOCK_PROCESS_CPUTIME_ID not being properly defined
# between r239347 and r245428.
CXXFLAGS.Process.cpp= -DCLOCK_PROCESS_CPUTIME_ID=15
-CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}}
Modified: head/lib/libc/net/Makefile.inc
==============================================================================
--- head/lib/libc/net/Makefile.inc Sat Mar 26 03:46:04 2016
(r297282)
+++ head/lib/libc/net/Makefile.inc Sat Mar 26 03:46:12 2016
(r297283)
@@ -35,7 +35,6 @@ YFLAGS+=-p_nsyy
LFLAGS+=-P_nsyy
CFLAGS.nslexer.c= -DYY_BUF_SIZE=1024
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
MAN+= byteorder.3 ethers.3 eui64.3 \
getaddrinfo.3 gai_strerror.3 gethostbyname.3 \
Modified: head/lib/libc/stdtime/Makefile.inc
==============================================================================
--- head/lib/libc/stdtime/Makefile.inc Sat Mar 26 03:46:04 2016
(r297282)
+++ head/lib/libc/stdtime/Makefile.inc Sat Mar 26 03:46:12 2016
(r297283)
@@ -12,7 +12,6 @@ SYM_MAPS+= ${LIBC_SRCTOP}/stdtime/Symbol
CFLAGS+= -I${LIBC_SRCTOP}/../../contrib/tzcode/stdtime -I${LIBC_SRCTOP}/stdtime
CFLAGS.localtime.c= -fwrapv
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
MAN+= ctime.3 strftime.3 strptime.3 time2posix.3
MAN+= tzfile.5
Modified: head/lib/libclang_rt/asan_dynamic/Makefile
==============================================================================
--- head/lib/libclang_rt/asan_dynamic/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/lib/libclang_rt/asan_dynamic/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -101,4 +101,3 @@ CXXFLAGS.ubsan_handlers_cxx.cc= -frtti
CXXFLAGS.ubsan_type_hash.cc= -frtti
CXXFLAGS.ubsan_type_hash_itanium.cc= -frtti
CXXFLAGS.ubsan_type_hash_win.cc= -frtti
-CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}}
Modified: head/lib/libz/Makefile
==============================================================================
--- head/lib/libz/Makefile Sat Mar 26 03:46:04 2016 (r297282)
+++ head/lib/libz/Makefile Sat Mar 26 03:46:12 2016 (r297283)
@@ -75,4 +75,3 @@ FILESDIR= ${LIBDATADIR}/pkgconfig
## XXX: clang integrated-as doesn't grok .intel_syntax directives yet
#ACFLAGS.gvmat64.S= ${CLANG_NO_IAS}
-#ACFLAGS+= ${ACFLAGS.${.IMPSRC:T}}
Modified: head/lib/msun/arm/Makefile.inc
==============================================================================
--- head/lib/msun/arm/Makefile.inc Sat Mar 26 03:46:04 2016
(r297282)
+++ head/lib/msun/arm/Makefile.inc Sat Mar 26 03:46:12 2016
(r297283)
@@ -8,5 +8,3 @@ ARCH_SRCS = fenv-softfp.c fenv-vfp.c
.endif
CFLAGS.fenv-vfp.c= -mfpu=vfp -mfloat-abi=softfp
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
-
Modified: head/share/mk/bsd.README
==============================================================================
--- head/share/mk/bsd.README Sat Mar 26 03:46:04 2016 (r297282)
+++ head/share/mk/bsd.README Sat Mar 26 03:46:12 2016 (r297283)
@@ -120,6 +120,10 @@ object.
The following variables are common:
+ACFLAGS.${SRC}
+ Flags dependent on source file name.
+CFLAGS.${SRC}
+ Flags dependent on source file name.
CFLAGS.${COMPILER_TYPE}
Flags dependent on compiler added to CXXFLAGS.
CFLAGS.${MACHINE_ARCH}
@@ -131,6 +135,8 @@ CXXFLAGS.${COMPILER_TYPE}
Flags dependent on compiler added to CXXFLAGS.
CXXFLAGS.${MACHINE_ARCH}
Architectural flags added to CXXFLAGS.
+CXXFLAGS.${SRC}
+ Flags dependent on source file name.
COMPILER_FEATURES
A list of features that the compiler supports. Zero or
more of:
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Sat Mar 26 03:46:04 2016 (r297282)
+++ head/share/mk/bsd.sys.mk Sat Mar 26 03:46:12 2016 (r297283)
@@ -174,6 +174,10 @@ CFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
CFLAGS+= ${CFLAGS.${COMPILER_TYPE}}
CXXFLAGS+= ${CXXFLAGS.${COMPILER_TYPE}}
+ACFLAGS+= ${ACFLAGS.${.IMPSRC:T}}
+CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
+CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}}
+
# Tell bmake not to mistake standard targets for things to be searched for
# or expect to ever be up-to-date.
PHONY_NOTMAIN = analyze afterdepend afterinstall all beforedepend
beforeinstall \
Modified: head/sys/boot/i386/boot0/Makefile
==============================================================================
--- head/sys/boot/i386/boot0/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/boot0/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -80,4 +80,3 @@ LDFLAGS=-e start -Ttext ${BOOT_BOOT0_ORG
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.boot0.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/i386/boot2/Makefile
==============================================================================
--- head/sys/boot/i386/boot2/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/boot2/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -115,4 +115,3 @@ machine: ${.CURDIR}/../../../i386/includ
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.boot1.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/i386/btx/btx/Makefile
==============================================================================
--- head/sys/boot/i386/btx/btx/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/btx/btx/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -31,4 +31,3 @@ LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.btx.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/i386/btx/btxldr/Makefile
==============================================================================
--- head/sys/boot/i386/btx/btxldr/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/btx/btxldr/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -18,4 +18,3 @@ LDFLAGS=-e start -Ttext ${LOADER_ADDRESS
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.btxldr.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/i386/cdboot/Makefile
==============================================================================
--- head/sys/boot/i386/cdboot/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/cdboot/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -16,4 +16,3 @@ LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.cdboot.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/i386/gptboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptboot/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/gptboot/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -90,4 +90,3 @@ machine: .NOMETA
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.gptldr.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptzfsboot/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/gptzfsboot/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -88,4 +88,3 @@ machine: .NOMETA
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.gptldr.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/i386/libi386/Makefile
==============================================================================
--- head/sys/boot/i386/libi386/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/libi386/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -75,7 +75,6 @@ machine: .NOMETA
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.amd64_tramp.S= ${CLANG_NO_IAS}
CFLAGS.multiboot_tramp.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
.if ${MACHINE_CPUARCH} == "amd64"
beforedepend ${OBJS}: machine
Modified: head/sys/boot/i386/pxeldr/Makefile
==============================================================================
--- head/sys/boot/i386/pxeldr/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/pxeldr/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -46,4 +46,3 @@ ${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXK
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.pxeldr.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- head/sys/boot/i386/zfsboot/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/i386/zfsboot/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -93,4 +93,3 @@ machine: .NOMETA
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.zfsldr.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/pc98/boot2/Makefile
==============================================================================
--- head/sys/boot/pc98/boot2/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/pc98/boot2/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -114,4 +114,3 @@ boot2.h: boot1.out
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.boot1.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/pc98/btx/btx/Makefile
==============================================================================
--- head/sys/boot/pc98/btx/btx/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/pc98/btx/btx/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -31,4 +31,3 @@ LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.btx.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/pc98/btx/btxldr/Makefile
==============================================================================
--- head/sys/boot/pc98/btx/btxldr/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/pc98/btx/btxldr/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -18,4 +18,3 @@ LDFLAGS=-e start -Ttext ${LOADER_ADDRESS
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.btxldr.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
Modified: head/sys/boot/pc98/cdboot/Makefile
==============================================================================
--- head/sys/boot/pc98/cdboot/Makefile Sat Mar 26 03:46:04 2016
(r297282)
+++ head/sys/boot/pc98/cdboot/Makefile Sat Mar 26 03:46:12 2016
(r297283)
@@ -16,4 +16,3 @@ LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.cdboot.S= ${CLANG_NO_IAS}
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
