Changeset 67068ff for patches/gcc-7.1.0-pure64-1.patch
- Timestamp:
- May 14, 2017, 12:24:43 AM (7 years ago)
- Branches:
- master, systemd
- Children:
- 6509b2b
- Parents:
- 37172b2
- File:
-
- 1 edited
-
patches/gcc-7.1.0-pure64-1.patch (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
patches/gcc-7.1.0-pure64-1.patch
r37172b2 r67068ff 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 2 <html xmlns="http://www.w3.org/1999/xhtml"> 3 4 5 6 7 <head> 8 <title> 9 gcc-7.1.0-pure64-1.2.patch on Ticket #1114 â Attachment 10 â CLFS Trac 11 </title> 12 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 13 <link rel="search" href="/search" /> 14 <link rel="help" href="/wiki/TracGuide" /> 15 <link rel="alternate" href="/raw-attachment/ticket/1114/gcc-7.1.0-pure64-1.2.patch" type="text/x-diff; charset=iso-8859-15" title="Original Format" /> 16 <link rel="up" href="/ticket/1114" title="Ticket #1114" /> 17 <link rel="start" href="/wiki" /> 18 <link rel="stylesheet" href="/chrome/common/css/trac.css" type="text/css" /><link rel="stylesheet" href="/chrome/common/css/diff.css" type="text/css" /><link rel="stylesheet" href="/chrome/common/css/code.css" type="text/css" /> 19 <link rel="shortcut icon" href="/chrome/site/trac.ico" type="image/x-icon" /> 20 <link rel="icon" href="/chrome/site/trac.ico" type="image/x-icon" /> 21 <link type="application/opensearchdescription+xml" rel="search" href="/search/opensearch" title="Search CLFS Trac" /> 22 <script type="text/javascript" src="/chrome/common/js/jquery.js"></script><script type="text/javascript" src="/chrome/common/js/babel.js"></script><script type="text/javascript" src="/chrome/common/js/messages/en_US.js"></script><script type="text/javascript" src="/chrome/common/js/trac.js"></script><script type="text/javascript" src="/chrome/common/js/search.js"></script><script type="text/javascript" src="/chrome/common/js/diff.js"></script> 23 <!--[if lt IE 7]> 24 <script type="text/javascript" src="/chrome/common/js/ie_pre7_hacks.js"></script> 25 <![endif]--> 26 <script type="text/javascript" src="/chrome/common/js/folding.js"></script> 27 <script type="text/javascript"> 28 jQuery(document).ready(function($) { 29 $('#preview table.code').enableCollapsibleColumns($('#preview table.code thead th.content')); 30 }); 31 </script> 32 </head> 33 <body> 34 <div id="banner"> 35 <div id="header"> 36 <a id="logo" href="http://trac.clfs.org"><img src="/chrome/site/clfs-logo.png" alt="CLFS Trac" height="74" width="588" /></a> 37 </div> 38 <form id="search" action="/search" method="get"> 39 <div> 40 <label for="proj-search">Search:</label> 41 <input type="text" id="proj-search" name="q" size="18" value="" /> 42 <input type="submit" value="Search" /> 43 </div> 44 </form> 45 <div id="metanav" class="nav"> 46 <ul> 47 <li class="first"><a href="/login">Login</a></li><li><a href="/wiki/TracGuide">Help/Guide</a></li><li><a href="/about">About Trac</a></li><li><a href="/prefs">Preferences</a></li><li class="last"><a href="/reset_password">Forgot your password?</a></li> 48 </ul> 49 </div> 50 </div> 51 <div id="mainnav" class="nav"> 52 <ul> 53 <li class="first"><a href="/wiki">Wiki</a></li><li><a href="/timeline">Timeline</a></li><li><a href="/roadmap">Roadmap</a></li><li><a href="/browser">Browse Source</a></li><li><a href="/report">View Tickets</a></li><li class="last"><a href="/search">Search</a></li> 54 </ul> 55 </div> 56 <div id="main"> 57 <div id="ctxtnav" class="nav"> 58 <h2>Context Navigation</h2> 59 <ul> 60 <li class="last first"><a href="/ticket/1114">Back to Ticket #1114</a></li> 61 </ul> 62 <hr /> 63 </div> 64 <div id="content" class="attachment"> 65 <h1><a href="/ticket/1114">Ticket #1114</a>: gcc-7.1.0-pure64-1.2.patch</h1> 66 <table id="info" summary="Description"> 67 <tbody> 68 <tr> 69 <th scope="col">File gcc-7.1.0-pure64-1.2.patch, 70 <span title="9111 bytes">8.9 KB</span> 71 (added by chris@âŠ, <a class="timeline" href="/timeline?from=2017-05-11T23%3A12%3A25Z&precision=second" title="2017-05-11T23:12:25Z in Timeline">2 days</a> ago)</th> 72 </tr> 73 <tr> 74 <td class="message searchable"> 75 76 </td> 77 </tr> 78 </tbody> 79 </table> 80 <div id="preview" class="searchable"> 81 82 <div class="diff"> 83 <ul class="entries"> 84 <li class="entry"> 85 <h2> 86 <a>gcc/config/i386/linux64.h</a> 87 </h2> 88 <pre>Submitted By: William Harrington <kb0iic at cross-lfs dot org> 89 Date: 12-28-2015 90 Initial Package Version: 5.2.0 1 Submitted By: William Harrington <kb0iic at cross-lfs dot org> 2 Date: 05-13-2017 3 Initial Package Version: 6.1.0 91 4 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for 92 5 the Pure LFS project with help from 93 Martin Ward 6 Martin Ward and Chris Staub 94 7 Upstream Status: Not Applied - CLFS Specific 95 8 Description: This patch makes changes to the paths for pure64, eg 64bit libs 96 9 in /usr/lib, 32bit in /usr/lib32. 97 Comment: Re named for GCC 5.3.010 Comment: Rediffed for 7.1.0 98 11 99 diff -Naur gcc-6.1.0.orig/gcc/config/i386/linux64.h gcc-6.1.0/gcc/config/i386/linux64.h</pre> 100 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 101 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 102 <thead> 103 <tr> 104 <th title="File gcc-6.1.0.orig/gcc/config/i386/linux64.h 2016-01-04 09:30:50.000000000 -0500"> 105 old 106 </th> 107 <th title="File gcc-6.1.0/gcc/config/i386/linux64.h 2016-05-12 02:55:51.000000000 -0400"> 108 new 109 </th> 110 <td><em></em> </td> 111 </tr> 112 </thead> 113 <tbody class="unmod"> 114 <tr> 115 <th>27</th><th>27</th><td class="l"><span>#define GNU_USER_LINK_EMULATION64 "elf_x86_64"</span> </td> 116 </tr><tr> 117 <th>28</th><th>28</th><td class="l"><span>#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"</span> </td> 118 </tr><tr> 119 <th>29</th><th>29</th><td class="l"><span></span> </td> 120 </tr> 121 </tbody><tbody class="mod"> 122 <tr class="first"> 123 <th>30</th><th> </th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER32 "/lib<del></del>/ld-linux.so.2"</span> </td> 124 </tr><tr> 125 <th>31</th><th> </th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER64 "/lib<del>64</del>/ld-linux-x86-64.so.2"</span> </td> 126 </tr> 127 <tr> 128 <th> </th><th>30</th><td class="r"><span>#define GLIBC_DYNAMIC_LINKER32 "/lib<ins>32</ins>/ld-linux.so.2"</span> </td> 129 </tr><tr class="last"> 130 <th> </th><th>31</th><td class="r"><span>#define GLIBC_DYNAMIC_LINKER64 "/lib<ins></ins>/ld-linux-x86-64.so.2"</span> </td> 131 </tr> 132 </tbody><tbody class="unmod"> 133 <tr> 134 <th>32</th><th>32</th><td class="l"><span>#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"</span> </td> 135 </tr><tr> 136 <th>33</th><th>33</th><td class="l"><span></span> </td> 137 </tr><tr> 138 <th>34</th><th>34</th><td class="l"><span>#undef MUSL_DYNAMIC_LINKER32</span> </td> 139 </tr> 140 </tbody> 141 </table> 142 </li> 143 <li class="entry"> 144 <h2> 145 <a>gcc/config/i386/t-linux64</a> 146 </h2> 147 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/i386/t-linux64 gcc-6.1.0/gcc/config/i386/t-linux64</pre> 148 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 149 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 150 <thead> 151 <tr> 152 <th title="File gcc-6.1.0.orig/gcc/config/i386/t-linux64 2016-01-04 09:30:50.000000000 -0500"> 153 old 154 </th> 155 <th title="File gcc-6.1.0/gcc/config/i386/t-linux64 2016-05-12 02:55:51.000000000 -0400"> 156 new 157 </th> 158 <td><em></em> </td> 159 </tr> 160 </thead> 161 <tbody class="unmod"> 162 <tr> 163 <th>33</th><th>33</th><td class="l"><span>comma=,</span> </td> 164 </tr><tr> 165 <th>34</th><th>34</th><td class="l"><span>MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))</span> </td> 166 </tr><tr> 167 <th>35</th><th>35</th><td class="l"><span>MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))</span> </td> 168 </tr> 169 </tbody><tbody class="mod"> 170 <tr class="first"> 171 <th>36</th><th> </th><td class="l"><span>MULTILIB_OSDIRNAMES = m64=../lib<del>64</del>$(call if_multiarch,:x86_64-linux-gnu)</span> </td> 172 </tr><tr> 173 <th>37</th><th> </th><td class="l"><span>MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib<del></del>)$(call if_multiarch,:i386-linux-gnu)</span> </td> 174 </tr> 175 <tr> 176 <th> </th><th>36</th><td class="r"><span>MULTILIB_OSDIRNAMES = m64=../lib<ins></ins>$(call if_multiarch,:x86_64-linux-gnu)</span> </td> 177 </tr><tr class="last"> 178 <th> </th><th>37</th><td class="r"><span>MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib<ins>32</ins>)$(call if_multiarch,:i386-linux-gnu)</span> </td> 179 </tr> 180 </tbody><tbody class="unmod"> 181 <tr> 182 <th>38</th><th>38</th><td class="l"><span>MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)</span> </td> 183 </tr> 184 </tbody> 185 </table> 186 </li> 187 <li class="entry"> 188 <h2> 189 <a>gcc/config/linux.h</a> 190 </h2> 191 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/linux.h gcc-6.1.0/gcc/config/linux.h</pre> 192 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 193 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 194 <thead> 195 <tr> 196 <th title="File gcc-6.1.0.orig/gcc/config/linux.h 2016-01-04 09:30:50.000000000 -0500"> 197 old 198 </th> 199 <th title="File gcc-6.1.0/gcc/config/linux.h 2016-05-12 02:55:51.000000000 -0400"> 200 new 201 </th> 202 <td><em></em> </td> 203 </tr> 204 </thead> 205 <tbody class="unmod"> 206 <tr> 207 <th>82</th><th>82</th><td class="l"><span> GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets</span> </td> 208 </tr><tr> 209 <th>83</th><th>83</th><td class="l"><span> supporting both 32-bit and 64-bit compilation. */</span> </td> 210 </tr><tr> 211 <th>84</th><th>84</th><td class="l"><span>#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"</span> </td> 212 </tr> 213 </tbody><tbody class="mod"> 214 <tr class="first"> 215 <th>85</th><th> </th><td class="l"><span>#define UCLIBC_DYNAMIC_LINKER32 "/lib<del></del>/ld-uClibc.so.0"</span> </td> 216 </tr> 217 <tr class="last"> 218 <th> </th><th>85</th><td class="r"><span>#define UCLIBC_DYNAMIC_LINKER32 "/lib<ins>32</ins>/ld-uClibc.so.0"</span> </td> 219 </tr> 220 </tbody><tbody class="unmod"> 221 <tr> 222 <th>86</th><th>86</th><td class="l"><span>#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"</span> </td> 223 </tr><tr> 224 <th>87</th><th>87</th><td class="l"><span>#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"</span> </td> 225 </tr><tr> 226 <th>88</th><th>88</th><td class="l"><span>#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"</span> </td> 227 </tr> 228 </tbody> 229 </table> 230 </li> 231 <li class="entry"> 232 <h2> 233 <a>gcc/config/mips/t-linux64</a> 234 </h2> 235 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/mips/t-linux64 gcc-6.1.0/gcc/config/mips/t-linux64</pre> 236 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 237 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 238 <thead> 239 <tr> 240 <th title="File gcc-6.1.0.orig/gcc/config/mips/t-linux64 2016-01-04 09:30:50.000000000 -0500"> 241 old 242 </th> 243 <th title="File gcc-6.1.0/gcc/config/mips/t-linux64 2016-05-12 02:55:51.000000000 -0400"> 244 new 245 </th> 246 <td><em></em> </td> 247 </tr> 248 </thead> 249 <tbody class="unmod"> 250 <tr> 251 <th>22</th><th>22</th><td class="l"><span>MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)</span> </td> 252 </tr><tr> 253 <th>23</th><th>23</th><td class="l"><span>MULTILIB_OSDIRNAMES = \</span> </td> 254 </tr><tr> 255 <th>24</th><th>24</th><td class="l"><span> ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \</span> </td> 256 </tr> 257 </tbody><tbody class="mod"> 258 <tr class="first"> 259 <th>25</th><th> </th><td class="l"><span> ../lib<del></del>$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \</span> </td> 260 </tr><tr> 261 <th>26</th><th> </th><td class="l"><span> ../lib<del>64</del>$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))</span> </td> 262 </tr> 263 <tr> 264 <th> </th><th>25</th><td class="r"><span> ../lib<ins>32</ins>$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \</span> </td> 265 </tr><tr class="last"> 266 <th> </th><th>26</th><td class="r"><span> ../lib<ins></ins>$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))</span> </td> 267 </tr> 268 </tbody> 269 </table> 270 </li> 271 <li class="entry"> 272 <h2> 273 <a>gcc/config/rs6000/linux64.h</a> 274 </h2> 275 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/rs6000/linux64.h gcc-6.1.0/gcc/config/rs6000/linux64.h</pre> 276 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 277 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 278 <thead> 279 <tr> 280 <th title="File gcc-6.1.0.orig/gcc/config/rs6000/linux64.h 2016-01-21 12:32:28.000000000 -0500"> 281 old 282 </th> 283 <th title="File gcc-6.1.0/gcc/config/rs6000/linux64.h 2016-05-12 03:00:52.000000000 -0400"> 284 new 285 </th> 286 <td><em></em> </td> 287 </tr> 288 </thead> 289 <tbody class="unmod"> 290 <tr> 291 <th>412</th><th>412</th><td class="l"><span>#undef LINK_OS_DEFAULT_SPEC</span> </td> 292 </tr><tr> 293 <th>413</th><th>413</th><td class="l"><span>#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"</span> </td> 294 </tr><tr> 295 <th>414</th><th>414</th><td class="l"><span></span> </td> 296 </tr> 297 </tbody><tbody class="mod"> 298 <tr class="first"> 299 <th>415</th><th> </th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER32 "<del>%(dynamic_linker_prefix)/lib</del>/ld.so.1"</span> </td> 300 </tr> 301 <tr class="last"> 302 <th> </th><th>415</th><td class="r"><span>#define GLIBC_DYNAMIC_LINKER32 "<ins>/lib32</ins>/ld.so.1"</span> </td> 303 </tr> 304 </tbody><tbody class="unmod"> 305 <tr> 306 <th>416</th><th>416</th><td class="l"><span></span> </td> 307 </tr><tr> 308 <th>417</th><th>417</th><td class="l"><span>#ifdef LINUX64_DEFAULT_ABI_ELFv2</span> </td> 309 </tr><tr> 310 <th>418</th><th>418</th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER64 \</span> </td> 311 </tr> 312 </tbody><tbody class="mod"> 313 <tr class="first"> 314 <th>419</th><th> </th><td class="l"><span>"%{mabi=elfv1:<del>%(dynamic_linker_prefix)/lib64</del>/ld64.so.1;" \</span> </td> 315 </tr><tr> 316 <th>420</th><th> </th><td class="l"><span>":<del>%(dynamic_linker_prefix)/lib64</del>/ld64.so.2}"</span> </td> 317 </tr> 318 <tr> 319 <th> </th><th>419</th><td class="r"><span>"%{mabi=elfv1:<ins>/lib</ins>/ld64.so.1;" \</span> </td> 320 </tr><tr class="last"> 321 <th> </th><th>420</th><td class="r"><span>":<ins>/lib</ins>/ld64.so.2}"</span> </td> 322 </tr> 323 </tbody><tbody class="unmod"> 324 <tr> 325 <th>421</th><th>421</th><td class="l"><span>#else</span> </td> 326 </tr><tr> 327 <th>422</th><th>422</th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER64 \</span> </td> 328 </tr> 329 </tbody><tbody class="mod"> 330 <tr class="first"> 331 <th>423</th><th> </th><td class="l"><span>"%{mabi=elfv2:<del>%(dynamic_linker_prefix)/lib64</del>/ld64.so.2;" \</span> </td> 332 </tr><tr> 333 <th>424</th><th> </th><td class="l"><span>":<del>%(dynamic_linker_prefix)/lib64</del>/ld64.so.1}"</span> </td> 334 </tr> 335 <tr> 336 <th> </th><th>423</th><td class="r"><span>"%{mabi=elfv2:<ins>/lib</ins>/ld64.so.2;" \</span> </td> 337 </tr><tr class="last"> 338 <th> </th><th>424</th><td class="r"><span>":<ins>/lib</ins>/ld64.so.1}"</span> </td> 339 </tr> 340 </tbody><tbody class="unmod"> 341 <tr> 342 <th>425</th><th>425</th><td class="l"><span>#endif</span> </td> 343 </tr><tr> 344 <th>426</th><th>426</th><td class="l"><span></span> </td> 345 </tr><tr> 346 <th>427</th><th>427</th><td class="l"><span>#define MUSL_DYNAMIC_LINKER32 \</span> </td> 347 </tr> 348 </tbody> 349 <tbody class="skipped"> 350 <tr> 351 <th><a href="#L429">âŠ</a></th> 352 <th><a href="#L429">âŠ</a></th> 353 <td><em></em> </td> 354 </tr> 355 </tbody> 356 <tbody class="unmod"> 357 <tr> 358 <th>429</th><th>429</th><td class="l"><span>#define MUSL_DYNAMIC_LINKER64 \</span> </td> 359 </tr><tr> 360 <th>430</th><th>430</th><td class="l"><span> "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"</span> </td> 361 </tr><tr> 362 <th>431</th><th>431</th><td class="l"><span></span> </td> 363 </tr> 364 </tbody><tbody class="mod"> 365 <tr class="first"> 366 <th>432</th><th> </th><td class="l"><span>#define UCLIBC_DYNAMIC_LINKER32 "/lib<del></del>/ld-uClibc.so.0"</span> </td> 367 </tr> 368 <tr class="last"> 369 <th> </th><th>432</th><td class="r"><span>#define UCLIBC_DYNAMIC_LINKER32 "/lib<ins>32</ins>/ld-uClibc.so.0"</span> </td> 370 </tr> 371 </tbody><tbody class="unmod"> 372 <tr> 373 <th>433</th><th>433</th><td class="l"><span>#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"</span> </td> 374 </tr><tr> 375 <th>434</th><th>434</th><td class="l"><span>#if DEFAULT_LIBC == LIBC_UCLIBC</span> </td> 376 </tr><tr> 377 <th>435</th><th>435</th><td class="l"><span>#define CHOOSE_DYNAMIC_LINKER(G, U, M) \</span> </td> 378 </tr> 379 </tbody> 380 </table> 381 </li> 382 <li class="entry"> 383 <h2> 384 <a>gcc/config/rs6000/t-linux64</a> 385 </h2> 386 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/rs6000/t-linux64 gcc-6.1.0/gcc/config/rs6000/t-linux64</pre> 387 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 388 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 389 <thead> 390 <tr> 391 <th title="File gcc-6.1.0.orig/gcc/config/rs6000/t-linux64 2016-01-04 09:30:50.000000000 -0500"> 392 old 393 </th> 394 <th title="File gcc-6.1.0/gcc/config/rs6000/t-linux64 2016-05-12 02:55:51.000000000 -0400"> 395 new 396 </th> 397 <td><em></em> </td> 398 </tr> 399 </thead> 400 <tbody class="unmod"> 401 <tr> 402 <th>28</th><th>28</th><td class="l"><span>MULTILIB_OPTIONS := m64/m32</span> </td> 403 </tr><tr> 404 <th>29</th><th>29</th><td class="l"><span>MULTILIB_DIRNAMES := 64 32</span> </td> 405 </tr><tr> 406 <th>30</th><th>30</th><td class="l"><span>MULTILIB_EXTRA_OPTS := </span> </td> 407 </tr> 408 </tbody><tbody class="mod"> 409 <tr class="first"> 410 <th>31</th><th> </th><td class="l"><span>MULTILIB_OSDIRNAMES := m64=../lib<del>64</del>$(call if_multiarch,:powerpc64-linux-gnu)</span> </td> 411 </tr><tr> 412 <th>32</th><th> </th><td class="l"><span>MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib<del></del>)$(call if_multiarch,:powerpc-linux-gnu)</span> </td> 413 </tr> 414 <tr> 415 <th> </th><th>31</th><td class="r"><span>MULTILIB_OSDIRNAMES := m64=../lib<ins></ins>$(call if_multiarch,:powerpc64-linux-gnu)</span> </td> 416 </tr><tr class="last"> 417 <th> </th><th>32</th><td class="r"><span>MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib<ins>32</ins>)$(call if_multiarch,:powerpc-linux-gnu)</span> </td> 418 </tr> 419 </tbody><tbody class="unmod"> 420 <tr> 421 <th>33</th><th>33</th><td class="l"><span></span> </td> 422 </tr><tr> 423 <th>34</th><th>34</th><td class="l"><span>rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c</span> </td> 424 </tr><tr> 425 <th>35</th><th>35</th><td class="l"><span> $(COMPILE) $<</span> </td> 426 </tr> 427 </tbody> 428 </table> 429 </li> 430 <li class="entry"> 431 <h2> 432 <a>gcc/config/s390/linux.h</a> 433 </h2> 434 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/s390/linux.h gcc-6.1.0/gcc/config/s390/linux.h</pre> 435 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 436 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 437 <thead> 438 <tr> 439 <th title="File gcc-6.1.0.orig/gcc/config/s390/linux.h 2016-01-04 09:30:50.000000000 -0500"> 440 old 441 </th> 442 <th title="File gcc-6.1.0/gcc/config/s390/linux.h 2016-05-12 02:55:51.000000000 -0400"> 443 new 444 </th> 445 <td><em></em> </td> 446 </tr> 447 </thead> 448 <tbody class="unmod"> 449 <tr> 450 <th>60</th><th>60</th><td class="l"><span>#define MULTILIB_DEFAULTS { "m31" }</span> </td> 451 </tr><tr> 452 <th>61</th><th>61</th><td class="l"><span>#endif</span> </td> 453 </tr><tr> 454 <th>62</th><th>62</th><td class="l"><span></span> </td> 455 </tr> 456 </tbody><tbody class="mod"> 457 <tr class="first"> 458 <th>63</th><th> </th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER32 "/lib<del></del>/ld.so.1"</span> </td> 459 </tr> 460 <tr class="last"> 461 <th> </th><th>63</th><td class="r"><span>#define GLIBC_DYNAMIC_LINKER32 "/lib<ins>32</ins>/ld.so.1"</span> </td> 462 </tr> 463 </tbody><tbody class="unmod"> 464 <tr> 465 <th>64</th><th>64</th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"</span> </td> 466 </tr><tr> 467 <th>65</th><th>65</th><td class="l"><span></span> </td> 468 </tr><tr> 469 <th>66</th><th>66</th><td class="l"><span>#undef LINK_SPEC</span> </td> 470 </tr> 471 </tbody> 472 </table> 473 </li> 474 <li class="entry"> 475 <h2> 476 <a>gcc/config/s390/t-linux64</a> 477 </h2> 478 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/s390/t-linux64 gcc-6.1.0/gcc/config/s390/t-linux64</pre> 479 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 480 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 481 <thead> 482 <tr> 483 <th title="File gcc-6.1.0.orig/gcc/config/s390/t-linux64 2012-11-21 11:13:28.000000000 -0500"> 484 old 485 </th> 486 <th title="File gcc-6.1.0/gcc/config/s390/t-linux64 2016-05-12 02:55:51.000000000 -0400"> 487 new 488 </th> 489 <td><em></em> </td> 490 </tr> 491 </thead> 492 <tbody class="unmod"> 493 <tr> 494 <th>7</th><th>7</th><td class="l"><span></span> </td> 495 </tr><tr> 496 <th>8</th><th>8</th><td class="l"><span>MULTILIB_OPTIONS = m64/m31</span> </td> 497 </tr><tr> 498 <th>9</th><th>9</th><td class="l"><span>MULTILIB_DIRNAMES = 64 32</span> </td> 499 </tr> 500 </tbody><tbody class="mod"> 501 <tr class="first"> 502 <th>10</th><th> </th><td class="l"><span>MULTILIB_OSDIRNAMES = ../lib<del>64</del>$(call if_multiarch,:s390x-linux-gnu)</span> </td> 503 </tr><tr> 504 <th>11</th><th> </th><td class="l"><span>MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib<del></del>)$(call if_multiarch,:s390-linux-gnu)</span> </td> 505 </tr> 506 <tr> 507 <th> </th><th>10</th><td class="r"><span>MULTILIB_OSDIRNAMES = ../lib<ins></ins>$(call if_multiarch,:s390x-linux-gnu)</span> </td> 508 </tr><tr class="last"> 509 <th> </th><th>11</th><td class="r"><span>MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib<ins>32</ins>)$(call if_multiarch,:s390-linux-gnu)</span> </td> 510 </tr> 511 </tbody> 512 </table> 513 </li> 514 <li class="entry"> 515 <h2> 516 <a>gcc/config/sparc/linux64.h</a> 517 </h2> 518 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/sparc/linux64.h gcc-6.1.0/gcc/config/sparc/linux64.h</pre> 519 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 520 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 521 <thead> 522 <tr> 523 <th title="File gcc-6.1.0.orig/gcc/config/sparc/linux64.h 2016-01-04 09:30:50.000000000 -0500"> 524 old 525 </th> 526 <th title="File gcc-6.1.0/gcc/config/sparc/linux64.h 2016-05-12 02:55:51.000000000 -0400"> 527 new 528 </th> 529 <td><em></em> </td> 530 </tr> 531 </thead> 532 <tbody class="unmod"> 533 <tr> 534 <th>84</th><th>84</th><td class="l"><span> When the -shared link option is used a final link is not being</span> </td> 535 </tr><tr> 536 <th>85</th><th>85</th><td class="l"><span> done. */</span> </td> 537 </tr><tr> 538 <th>86</th><th>86</th><td class="l"><span></span> </td> 539 </tr> 540 </tbody><tbody class="mod"> 541 <tr class="first"> 542 <th>87</th><th> </th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER32 "/lib<del></del>/ld-linux.so.2"</span> </td> 543 </tr><tr> 544 <th>88</th><th> </th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER64 "/lib<del>64</del>/ld-linux.so.2"</span> </td> 545 </tr> 546 <tr> 547 <th> </th><th>87</th><td class="r"><span>#define GLIBC_DYNAMIC_LINKER32 "/lib<ins>32</ins>/ld-linux.so.2"</span> </td> 548 </tr><tr class="last"> 549 <th> </th><th>88</th><td class="r"><span>#define GLIBC_DYNAMIC_LINKER64 "/lib<ins></ins>/ld-linux.so.2"</span> </td> 550 </tr> 551 </tbody><tbody class="unmod"> 552 <tr> 553 <th>89</th><th>89</th><td class="l"><span></span> </td> 554 </tr><tr> 555 <th>90</th><th>90</th><td class="l"><span>#ifdef SPARC_BI_ARCH</span> </td> 556 </tr><tr> 557 <th>91</th><th>91</th><td class="l"><span></span> </td> 558 </tr> 559 </tbody> 560 <tbody class="skipped"> 561 <tr> 562 <th><a href="#L193">âŠ</a></th> 563 <th><a href="#L193">âŠ</a></th> 564 <td><em></em> </td> 565 </tr> 566 </tbody> 567 <tbody class="unmod"> 568 <tr> 569 <th>193</th><th>193</th><td class="l"><span>#else /* !SPARC_BI_ARCH */</span> </td> 570 </tr><tr> 571 <th>194</th><th>194</th><td class="l"><span></span> </td> 572 </tr><tr> 573 <th>195</th><th>195</th><td class="l"><span>#undef LINK_SPEC</span> </td> 574 </tr> 575 </tbody><tbody class="mod"> 576 <tr class="first"> 577 <th>196</th><th> </th><td class="l"><span>#define LINK_SPEC "-m elf64_sparc -Y P,%R/<del>usr/lib64</del> %{shared:-shared} \</span> </td> 578 </tr> 579 <tr class="last"> 580 <th> </th><th>196</th><td class="r"><span>#define LINK_SPEC "-m elf64_sparc -Y P,%R/<ins>lib</ins> %{shared:-shared} \</span> </td> 581 </tr> 582 </tbody><tbody class="unmod"> 583 <tr> 584 <th>197</th><th>197</th><td class="l"><span> %{!shared: \</span> </td> 585 </tr><tr> 586 <th>198</th><th>198</th><td class="l"><span> %{!static: \</span> </td> 587 </tr><tr> 588 <th>199</th><th>199</th><td class="l"><span> %{rdynamic:-export-dynamic} \</span> </td> 589 </tr> 590 </tbody> 591 </table> 592 </li> 593 <li class="entry"> 594 <h2> 595 <a>gcc/config/sparc/linux.h</a> 596 </h2> 597 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/sparc/linux.h gcc-6.1.0/gcc/config/sparc/linux.h</pre> 598 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 599 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 600 <thead> 601 <tr> 602 <th title="File gcc-6.1.0.orig/gcc/config/sparc/linux.h 2016-01-04 09:30:50.000000000 -0500"> 603 old 604 </th> 605 <th title="File gcc-6.1.0/gcc/config/sparc/linux.h 2016-05-12 02:55:51.000000000 -0400"> 606 new 607 </th> 608 <td><em></em> </td> 609 </tr> 610 </thead> 611 <tbody class="unmod"> 612 <tr> 613 <th>83</th><th>83</th><td class="l"><span> When the -shared link option is used a final link is not being</span> </td> 614 </tr><tr> 615 <th>84</th><th>84</th><td class="l"><span> done. */</span> </td> 616 </tr><tr> 617 <th>85</th><th>85</th><td class="l"><span></span> </td> 618 </tr> 619 </tbody><tbody class="mod"> 620 <tr class="first"> 621 <th>86</th><th> </th><td class="l"><span>#define GLIBC_DYNAMIC_LINKER "/lib<del></del>/ld-linux.so.2"</span> </td> 622 </tr> 623 <tr class="last"> 624 <th> </th><th>86</th><td class="r"><span>#define GLIBC_DYNAMIC_LINKER "/lib<ins>32</ins>/ld-linux.so.2"</span> </td> 625 </tr> 626 </tbody><tbody class="unmod"> 627 <tr> 628 <th>87</th><th>87</th><td class="l"><span></span> </td> 629 </tr><tr> 630 <th>88</th><th>88</th><td class="l"><span>#undef LINK_SPEC</span> </td> 631 </tr><tr> 632 <th>89</th><th>89</th><td class="l"><span>#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \</span> </td> 633 </tr> 634 </tbody> 635 </table> 636 </li> 637 <li class="entry"> 638 <h2> 639 <a>gcc/config/sparc/t-linux64</a> 640 </h2> 641 <pre>diff -Naur gcc-6.1.0.orig/gcc/config/sparc/t-linux64 gcc-6.1.0/gcc/config/sparc/t-linux64</pre> 642 <table class="trac-diff inline" summary="Differences" cellspacing="0"> 643 <colgroup><col class="lineno" /><col class="lineno" /><col class="content" /></colgroup> 644 <thead> 645 <tr> 646 <th title="File gcc-6.1.0.orig/gcc/config/sparc/t-linux64 2016-01-04 09:30:50.000000000 -0500"> 647 old 648 </th> 649 <th title="File gcc-6.1.0/gcc/config/sparc/t-linux64 2016-05-12 02:55:51.000000000 -0400"> 650 new 651 </th> 652 <td><em></em> </td> 653 </tr> 654 </thead> 655 <tbody class="unmod"> 656 <tr> 657 <th>25</th><th>25</th><td class="l"><span></span> </td> 658 </tr><tr> 659 <th>26</th><th>26</th><td class="l"><span>MULTILIB_OPTIONS = m64/m32</span> </td> 660 </tr><tr> 661 <th>27</th><th>27</th><td class="l"><span>MULTILIB_DIRNAMES = 64 32</span> </td> 662 </tr> 663 </tbody><tbody class="mod"> 664 <tr class="first"> 665 <th>28</th><th> </th><td class="l"><span>MULTILIB_OSDIRNAMES = ../lib<del>64</del>$(call if_multiarch,:sparc64-linux-gnu)</span> </td> 666 </tr><tr> 667 <th>29</th><th> </th><td class="l"><span>MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib<del></del>)$(call if_multiarch,:sparc-linux-gnu)</span> </td> 668 </tr> 669 <tr> 670 <th> </th><th>28</th><td class="r"><span>MULTILIB_OSDIRNAMES = ../lib<ins></ins>$(call if_multiarch,:sparc64-linux-gnu)</span> </td> 671 </tr><tr class="last"> 672 <th> </th><th>29</th><td class="r"><span>MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib<ins>32</ins>)$(call if_multiarch,:sparc-linux-gnu)</span> </td> 673 </tr> 674 </tbody> 675 </table> 676 </li> 677 </ul> 678 </div> 679 680 </div> 681 </div> 682 <div id="altlinks"> 683 <h3>Download in other formats:</h3> 684 <ul> 685 <li class="last first"> 686 <a rel="nofollow" href="/raw-attachment/ticket/1114/gcc-7.1.0-pure64-1.2.patch">Original Format</a> 687 </li> 688 </ul> 689 </div> 690 </div> 691 <div id="footer" lang="en" xml:lang="en"><hr /> 692 <a id="tracpowered" href="http://trac.edgewall.org/"><img src="/chrome/common/trac_logo_mini.png" height="30" width="107" alt="Trac Powered" /></a> 693 <p class="left">Powered by <a href="/about"><strong>Trac 0.12.2</strong></a><br /> 694 By <a href="http://www.edgewall.org/">Edgewall Software</a>.</p> 695 <p class="right">Project-Id-Version: Trac 0.12 696 Report-Msgid-Bugs-To: trac-dev@googlegroups.com 697 POT-Creation-Date: 2008-01-30 09:20+0100 698 PO-Revision-Date: 2011-04-04 22:39+0000 699 Last-Translator: Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> 700 Language-Team: en_US <trac-dev@googlegroups.com> 701 Plural-Forms: nplurals=2; plural=(n != 1) 702 MIME-Version: 1.0 703 Content-Type: text/plain; charset=utf-8 704 Content-Transfer-Encoding: 8bit 705 Generated-By: Babel 0.9.5 706 </p> 707 </div> 708 </body> 709 </html> 12 diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux64.h gcc-7.1.0/gcc/config/i386/linux64.h 13 --- gcc-7.1.0.orig/gcc/config/i386/linux64.h 2017-01-01 12:07:43.000000000 +0000 14 +++ gcc-7.1.0/gcc/config/i386/linux64.h 2017-05-14 03:33:00.632243461 +0000 15 @@ -27,8 +27,8 @@ 16 #define GNU_USER_LINK_EMULATION64 "elf_x86_64" 17 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" 18 19 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" 20 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" 21 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" 22 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" 23 #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" 24 25 #undef MUSL_DYNAMIC_LINKER32 26 diff -Naur gcc-7.1.0.orig/gcc/config/i386/t-linux64 gcc-7.1.0/gcc/config/i386/t-linux64 27 --- gcc-7.1.0.orig/gcc/config/i386/t-linux64 2017-01-01 12:07:43.000000000 +0000 28 +++ gcc-7.1.0/gcc/config/i386/t-linux64 2017-05-14 03:33:00.632243461 +0000 29 @@ -33,6 +33,6 @@ 30 comma=, 31 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) 32 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) 33 -MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) 34 -MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) 35 +MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu) 36 +MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu) 37 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) 38 diff -Naur gcc-7.1.0.orig/gcc/config/linux.h gcc-7.1.0/gcc/config/linux.h 39 --- gcc-7.1.0.orig/gcc/config/linux.h 2017-01-01 12:07:43.000000000 +0000 40 +++ gcc-7.1.0/gcc/config/linux.h 2017-05-14 03:33:00.632243461 +0000 41 @@ -82,7 +82,7 @@ 42 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets 43 supporting both 32-bit and 64-bit compilation. */ 44 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" 45 -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" 46 +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 47 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 48 #define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0" 49 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" 50 diff -Naur gcc-7.1.0.orig/gcc/config/mips/t-linux64 gcc-7.1.0/gcc/config/mips/t-linux64 51 --- gcc-7.1.0.orig/gcc/config/mips/t-linux64 2017-01-01 12:07:43.000000000 +0000 52 +++ gcc-7.1.0/gcc/config/mips/t-linux64 2017-05-14 03:33:00.632243461 +0000 53 @@ -22,5 +22,5 @@ 54 MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) 55 MULTILIB_OSDIRNAMES = \ 56 ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ 57 - ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ 58 - ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) 59 + ../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ 60 + ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) 61 diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/linux64.h gcc-7.1.0/gcc/config/rs6000/linux64.h 62 --- gcc-7.1.0.orig/gcc/config/rs6000/linux64.h 2017-02-07 11:29:06.000000000 +0000 63 +++ gcc-7.1.0/gcc/config/rs6000/linux64.h 2017-05-14 03:33:00.632243461 +0000 64 @@ -412,16 +412,16 @@ 65 #undef LINK_OS_DEFAULT_SPEC 66 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" 67 68 -#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1" 69 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" 70 71 #ifdef LINUX64_DEFAULT_ABI_ELFv2 72 #define GLIBC_DYNAMIC_LINKER64 \ 73 -"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \ 74 -":%(dynamic_linker_prefix)/lib64/ld64.so.2}" 75 +"%{mabi=elfv1:/lib/ld64.so.1;" \ 76 +":/lib/ld64.so.2}" 77 #else 78 #define GLIBC_DYNAMIC_LINKER64 \ 79 -"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \ 80 -":%(dynamic_linker_prefix)/lib64/ld64.so.1}" 81 +"%{mabi=elfv2:/lib/ld64.so.2;" \ 82 +":/lib/ld64.so.1}" 83 #endif 84 85 #define MUSL_DYNAMIC_LINKER32 \ 86 @@ -429,7 +429,7 @@ 87 #define MUSL_DYNAMIC_LINKER64 \ 88 "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" 89 90 -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" 91 +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 92 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 93 #if DEFAULT_LIBC == LIBC_UCLIBC 94 #define CHOOSE_DYNAMIC_LINKER(G, U, M) \ 95 diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/t-linux64 gcc-7.1.0/gcc/config/rs6000/t-linux64 96 --- gcc-7.1.0.orig/gcc/config/rs6000/t-linux64 2017-01-01 12:07:43.000000000 +0000 97 +++ gcc-7.1.0/gcc/config/rs6000/t-linux64 2017-05-14 03:33:00.633243476 +0000 98 @@ -28,8 +28,8 @@ 99 MULTILIB_OPTIONS := m64/m32 100 MULTILIB_DIRNAMES := 64 32 101 MULTILIB_EXTRA_OPTS := 102 -MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) 103 -MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) 104 +MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu) 105 +MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu) 106 107 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c 108 $(COMPILE) $< 109 diff -Naur gcc-7.1.0.orig/gcc/config/s390/linux.h gcc-7.1.0/gcc/config/s390/linux.h 110 --- gcc-7.1.0.orig/gcc/config/s390/linux.h 2017-02-06 10:25:05.000000000 +0000 111 +++ gcc-7.1.0/gcc/config/s390/linux.h 2017-05-14 03:33:00.633243476 +0000 112 @@ -73,7 +73,7 @@ 113 #define MULTILIB_DEFAULTS { "m31" } 114 #endif 115 116 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" 117 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" 118 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 119 120 #undef LINK_SPEC 121 diff -Naur gcc-7.1.0.orig/gcc/config/s390/t-linux64 gcc-7.1.0/gcc/config/s390/t-linux64 122 --- gcc-7.1.0.orig/gcc/config/s390/t-linux64 2012-11-21 16:13:28.000000000 +0000 123 +++ gcc-7.1.0/gcc/config/s390/t-linux64 2017-05-14 03:33:00.633243476 +0000 124 @@ -7,5 +7,5 @@ 125 126 MULTILIB_OPTIONS = m64/m31 127 MULTILIB_DIRNAMES = 64 32 128 -MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu) 129 -MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) 130 +MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu) 131 +MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu) 132 diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux.h gcc-7.1.0/gcc/config/sparc/linux.h 133 --- gcc-7.1.0.orig/gcc/config/sparc/linux.h 2017-01-01 12:07:43.000000000 +0000 134 +++ gcc-7.1.0/gcc/config/sparc/linux.h 2017-05-14 03:33:00.633243476 +0000 135 @@ -83,7 +83,7 @@ 136 When the -shared link option is used a final link is not being 137 done. */ 138 139 -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" 140 +#define GLIBC_DYNAMIC_LINKER "/lib32/ld-linux.so.2" 141 142 #undef LINK_SPEC 143 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ 144 diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux64.h gcc-7.1.0/gcc/config/sparc/linux64.h 145 --- gcc-7.1.0.orig/gcc/config/sparc/linux64.h 2017-01-01 12:07:43.000000000 +0000 146 +++ gcc-7.1.0/gcc/config/sparc/linux64.h 2017-05-14 03:33:00.634243490 +0000 147 @@ -84,8 +84,8 @@ 148 When the -shared link option is used a final link is not being 149 done. */ 150 151 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" 152 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" 153 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" 154 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" 155 156 #ifdef SPARC_BI_ARCH 157 158 @@ -213,7 +213,7 @@ 159 #else /* !SPARC_BI_ARCH */ 160 161 #undef LINK_SPEC 162 -#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ 163 +#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \ 164 %{!shared: \ 165 %{!static: \ 166 %{rdynamic:-export-dynamic} \ 167 diff -Naur gcc-7.1.0.orig/gcc/config/sparc/t-linux64 gcc-7.1.0/gcc/config/sparc/t-linux64 168 --- gcc-7.1.0.orig/gcc/config/sparc/t-linux64 2017-01-01 12:07:43.000000000 +0000 169 +++ gcc-7.1.0/gcc/config/sparc/t-linux64 2017-05-14 03:33:00.634243490 +0000 170 @@ -25,5 +25,5 @@ 171 172 MULTILIB_OPTIONS = m64/m32 173 MULTILIB_DIRNAMES = 64 32 174 -MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu) 175 -MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu) 176 +MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu) 177 +MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
Note: See TracChangeset
for help on using the changeset viewer.
