mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-27 13:54:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use -I for libstdc++-v3 header files

Browse Source 
* Makefile.am (AM_MAKEFLAGS): Restore CC and CXX.
	* configure.ac (ACX_NONCANONICAL_TARGET): Removed.
	* asan/Makefile.am (AM_CXXFLAGS): Remove -I for libstdc++-v3 header
	files.
	(AM_MAKEFLAGS): Restore CC and CXX.
	* interception/Makefile.am: Likewise.
	* sanitizer_common/Makefile.am: Likewise.
	* tsan/Makefile.am: Likewise.
	* Makefile.in: Regenerated.
	* aclocal.m4: Likewise.
	* configure: Likewise.
	* asan/Makefile.in: Likewise.
	* interception/Makefile.in: Likewise.
	* sanitizer_common/Makefile.in: Likewise.
	* tsan/Makefile.in: Likewise.

From-SVN: r193951
This commit is contained in:
H.J. Lu 2012-11-29 19:15:43 +00:00 committed by H.J. Lu
parent 99319980d3
commit a23ed040bb
14 changed files with 49 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsanitizer/ChangeLog
View File

@ -1,3 +1,21 @@
2012-11-28 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (AM_MAKEFLAGS): Restore CC and CXX.
* configure.ac (ACX_NONCANONICAL_TARGET): Removed.
* asan/Makefile.am (AM_CXXFLAGS): Remove -I for libstdc++-v3 header
files.
(AM_MAKEFLAGS): Restore CC and CXX.
* interception/Makefile.am: Likewise.
* sanitizer_common/Makefile.am: Likewise.
* tsan/Makefile.am: Likewise.
* Makefile.in: Regenerated.
* aclocal.m4: Likewise.
* configure: Likewise.
* asan/Makefile.in: Likewise.
* interception/Makefile.in: Likewise.
* sanitizer_common/Makefile.in: Likewise.
* tsan/Makefile.in: Likewise.
2012-11-28 H.J. Lu <hongjiu.lu@intel.com> 2012-11-28 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (AM_MAKEFLAGS): Remove CC and CXX. * Makefile.am (AM_MAKEFLAGS): Remove CC and CXX.

2
libsanitizer/Makefile.am
View File

@ -37,6 +37,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \

6
libsanitizer/Makefile.in
View File

@ -41,8 +41,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \
$(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog $(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
$(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/override.m4 \
@ -237,7 +236,6 @@ sysconfdir = @sysconfdir@
target = @target@ target = @target@
target_alias = @target_alias@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_noncanonical = @target_noncanonical@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@ toolexecdir = @toolexecdir@
@ -280,6 +278,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \

1
libsanitizer/aclocal.m4 vendored
View File

@ -990,7 +990,6 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar]) AC_SUBST([am__untar])
]) # _AM_PROG_TAR ]) # _AM_PROG_TAR
m4_include([../config/acx.m4])
m4_include([../config/depstand.m4]) m4_include([../config/depstand.m4])
m4_include([../config/lead-dot.m4]) m4_include([../config/lead-dot.m4])
m4_include([../config/multi.m4]) m4_include([../config/multi.m4])

6
libsanitizer/asan/Makefile.am
View File

@ -5,10 +5,6 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DASAN_HAS_EXCEPTIONS=1 -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0 -DASAN_NEEDS_SEGV=1 DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DASAN_HAS_EXCEPTIONS=1 -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0 -DASAN_NEEDS_SEGV=1
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -Wno-c99-extensions AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -Wno-c99-extensions
## We require libstdc++-v3 to be in the same build tree.
AM_CXXFLAGS += -I../../libstdc++-v3/include \
-I../../libstdc++-v3/include/$(target_noncanonical) \
-I$(srcdir)/../../libstdc++-v3/libsupc++
ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config
toolexeclib_LTLIBRARIES = libasan.la toolexeclib_LTLIBRARIES = libasan.la
@ -68,6 +64,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \

