Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gcc-patches:master commit in: 3.3.6/gentoo/
Date: Sun, 30 Sep 2018 16:45:12
Message-Id: 1538325880.f4cf8c88325985c2bc2ffe7d4828b410b73732ce.slyfox@gentoo
1 commit: f4cf8c88325985c2bc2ffe7d4828b410b73732ce
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 30 16:44:40 2018 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 30 16:44:40 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=f4cf8c88
7
8 3.3.6: fix stage1 bulding against modern toolchain
9
10 One new patche:
11 - 91_all_libexec-gcc-binutils.patch: add /usr/libexec/gcc/<TARGET> to search path
12
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 3.3.6/gentoo/91_all_libexec-gcc-binutils.patch | 61 ++++++++++++++++++++++++++
16 3.3.6/gentoo/README.history | 1 +
17 2 files changed, 62 insertions(+)
18
19 diff --git a/3.3.6/gentoo/91_all_libexec-gcc-binutils.patch b/3.3.6/gentoo/91_all_libexec-gcc-binutils.patch
20 new file mode 100644
21 index 0000000..8e0e774
22 --- /dev/null
23 +++ b/3.3.6/gentoo/91_all_libexec-gcc-binutils.patch
24 @@ -0,0 +1,61 @@
25 +Before gcc-3.4 gcc libraries and searched executables
26 +were in /usr/lib/gcc-lib/<TARGET> (STANDARD_EXEC_PREFIX)
27 +
28 +After gcc-3.4 the split happened:
29 +- /usr/lib/gcc/<TARGET> for libraries (STARDARD_EXEC_PREFIX)
30 +- /usr/libexec/gcc/<TARGET> for executables (STANDARD_LIBEXEC_PREFIX)
31 +
32 +This patch adds STANDARD_LIBEXEC_PREFIX to allow bootstrapping
33 +on 3.4+-only system.
34 +--- a/gcc/Makefile.in
35 ++++ b/gcc/Makefile.in
36 +@@ -323,8 +323,13 @@ exec_prefix = @exec_prefix@
37 + bindir = @bindir@
38 + # Directory in which to put the directories used by the compiler.
39 + libdir = @libdir@
40 ++# Directory in which GCC puts its executables.
41 ++libexecdir = @libexecdir@
42 ++
43 + # Directory in which the compiler finds executables, libraries, etc.
44 + libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(version)
45 ++# Directory in which the compiler finds executables
46 ++libexecsubdir = $(libexecdir)/gcc/$(target_alias)/$(version)
47 + # Used to produce a relative $(gcc_tooldir) in gcc.o
48 + unlibsubdir = ../../..
49 + # Directory in which to find other cross-compilation tools and headers.
50 +@@ -726,6 +731,7 @@ ORDINARY_FLAGS_TO_PASS = \
51 + "gcc_tooldir=$(gcc_tooldir)" \
52 + "bindir=$(bindir)" \
53 + "libsubdir=$(libsubdir)" \
54 ++ "libexecsubdir=$(libsubdir)" \
55 + "datadir=$(datadir)" \
56 + "localedir=$(localedir)"
57 + FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) "CC=@cc_set_by_configure@" \
58 +@@ -1297,6 +1303,7 @@ c-dump.o : c-dump.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(C_TREE_H) tree-dump.h
59 + DRIVER_DEFINES = \
60 + -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
61 + -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
62 ++ -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
63 + -DDEFAULT_TARGET_VERSION=\"$(version)\" \
64 + -DDEFAULT_TARGET_MACHINE=\"$(target_alias)\" \
65 + -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
66 +--- a/gcc/gcc.c
67 ++++ b/gcc/gcc.c
68 +@@ -1346,6 +1346,8 @@ static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
69 + static const char *const standard_exec_prefix_1 = "/usr/lib/gcc/";
70 + static const char *md_exec_prefix = MD_EXEC_PREFIX;
71 +
72 ++static const char *standard_libexec_prefix = STANDARD_LIBEXEC_PREFIX;
73 ++
74 + static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
75 + static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
76 + static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
77 +@@ -3718,6 +3720,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
78 + PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
79 + add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
80 + PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
81 ++ add_prefix (&exec_prefixes, standard_libexec_prefix, "BINUTILS",
82 ++ PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
83 + #endif
84 +
85 + add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
86
87 diff --git a/3.3.6/gentoo/README.history b/3.3.6/gentoo/README.history
88 index 8cf625a..dc6baaf 100644
89 --- a/3.3.6/gentoo/README.history
90 +++ b/3.3.6/gentoo/README.history
91 @@ -1,6 +1,7 @@
92 1.10 TODO
93 + 89_all_gcc-3.3.x-ucontext.patch
94 + 90_all_libtool-pass-all.patch
95 + + 91_all_libexec-gcc-binutils.patch
96
97 1.9 06 Apr 2015
98 R 05_all_gcc-4.3.x-siginfo.patch -> 05_all_gcc-3.3.x-siginfo.patch