diff options
Diffstat (limited to 'gcc-4.9/libstdc++-v3/src')
| -rw-r--r-- | gcc-4.9/libstdc++-v3/src/Makefile.am | 5 | ||||
| -rw-r--r-- | gcc-4.9/libstdc++-v3/src/Makefile.in | 6 | ||||
| -rw-r--r-- | gcc-4.9/libstdc++-v3/src/c++11/Makefile.am | 9 | ||||
| -rw-r--r-- | gcc-4.9/libstdc++-v3/src/c++11/Makefile.in | 9 |
4 files changed, 23 insertions, 6 deletions
diff --git a/gcc-4.9/libstdc++-v3/src/Makefile.am b/gcc-4.9/libstdc++-v3/src/Makefile.am index 3040404a1..7f58ce432 100644 --- a/gcc-4.9/libstdc++-v3/src/Makefile.am +++ b/gcc-4.9/libstdc++-v3/src/Makefile.am @@ -69,7 +69,7 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++11/libc++11convenience.la libstdc___la_LDFLAGS = \ - -avoid-version ${version_arg} -lm + ${libtool_version_info_string} ${version_arg} -lm libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) @@ -170,7 +170,8 @@ LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(EXTRA_CXX_FLAGS) -Xcompiler-static -UPIC LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/gcc-4.9/libstdc++-v3/src/Makefile.in b/gcc-4.9/libstdc++-v3/src/Makefile.in index 1e18c5fa4..7ddd55ad7 100644 --- a/gcc-4.9/libstdc++-v3/src/Makefile.in +++ b/gcc-4.9/libstdc++-v3/src/Makefile.in @@ -286,6 +286,7 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ libtool_VERSION = @libtool_VERSION@ +libtool_version_info_string = @libtool_version_info_string@ localedir = @localedir@ localstatedir = @localstatedir@ lt_host_flags = @lt_host_flags@ @@ -375,7 +376,7 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++11/libc++11convenience.la libstdc___la_LDFLAGS = \ - -avoid-version ${version_arg} -lm + ${libtool_version_info_string} ${version_arg} -lm libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) @@ -442,7 +443,8 @@ LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(EXTRA_CXX_FLAGS) -Xcompiler-static -UPIC LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/gcc-4.9/libstdc++-v3/src/c++11/Makefile.am b/gcc-4.9/libstdc++-v3/src/c++11/Makefile.am index cf1e3beaa..2b7cc35e4 100644 --- a/gcc-4.9/libstdc++-v3/src/c++11/Makefile.am +++ b/gcc-4.9/libstdc++-v3/src/c++11/Makefile.am @@ -77,7 +77,10 @@ AM_CXXFLAGS = \ -std=gnu++11 \ $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ - $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) + $(WARN_CXXFLAGS) \ + $(OPTIMIZE_CXXFLAGS) \ + $(CONFIG_CXXFLAGS) -std=gnu++11 \ + $($(@)_no_omit_frame_pointer) AM_MAKEFLAGS = \ "gxx_include_dir=$(gxx_include_dir)" @@ -128,3 +131,7 @@ CXXLINK = \ --mode=link $(CXX) \ $(VTV_CXXLINKFLAGS) \ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ + +# Google-specific pessimization +functexcept.lo_no_omit_frame_pointer = -fno-omit-frame-pointer +debug.lo_no_omit_frame_pointer = -fno-omit-frame-pointer diff --git a/gcc-4.9/libstdc++-v3/src/c++11/Makefile.in b/gcc-4.9/libstdc++-v3/src/c++11/Makefile.in index 83b7bd155..d39096e42 100644 --- a/gcc-4.9/libstdc++-v3/src/c++11/Makefile.in +++ b/gcc-4.9/libstdc++-v3/src/c++11/Makefile.in @@ -349,7 +349,10 @@ AM_CXXFLAGS = \ -std=gnu++11 \ $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ - $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) + $(WARN_CXXFLAGS) \ + $(OPTIMIZE_CXXFLAGS) \ + $(CONFIG_CXXFLAGS) -std=gnu++11 \ + $($(@)_no_omit_frame_pointer) AM_MAKEFLAGS = \ "gxx_include_dir=$(gxx_include_dir)" @@ -402,6 +405,10 @@ CXXLINK = \ $(VTV_CXXLINKFLAGS) \ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ + +# Google-specific pessimization +functexcept.lo_no_omit_frame_pointer = -fno-omit-frame-pointer +debug.lo_no_omit_frame_pointer = -fno-omit-frame-pointer all: all-am .SUFFIXES: |