14
libsanitizer/asan/Makefile.in
View File

@ -38,8 +38,7 @@ target_triplet = @target@
subdir = asan subdir = asan
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
$(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/override.m4 \
@ -229,7 +228,6 @@ sysconfdir = @sysconfdir@
target = @target@ target = @target@
target_alias = @target_alias@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_noncanonical = @target_noncanonical@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@ toolexecdir = @toolexecdir@
@ -241,13 +239,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)
# May be used by toolexeclibdir. # May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -Wno-c99-extensions
-Wno-long-long -fPIC -fno-builtin -fno-exceptions \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
-Wno-variadic-macros -Wno-c99-extensions \
-I../../libstdc++-v3/include \
-I../../libstdc++-v3/include/$(target_noncanonical) \
-I$(srcdir)/../../libstdc++-v3/libsupc++
ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config
toolexeclib_LTLIBRARIES = libasan.la toolexeclib_LTLIBRARIES = libasan.la
asan_files = \ asan_files = \
@ -305,6 +297,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \

22
libsanitizer/configure vendored
View File

@ -686,7 +686,6 @@ am__isrc
INSTALL_DATA INSTALL_DATA
INSTALL_SCRIPT INSTALL_SCRIPT
INSTALL_PROGRAM INSTALL_PROGRAM
target_noncanonical
target_os target_os
target_vendor target_vendor
target_cpu target_cpu
@ -2567,23 +2566,6 @@ test -n "$target_alias" &&
NONENONEs,x,x, && NONENONEs,x,x, &&
program_prefix=${target_alias}- program_prefix=${target_alias}-
case ${build_alias} in
"") build_noncanonical=${build} ;;
*) build_noncanonical=${build_alias} ;;
esac
case ${host_alias} in
"") host_noncanonical=${build_noncanonical} ;;
*) host_noncanonical=${host_alias} ;;
esac
case ${target_alias} in
"") target_noncanonical=${host_noncanonical} ;;
*) target_noncanonical=${target_alias} ;;
esac
target_alias=${target_alias-$host_alias} target_alias=${target_alias-$host_alias}
@ -11098,7 +11080,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11101 "configure" #line 11083 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11204,7 +11186,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11207 "configure" #line 11189 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H

1
libsanitizer/configure.ac
View File

@ -19,7 +19,6 @@ AC_MSG_RESULT($version_specific_libs)
# Do not delete or change the following two lines. For why, see # Do not delete or change the following two lines. For why, see
# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html # http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
ACX_NONCANONICAL_TARGET
target_alias=${target_alias-$host_alias} target_alias=${target_alias-$host_alias}
AC_SUBST(target_alias) AC_SUBST(target_alias)

6
libsanitizer/interception/Makefile.am
View File

@ -5,10 +5,6 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -Wno-c99-extensions AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -Wno-c99-extensions
## We require libstdc++-v3 to be in the same build tree.
AM_CXXFLAGS += -I../../libstdc++-v3/include \
-I../../libstdc++-v3/include/$(target_noncanonical) \
-I$(srcdir)/../../libstdc++-v3/libsupc++
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
noinst_LTLIBRARIES = libinterception.la noinst_LTLIBRARIES = libinterception.la
@ -55,6 +51,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \

14
libsanitizer/interception/Makefile.in
View File

