public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-4251] libsanitizer: Add AM_CCASFLAGS to Makefile.am
@ 2021-10-08 13:17 H.J. Lu
  0 siblings, 0 replies; only message in thread
From: H.J. Lu @ 2021-10-08 13:17 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:a23653c6a683d6a1bb1278aaa32e35247d8c2740

commit r12-4251-ga23653c6a683d6a1bb1278aaa32e35247d8c2740
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 10 06:13:59 2021 -0700

    libsanitizer: Add AM_CCASFLAGS to Makefile.am
    
    commit 9069eb28d45baaa8baf5e3790b03b0e2cc5b49b3
    Author: Igor Tsimbalist <igor.v.tsimbalist@intel.com>
    Date:   Fri Nov 17 22:34:50 2017 +0100
    
        Enable building libsanitizer with Intel CET
    
        libsanitizer/
                * acinclude.m4: Add enable.m4 and cet.m4.
                * Makefile.in: Regenerate.
                * asan/Makefile.am: Update AM_CXXFLAGS.
                * asan/Makefile.in: Regenerate.
                * configure: Likewise.
                * configure.ac: Set CET_FLAGS. Update EXTRA_CFLAGS,
                EXTRA_CXXFLAGS, EXTRA_ASFLAGS.
                * interception/Makefile.am: Update AM_CXXFLAGS.
                * interception/Makefile.in: Regenerate.
                * libbacktrace/Makefile.am: Update AM_CFLAGS, AM_CXXFLAGS.
                * libbacktrace/Makefile.in: Regenerate.
                * lsan/Makefile.am: Update AM_CXXFLAGS.
                * lsan/Makefile.in: Regenerate.
                * sanitizer_common/Makefile.am: Update AM_CXXFLAGS,
                AM_CCASFLAGS.
                * sanitizer_common/sanitizer_linux_x86_64.S: Include cet.h.
                Add _CET_ENDBR macro.
                * sanitizer_common/Makefile.in: Regenerate.
                * tsan/Makefile.am: Update AM_CXXFLAGS.
                * tsan/Makefile.in: Regenerate.
                * tsan/tsan_rtl_amd64.S Include cet.h. Add _CET_ENDBR macro.
                * ubsan/Makefile.am: Update AM_CXXFLAGS.
                * ubsan/Makefile.in: Regenerate.
    
    failed to add EXTRA_ASFLAGS to AM_CCASFLAGS in all Makefile.am.  As
    the result, CET aren't enabled in all assembly codes.
    
    Add AM_CCASFLAGS to Makefile.am to compile assembly codes with $CET_FLAGS.
    
            PR sanitizer/102632
            * asan/Makefile.am (AM_CCASFLAGS): New.  Set to $(EXTRA_ASFLAGS).
            * hwasan/Makefile.am (AM_CCASFLAGS): Likewise.
            * interception/Makefile.am (AM_CCASFLAGS): Likewise.
            * lsan/Makefile.am (AM_CCASFLAGS): Likewise.
            * tsan/Makefile.am (AM_CCASFLAGS): Likewise.
            * ubsan/Makefile.am (AM_CCASFLAGS): Likewise.
            * asan/Makefile.in: Regenerate.
            * hwasan/Makefile.in: Likewise.
            * interception/Makefile.in: Likewise.
            * lsan/Makefile.in: Likewise.
            * tsan/Makefile.in: Likewise.
            * ubsan/Makefile.in: Likewise.

Diff:
---
 libsanitizer/asan/Makefile.am         | 1 +
 libsanitizer/asan/Makefile.in         | 1 +
 libsanitizer/hwasan/Makefile.am       | 1 +
 libsanitizer/hwasan/Makefile.in       | 1 +
 libsanitizer/interception/Makefile.am | 1 +
 libsanitizer/interception/Makefile.in | 1 +
 libsanitizer/lsan/Makefile.am         | 1 +
 libsanitizer/lsan/Makefile.in         | 1 +
 libsanitizer/tsan/Makefile.am         | 1 +
 libsanitizer/tsan/Makefile.in         | 1 +
 libsanitizer/ubsan/Makefile.am        | 1 +
 libsanitizer/ubsan/Makefile.in        | 1 +
 12 files changed, 12 insertions(+)

diff --git a/libsanitizer/asan/Makefile.am b/libsanitizer/asan/Makefile.am
index 74658ca7b9c..4f802f723d6 100644
--- a/libsanitizer/asan/Makefile.am
+++ b/libsanitizer/asan/Makefile.am
@@ -11,6 +11,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long
 AM_CXXFLAGS += $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
 AM_CXXFLAGS += -std=gnu++14
 AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config
 
 toolexeclib_LTLIBRARIES = libasan.la
diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in
index 53efe526f9c..528ab61312c 100644
--- a/libsanitizer/asan/Makefile.in
+++ b/libsanitizer/asan/Makefile.in
@@ -421,6 +421,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
 	-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
 	-Wno-variadic-macros -fno-ipa-icf \
 	$(LIBSTDCXX_RAW_CXX_CXXFLAGS) -std=gnu++14 $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config
 toolexeclib_LTLIBRARIES = libasan.la
 nodist_toolexeclib_HEADERS = libasan_preinit.o
