Mercurial > mxe-octave

annotate src/native-gcc-1-canadian-cross.patch @ 6161:8fcac4d6d983 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-queueing: Fix syntax error with Octave 7 (bug #62314). * src/of-queueing-1-octave7.patch: Add new file. * dist-files.mk: Include new patch.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 14 Apr 2022 19:27:13 +0200
parents ba8999e1f3b5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6102
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
1 From 01a70ccd723eb9a479186fe37c972b0d0f8676cf Mon Sep 17 00:00:00 2001
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
2 From: Jonathan Wakely <jwakely@redhat.com>
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
3 Date: Fri, 7 Jan 2022 15:21:03 +0000
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
4 Subject: [PATCH 1/1] libstdc++: Add -nostdinc++ for c++17 sources [PR100017]
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
5
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
6 When building a build!=host compiler, the just-built gcc can't be used
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
7 to build the target libstdc++ (because it is built for the host triplet,
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
8 not the build triplet). The top-level configure.ac sets up the build
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
9 flags for libstdc++ (and other "raw_cxx" libs) like this:
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
10
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
11 GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
12 [gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs],
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
13 c++)
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
14
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
15 The -nostdinc++ flag is only used for the IN-TREE-TOOL, i.e. when using
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
16 the just-built gcc/xgcc compiler. This means that the cross-compiler
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
17 used to build libstdc++ will add its own libstdc++ headers to the
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
18 include path. That results in the #include <cfenv> in
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
19 src/c++17/floating_to_chars.cc and src/c++17/floating_from_chars.cc
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
20 doing #include_next <fenv.h> and finding the libstdc++ fenv.h wrapper
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
21 from the host compiler. Because that has the same include guard as the
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
22 <fenv.h> in the libstdc++ we're trying to build, we never reach the
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
23 underlying <fenv.h> from libc. That results in several errors of the
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
24 form:
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
25
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
26 error: 'fenv_t' has not been declared in '::'
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
27
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
28 The most correct fix would be to add -nostdinc++ to the
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
29 RAW_CXX_FOR_TARGET variable in configure.ac, or the
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
30 RAW_CXX_TARGET_EXPORTS variable in Makefile.tpl.
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
31
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
32 Another solution would be to make the libstdc++ <fenv.h> wrapper use
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
33 _GLIBCXX_INCLUDE_NEXT_C_HEADERS like our <stdlib.h> and other C header
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
34 wrappers.
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
35
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
36 For now though, the simplest and safest solution is to just add
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
37 -nostdinc++ to the CXXFLAGS used for src/c++17/*.cc, which is what this
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
38 does.
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
39
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
40 libstdc++-v3/ChangeLog:
5849
bf01dad4e460 GCC: Update to version 11.2.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41
6102
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
42 PR libstdc++/100017
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
43 * src/c++17/Makefile.am (AM_CXXFLAGS): Add -nostdinc++.
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
44 * src/c++17/Makefile.in: Regenerate.
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
45
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
46 (cherry picked from commit 4fde88e5dd152fe866a97b12e0f8229970d15cb3)
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
47 ---
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
48 libstdc++-v3/src/c++17/Makefile.am | 2 +-
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
49 libstdc++-v3/src/c++17/Makefile.in | 2 +-
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
50 2 files changed, 2 insertions(+), 2 deletions(-)
5849
bf01dad4e460 GCC: Update to version 11.2.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51
6102
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
52 diff --git a/libstdc++-v3/src/c++17/Makefile.am b/libstdc++-v3/src/c++17/Makefile.am
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
53 index cb94aff5f1a..2aebc6d5251 100644
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
54 --- a/libstdc++-v3/src/c++17/Makefile.am
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
55 +++ b/libstdc++-v3/src/c++17/Makefile.am
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
56 @@ -79,7 +79,7 @@ endif
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
57 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
58 # as the occasion calls for it.
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
59 AM_CXXFLAGS = \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
60 - -std=gnu++17 \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
61 + -std=gnu++17 -nostdinc++ \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
62 $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
63 $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
64 $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
65 diff --git a/libstdc++-v3/src/c++17/Makefile.in b/libstdc++-v3/src/c++17/Makefile.in
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
66 index 63984ecd52a..8c02be6514f 100644
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
67 --- a/libstdc++-v3/src/c++17/Makefile.in
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
68 +++ b/libstdc++-v3/src/c++17/Makefile.in
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
69 @@ -455,7 +455,7 @@ libc__17convenience_la_SOURCES = $(sources) $(inst_sources)
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
70 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
71 # as the occasion calls for it.
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
72 AM_CXXFLAGS = \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
73 - -std=gnu++17 \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
74 + -std=gnu++17 -nostdinc++ \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
75 $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
76 $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
77 $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
78 --
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
79 2.27.0
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
80
ba8999e1f3b5 GCC: Use upstream patch to fix building canadian cross compiler.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5849
diff changeset
81