HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 25bc0f34 JN |
1 | This patch is needed to build gcc-5.5.0 on the Hurd. |
| 2 | ||
| 3 | Backported from upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6cd9cb89ebdc1e1394b81c4a418c2b3b0eb86c57 | |
| 4 | ||
| 5 | commit b590b96ebc3f5b42a4829170e069722dd940e2543 | |
| 6 | Author: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | |
| 7 | Date: Sat May 9 04:50:23 2015 +0000 | |
| 8 | ||
| 9 | * src/c++98/Makefile.am (AM_CXXFLAGS): Add -std=gnu++98. | |
| 10 | * src/c++98/Makefile.in: Regenerate. | |
| 11 | * src/Makefile.am (AM_CXXFLAGS): Add -std=gnu++98. | |
| 12 | * src/Makefile.in: Regenerate. | |
| 13 | ||
| 14 | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222964 138bc75d-0d04-0410-961f-82ee72b054a4 | |
| 15 | ||
| 16 | diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am | |
| 17 | index a5f48b22c6d..cd07ccd81bc 100644 | |
| 18 | --- a/libstdc++-v3/src/Makefile.am | |
| 19 | +++ b/libstdc++-v3/src/Makefile.am | |
| 20 | @@ -168,6 +168,7 @@ compatibility-condvar.o: compatibility-condvar.cc | |
| 21 | # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden | |
| 22 | # as the occasion calls for it. | |
| 23 | AM_CXXFLAGS = \ | |
| 24 | + -std=gnu++98 \ | |
| 25 | $(glibcxx_compiler_pic_flag) \ | |
| 26 | $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ | |
| 27 | $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) | |
| 28 | diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in | |
| 29 | index 433f9ea121a..31b56282e26 100644 | |
| 30 | --- a/libstdc++-v3/src/Makefile.in | |
| 31 | +++ b/libstdc++-v3/src/Makefile.in | |
| 32 | @@ -429,6 +429,7 @@ libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) | |
| 33 | # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden | |
| 34 | # as the occasion calls for it. | |
| 35 | AM_CXXFLAGS = \ | |
| 36 | + -std=gnu++98 \ | |
| 37 | $(glibcxx_compiler_pic_flag) \ | |
| 38 | $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ | |
| 39 | $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) | |
| 40 | diff --git a/libstdc++-v3/src/c++98/Makefile.am b/libstdc++-v3/src/c++98/Makefile.am | |
| 41 | index e348dfb1205..a5b68a19a8b 100644 | |
| 42 | --- a/libstdc++-v3/src/c++98/Makefile.am | |
| 43 | +++ b/libstdc++-v3/src/c++98/Makefile.am | |
| 44 | @@ -215,6 +215,7 @@ parallel_settings.o: parallel_settings.cc | |
| 45 | # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden | |
| 46 | # as the occasion calls for it. | |
| 47 | AM_CXXFLAGS = \ | |
| 48 | + -std=gnu++98 \ | |
| 49 | $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ | |
| 50 | $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ | |
| 51 | $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) | |
| 52 | diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in | |
| 53 | index 3c69791bb66..ce86136906b 100644 | |
| 54 | --- a/libstdc++-v3/src/c++98/Makefile.in | |
| 55 | +++ b/libstdc++-v3/src/c++98/Makefile.in | |
| 56 | @@ -421,6 +421,7 @@ PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL | |
| 57 | # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden | |
| 58 | # as the occasion calls for it. | |
| 59 | AM_CXXFLAGS = \ | |
| 60 | + -std=gnu++98 \ | |
| 61 | $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ | |
| 62 | $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ | |
| 63 | $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) |