Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/binutils-apple/files: ld64-127.2-thread_state.patch ld64-128.2-1010.patch ld64-127.2-extraneous-headers.patch binutils-apple-4.2-globals-extern.patch ld64-127.2-Makefile ld64-128.2-Makefile-2 cctools-839-lto.patch
Date: Tue, 03 Feb 2015 21:12:27
Message-Id: 20150203211223.E0A3B10FD6@oystercatcher.gentoo.org
1 grobian 15/02/03 21:12:23
2
3 Added: ld64-127.2-thread_state.patch ld64-128.2-1010.patch
4 ld64-127.2-extraneous-headers.patch
5 binutils-apple-4.2-globals-extern.patch
6 ld64-127.2-Makefile ld64-128.2-Makefile-2
7 Removed: cctools-839-lto.patch
8 Log:
9 Add fixed older versions for PPC and comparisons by Michael Weiser, bug #538384
10
11 (Portage version: 2.2.14-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
12
13 Revision Changes Path
14 1.1 sys-devel/binutils-apple/files/ld64-127.2-thread_state.patch
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-127.2-thread_state.patch?rev=1.1&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-127.2-thread_state.patch?rev=1.1&content-type=text/plain
18
19 Index: ld64-127.2-thread_state.patch
20 ===================================================================
21 Include thread_status.h so that __darwin_i386_thread_state_t is known and will
22 not generate warnings that it's declared inside parameter list.
23
24 --- ld64-127.2/src/ld/HeaderAndLoadCommands.hpp.orig 2015-01-28 00:32:55.000000000 +0100
25 +++ ld64-127.2/src/ld/HeaderAndLoadCommands.hpp 2015-01-28 00:27:51.000000000 +0100
26 @@ -29,6 +29,7 @@
27 #include <limits.h>
28 #include <unistd.h>
29 #include <mach-o/loader.h>
30 +#include <mach/i386/thread_status.h>
31
32 #include <vector>
33
34
35
36
37 1.1 sys-devel/binutils-apple/files/ld64-128.2-1010.patch
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-128.2-1010.patch?rev=1.1&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-128.2-1010.patch?rev=1.1&content-type=text/plain
41
42 Index: ld64-128.2-1010.patch
43 ===================================================================
44 Backport (just a diff really) of OS X 10.10 handling from 241.9.
45
46 --- ld64-128.2/src/ld/Options.cpp 2015-01-30 17:16:48.000000000 +0100
47 +++ ld64-241.9/src/ld/Options.cpp 2015-01-30 17:11:57.000000000 +0100
48 @@ -1241,7 +1348,14 @@
49 throw "-macosx_version_min argument missing";
50
51 if ( (strncmp(version, "10.", 3) == 0) && isdigit(version[3]) ) {
52 - unsigned int minorVersion = version[3] - '0';
53 + unsigned int minorVersion = 0;
54 + for (int i=3; isdigit(version[i]); ++i) {
55 + minorVersion = minorVersion*10 + (version[i] - '0');
56 + }
57 + if ( minorVersion > 255 ) {
58 + warning("Mac OS X minor version > 255 in '%s'", version);
59 + minorVersion = 255;
60 + }
61 fMacVersionMin = (ld::MacVersionMin)(0x000A0000 | (minorVersion << 8));
62 }
63 else {
64
65
66
67 1.1 sys-devel/binutils-apple/files/ld64-127.2-extraneous-headers.patch
68
69 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-127.2-extraneous-headers.patch?rev=1.1&view=markup
70 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-127.2-extraneous-headers.patch?rev=1.1&content-type=text/plain
71
72 Index: ld64-127.2-extraneous-headers.patch
73 ===================================================================
74 Remove unused header that doesn't exist on older OS Xes.
75
76 --- ld64-127.2/src/ld/parsers/libunwind/AddressSpace.hpp.orig 2015-01-27 23:24:49.000000000 +0100
77 +++ ld64-127.2/src/ld/parsers/libunwind/AddressSpace.hpp 2015-01-27 23:26:21.000000000 +0100
78 @@ -37,7 +37,6 @@
79 #include <mach-o/getsect.h>
80 #include <mach-o/dyld_priv.h>
81 #include <mach/i386/thread_status.h>
82 -#include <Availability.h>
83
84 #include "FileAbstraction.hpp"
85 #include "libunwind.h"
86
87
88
89 1.1 sys-devel/binutils-apple/files/binutils-apple-4.2-globals-extern.patch
90
91 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-4.2-globals-extern.patch?rev=1.1&view=markup
92 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/binutils-apple-4.2-globals-extern.patch?rev=1.1&content-type=text/plain
93
94 Index: binutils-apple-4.2-globals-extern.patch
95 ===================================================================
96 Externally referenced globals should be marked extern to avoid stuff like this happening:
97
98 ld: warning: tentative definition of '_subsections_via_symbols' with size 16 from 'app.o' is being replaced by real definition of smaller size 4 from 'as.o'
99 ld: warning: tentative definition of '_subsections_via_symbols' with size 16 from 'atof-ieee.o' is being replaced by real definition of smaller size 4 from 'as.o'
100 ...
101
102 --- cctools-809/as/as.h.orig 2015-01-28 23:52:40.000000000 +0100
103 +++ cctools-809/as/as.h 2015-01-28 23:52:52.000000000 +0100
104 @@ -179,7 +179,7 @@
105 extern char *specific_archflag;
106
107 /* TRUE if the .subsections_via_symbols directive was seen */
108 -int subsections_via_symbols;
109 +extern int subsections_via_symbols;
110
111 /* -I path options for .includes */
112 struct directory_stack {
113 --- cctools-809/as/arm.c.orig 2015-01-28 23:57:23.000000000 +0100
114 +++ cctools-809/as/arm.c 2015-01-28 23:57:35.000000000 +0100
115 @@ -151,8 +151,7 @@
116 # define N_(String) (String)
117
118 /* STUFF FROM gas/as.h */
119 -#define COMMON
120 -COMMON subsegT now_subseg;
121 +extern subsegT now_subseg;
122
123 /* STUFF FROM gas/config/tc-arm.h */
124 #define ARM_FLAG_THUMB (1 << 0) /* The symbol is a Thumb symbol rather than an Arm symbol. */
125
126
127
128 1.1 sys-devel/binutils-apple/files/ld64-127.2-Makefile
129
130 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-127.2-Makefile?rev=1.1&view=markup
131 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-127.2-Makefile?rev=1.1&content-type=text/plain
132
133 Index: ld64-127.2-Makefile
134 ===================================================================
135 CPPFLAGS += -Iinclude -Iabstraction -Ild -Ild/parsers -Iother -I.
136
137 # some files generate warnings about applying offsetof to a non-POD type.
138 # Upstream seems aware of that and ignores by setting
139 # GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO in the xcode project.
140 CXXFLAGS += -Wno-invalid-offsetof
141
142 all: rebase unwinddump dyldinfo ld64 ObjectDump machocheck
143
144 libprunetrie.a: other/PruneTrie.o other/prune_trie.h
145 $(AR) -s -r -c libprunetrie.a other/PruneTrie.o
146
147 LD64LIBS=ld/parsers/archive_file.o ld/parsers/macho_relocatable_file.o \
148 ld/parsers/opaque_section_file.o \
149 ld/parsers/macho_dylib_file.o \
150 ld/passes/branch_island.o ld/passes/dylibs.o ld/passes/order_file.o \
151 ld/passes/branch_shim.o ld/passes/got.o ld/passes/tlvp.o \
152 ld/passes/compact_unwind.o ld/passes/huge.o \
153 ld/passes/dtrace_dof.o ld/passes/objc.o \
154 ld/passes/stubs/stubs.o \
155 ld/InputFiles.o ld/OutputFile.o ld/SymbolTable.o \
156 ld/Options.o ld/Resolver.o ld/debugline.o ld/ld.o
157
158 ifeq ($(LTO),1)
159 CPPFLAGS += -DLTO
160 LTO_OBJ = ld/parsers/lto_file.o
161 LIBLTO = -lLTO
162 else
163 LTO_OBJ =
164 LIBLTO =
165 endif
166
167 ld64: libprunetrie.a version.o $(LD64LIBS) $(LTO_OBJ)
168 $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^
169
170 rebase: other/rebase.o
171 $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
172
173 dyldinfo: other/dyldinfo.o
174 $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
175
176 unwinddump: other/unwinddump.o
177 $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
178
179 ObjectDump: other/ObjectDump.o ld/debugline.o ld/parsers/macho_relocatable_file.o $(LTO_OBJ)
180 $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^
181
182 machocheck: other/machochecker.o
183 $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
184
185
186
187
188 1.1 sys-devel/binutils-apple/files/ld64-128.2-Makefile-2
189
190 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-128.2-Makefile-2?rev=1.1&view=markup
191 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-apple/files/ld64-128.2-Makefile-2?rev=1.1&content-type=text/plain
192
193 Index: ld64-128.2-Makefile-2
194 ===================================================================
195 CPPFLAGS += -Iinclude -Iabstraction -Ild -Ild/parsers -Iother -I.
196
197 # some files generate warnings about applying offsetof to a non-POD type.
198 # Upstream seems aware of that and ignores by setting
199 # GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO in the xcode project.
200 CXXFLAGS += -Wno-invalid-offsetof
201
202 all: rebase unwinddump dyldinfo ld64 ObjectDump machocheck
203
204 libprunetrie.a: other/PruneTrie.o other/prune_trie.h
205 $(AR) -s -r -c libprunetrie.a other/PruneTrie.o
206
207 LD64LIBS=ld/parsers/archive_file.o ld/parsers/macho_relocatable_file.o \
208 ld/parsers/opaque_section_file.o \
209 ld/parsers/macho_dylib_file.o \
210 ld/passes/branch_island.o ld/passes/dylibs.o ld/passes/order.o \
211 ld/passes/branch_shim.o ld/passes/got.o ld/passes/tlvp.o \
212 ld/passes/compact_unwind.o ld/passes/huge.o \
213 ld/passes/dtrace_dof.o ld/passes/objc.o \
214 ld/passes/stubs/stubs.o \
215 ld/InputFiles.o ld/OutputFile.o ld/SymbolTable.o \
216 ld/Options.o ld/Resolver.o ld/debugline.o ld/ld.o
217
218 ifeq ($(LTO),1)
219 CPPFLAGS += -DLTO
220 LTO_OBJ = ld/parsers/lto_file.o
221 LIBLTO = -lLTO
222 else
223 LTO_OBJ =
224 LIBLTO =
225 endif
226
227 ld64: libprunetrie.a version.o $(LD64LIBS) $(LTO_OBJ)
228 $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^
229
230 rebase: other/rebase.o
231 $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
232
233 dyldinfo: other/dyldinfo.o
234 $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
235
236 unwinddump: other/unwinddump.o
237 $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
238
239 ObjectDump: other/ObjectDump.o ld/debugline.o ld/parsers/macho_relocatable_file.o $(LTO_OBJ)
240 $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^
241
242 machocheck: other/machochecker.o
243 $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^