diff --git a/libsanitizer/hwasan/Makefile.am b/libsanitizer/hwasan/Makefile.am
index cfc1bfe8f01..e12c0a0ce71 100644
--- a/libsanitizer/hwasan/Makefile.am
+++ b/libsanitizer/hwasan/Makefile.am
@@ -8,6 +8,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long
 AM_CXXFLAGS += $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
 AM_CXXFLAGS += -std=gnu++14
 AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config
 
 toolexeclib_LTLIBRARIES = libhwasan.la
diff --git a/libsanitizer/hwasan/Makefile.in b/libsanitizer/hwasan/Makefile.in
index f63670b50d1..1729349e682 100644
--- a/libsanitizer/hwasan/Makefile.in
+++ b/libsanitizer/hwasan/Makefile.in
@@ -409,6 +409,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
 	-funwind-tables -fvisibility=hidden -Wno-variadic-macros \
 	-fno-ipa-icf $(LIBSTDCXX_RAW_CXX_CXXFLAGS) -std=gnu++14 \
 	$(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config
 toolexeclib_LTLIBRARIES = libhwasan.la
 hwasan_files = \
diff --git a/libsanitizer/interception/Makefile.am b/libsanitizer/interception/Makefile.am
index efa90a49aa1..f7013b4ea94 100644
--- a/libsanitizer/interception/Makefile.am
+++ b/libsanitizer/interception/Makefile.am
@@ -8,6 +8,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long
 AM_CXXFLAGS += $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
 AM_CXXFLAGS += -std=gnu++14
 AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 
 noinst_LTLIBRARIES = libinterception.la
diff --git a/libsanitizer/interception/Makefile.in b/libsanitizer/interception/Makefile.in
index 4a872cb4969..326ee9a1818 100644
--- a/libsanitizer/interception/Makefile.in
+++ b/libsanitizer/interception/Makefile.in
@@ -339,6 +339,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
 	-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
 	-Wno-variadic-macros $(LIBSTDCXX_RAW_CXX_CXXFLAGS) \
 	-std=gnu++14 $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 noinst_LTLIBRARIES = libinterception.la
 interception_files = \
diff --git a/libsanitizer/lsan/Makefile.am b/libsanitizer/lsan/Makefile.am
index f4db8e37683..6ff28ff5eea 100644
--- a/libsanitizer/lsan/Makefile.am
+++ b/libsanitizer/lsan/Makefile.am
@@ -8,6 +8,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long
 AM_CXXFLAGS += $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
 AM_CXXFLAGS += -std=gnu++14
 AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 
 noinst_LTLIBRARIES = libsanitizer_lsan.la
diff --git a/libsanitizer/lsan/Makefile.in b/libsanitizer/lsan/Makefile.in
index 01de442637c..0ee0be6526e 100644
--- a/libsanitizer/lsan/Makefile.in
+++ b/libsanitizer/lsan/Makefile.in
@@ -384,6 +384,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
 	-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
 	-Wno-variadic-macros $(LIBSTDCXX_RAW_CXX_CXXFLAGS) \
 	-std=gnu++14 $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 noinst_LTLIBRARIES = libsanitizer_lsan.la
 @LSAN_SUPPORTED_TRUE@toolexeclib_LTLIBRARIES = liblsan.la
diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am
index 9dc11f79072..de47797a6c4 100644
--- a/libsanitizer/tsan/Makefile.am
+++ b/libsanitizer/tsan/Makefile.am
@@ -8,6 +8,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long
 AM_CXXFLAGS += $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
 AM_CXXFLAGS += -std=gnu++14
 AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 
 toolexeclib_LTLIBRARIES = libtsan.la
diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in
index 921a78c7484..fa4a47764b9 100644
--- a/libsanitizer/tsan/Makefile.in
+++ b/libsanitizer/tsan/Makefile.in
@@ -413,6 +413,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
 	-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
 	-Wno-variadic-macros $(LIBSTDCXX_RAW_CXX_CXXFLAGS) \
 	-std=gnu++14 $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 toolexeclib_LTLIBRARIES = libtsan.la
 nodist_toolexeclib_HEADERS = libtsan_preinit.o
diff --git a/libsanitizer/ubsan/Makefile.am b/libsanitizer/ubsan/Makefile.am
index 9654fb2afc4..d480f26adc0 100644
--- a/libsanitizer/ubsan/Makefile.am
+++ b/libsanitizer/ubsan/Makefile.am
@@ -8,6 +8,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long
 AM_CXXFLAGS += $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
 AM_CXXFLAGS += -std=gnu++14
 AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 
 toolexeclib_LTLIBRARIES = libubsan.la
diff --git a/libsanitizer/ubsan/Makefile.in b/libsanitizer/ubsan/Makefile.in
index 2775c142213..4f4e4e579a2 100644
--- a/libsanitizer/ubsan/Makefile.in
+++ b/libsanitizer/ubsan/Makefile.in
@@ -378,6 +378,7 @@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
 	-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
 	-Wno-variadic-macros $(LIBSTDCXX_RAW_CXX_CXXFLAGS) \
 	-std=gnu++14 $(EXTRA_CXXFLAGS)
+AM_CCASFLAGS = $(EXTRA_ASFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 toolexeclib_LTLIBRARIES = libubsan.la
 ubsan_plugin_files = \


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-10-08 13:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-08 13:17 [gcc r12-4251] libsanitizer: Add AM_CCASFLAGS to Makefile.am H.J. Lu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).