@ -38,8 +38,7 @@ target_triplet = @target@
subdir = interception subdir = interception
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
$(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/override.m4 \
@ -212,7 +211,6 @@ sysconfdir = @sysconfdir@
target = @target@ target = @target@
target_alias = @target_alias@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_noncanonical = @target_noncanonical@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@ toolexecdir = @toolexecdir@
@ -224,13 +222,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include
# May be used by toolexeclibdir. # May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -Wno-c99-extensions
-Wno-long-long -fPIC -fno-builtin -fno-exceptions \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
-Wno-variadic-macros -Wno-c99-extensions \
-I../../libstdc++-v3/include \
-I../../libstdc++-v3/include/$(target_noncanonical) \
-I$(srcdir)/../../libstdc++-v3/libsupc++
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
noinst_LTLIBRARIES = libinterception.la noinst_LTLIBRARIES = libinterception.la
interception_files = \ interception_files = \
@ -272,6 +264,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \

6
libsanitizer/sanitizer_common/Makefile.am
View File

@ -5,10 +5,6 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -Wno-c99-extensions AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -Wno-c99-extensions
## We require libstdc++-v3 to be in the same build tree.
AM_CXXFLAGS += -I../../libstdc++-v3/include \
-I../../libstdc++-v3/include/$(target_noncanonical) \
-I$(srcdir)/../../libstdc++-v3/libsupc++
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
noinst_LTLIBRARIES = libsanitizer_common.la noinst_LTLIBRARIES = libsanitizer_common.la
@ -63,6 +59,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \

14
libsanitizer/sanitizer_common/Makefile.in
View File

@ -38,8 +38,7 @@ target_triplet = @target@
subdir = sanitizer_common subdir = sanitizer_common
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
$(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/override.m4 \
@ -202,7 +201,6 @@ sysconfdir = @sysconfdir@
target = @target@ target = @target@
target_alias = @target_alias@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_noncanonical = @target_noncanonical@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@ toolexecdir = @toolexecdir@
@ -214,13 +212,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include
# May be used by toolexeclibdir. # May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros -Wno-c99-extensions
-Wno-long-long -fPIC -fno-builtin -fno-exceptions \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
-Wno-variadic-macros -Wno-c99-extensions \
-I../../libstdc++-v3/include \
-I../../libstdc++-v3/include/$(target_noncanonical) \
-I$(srcdir)/../../libstdc++-v3/libsupc++
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
noinst_LTLIBRARIES = libsanitizer_common.la noinst_LTLIBRARIES = libsanitizer_common.la
sanitizer_common_files = \ sanitizer_common_files = \
@ -273,6 +265,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \

6
libsanitizer/tsan/Makefile.am
View File

@ -5,10 +5,6 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
## We require libstdc++-v3 to be in the same build tree.
AM_CXXFLAGS += -I../../libstdc++-v3/include \
-I../../libstdc++-v3/include/$(target_noncanonical) \
-I$(srcdir)/../../libstdc++-v3/libsupc++
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
toolexeclib_LTLIBRARIES = libtsan.la toolexeclib_LTLIBRARIES = libtsan.la
@ -71,6 +67,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \

13
libsanitizer/tsan/Makefile.in
View File

@ -38,8 +38,7 @@ target_triplet = @target@
subdir = tsan subdir = tsan
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
$(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../config/override.m4 \
@ -230,7 +229,6 @@ sysconfdir = @sysconfdir@
target = @target@ target = @target@
target_alias = @target_alias@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_noncanonical = @target_noncanonical@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@ toolexecdir = @toolexecdir@
@ -242,12 +240,7 @@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include
# May be used by toolexeclibdir. # May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
-Wno-long-long -fPIC -fno-builtin -fno-exceptions \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
-Wno-variadic-macros -I../../libstdc++-v3/include \
-I../../libstdc++-v3/include/$(target_noncanonical) \
-I$(srcdir)/../../libstdc++-v3/libsupc++
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
toolexeclib_LTLIBRARIES = libtsan.la toolexeclib_LTLIBRARIES = libtsan.la
tsan_files = \ tsan_files = \
@ -308,6 +301,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \ "includedir=$(includedir)" \
"AR=$(AR)" \ "AR=$(AR)" \
"AS=$(AS)" \ "AS=$(AS)" \
"CC=$(CC)" \
"CXX=$(CXX)" \
"LD=$(LD)" \ "LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \ "NM=$(NM)" \