author | Petr Nyc <Petr.Nyc@Oracle.COM> |
Thu, 11 Jun 2015 06:36:56 -0700 | |
branch | s11u2-sru |
changeset 4466 | a276a7815539 |
parent 667 | bf7a382b5272 |
child 991 | ed62e375e805 |
permissions | -rw-r--r-- |
246
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
1 |
*** gcc-3.4.3/gcc/config/sol2.h.orig Thu Sep 23 00:27:08 2004 |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
2 |
--- gcc-3.4.3/gcc/config/sol2.h Mon Jan 28 13:33:35 2008 |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
3 |
*************** |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
4 |
*** 130,141 **** |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
5 |
%{YP,*} \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
6 |
%{R*} \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
7 |
%{compat-bsd: \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
8 |
! %{!YP,*:%{p|pg:-Y P,/usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/usr/lib} \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
9 |
! %{!p:%{!pg:-Y P,/usr/ucblib:/usr/ccs/lib:/usr/lib}}} \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
10 |
! -R /usr/ucblib} \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
11 |
%{!compat-bsd: \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
12 |
! %{!YP,*:%{p|pg:-Y P,/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/usr/lib} \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
13 |
! %{!p:%{!pg:-Y P,/usr/ccs/lib:/usr/lib}}}}" |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
14 |
|
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
15 |
#undef LINK_ARCH32_SPEC |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
16 |
#define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
17 |
--- 130,141 ---- |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
18 |
%{YP,*} \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
19 |
%{R*} \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
20 |
%{compat-bsd: \ |
667
bf7a382b5272
7131234 userland should remove references to /usr/ucb
Rich Burridge <rich.burridge@oracle.com>
parents:
616
diff
changeset
|
21 |
! %{!YP,*:%{p|pg:-Y P,/usr/sfw/lib:/usr/lib/libp:/lib:/usr/lib -R /usr/sfw/lib:/usr/lib/libp} \ |
bf7a382b5272
7131234 userland should remove references to /usr/ucb
Rich Burridge <rich.burridge@oracle.com>
parents:
616
diff
changeset
|
22 |
! %{!p:%{!pg:-Y P,/usr/sfw/lib:/lib:/usr/lib -R /usr/sfw/lib}}} \ |
246
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
23 |
! } \ |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
24 |
%{!compat-bsd: \ |
616
26ce2f2c45ec
7080051 The search and runpath for gcc-3 need to be adjusted
Rich Burridge <rich.burridge@oracle.com>
parents:
246
diff
changeset
|
25 |
! %{!YP,*:%{p|pg:-Y P,/usr/sfw/lib:/usr/lib/libp:/lib:/usr/lib -R /usr/sfw/lib:/usr/lib/libp} \ |
26ce2f2c45ec
7080051 The search and runpath for gcc-3 need to be adjusted
Rich Burridge <rich.burridge@oracle.com>
parents:
246
diff
changeset
|
26 |
! %{!p:%{!pg:-Y P,/usr/sfw/lib:/lib:/usr/lib -R /usr/sfw/lib}}}}" |
246
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
27 |
|
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
28 |
#undef LINK_ARCH32_SPEC |
0878f7720e3e
7024396 g++ link missing from /usr/gnu/bin
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
29 |
#define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE |