components/gcc4/patches/002-libc-values.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 02 May 2017 17:33:26 -0700
changeset 7964 d9801318ed3d
parent 6923 338aea22bf22
permissions -rw-r--r--
25981468 Build ilmbase and openexr with the GNU compilers
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6923
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     1
#
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     2
# As the comment mentions below, match the values-*.o that selects the libc
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     3
# behaviour for the C/C++ standard selected on the command line.
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     4
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40411
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     5
#
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     6
--- gcc-4.9.4/gcc/config/sol2.h	2014-05-28 06:37:50.000000000 -0500
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     7
+++ gcc-4.9.4/gcc/config/sol2.h	2016-08-09 23:59:08.116828625 -0500
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     8
@@ -126,10 +126,35 @@
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
     9
 #define MD_STARTFILE_PREFIX "/usr/ccs/lib/"
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    10
 #endif
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    11
 
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    12
-#undef STARTFILE_ARCH32_SPEC
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    13
-#define STARTFILE_ARCH32_SPEC "%{ansi:values-Xc.o%s} \
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    14
-			    %{!ansi:values-Xa.o%s}"
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    15
+/* Solaris libc and libm implement multiple behaviours for various interfaces
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    16
+   that have changed over the years in different versions of the standards.
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    17
+   The behaviour is controlled by linking corresponding values-*.o objects.
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    18
+   Each of these objects contain alternate defintions of one or more variables
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    19
+   that libc uses to select which conflicting behaviour it should exhibit.
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    20
+   There are two sets of these objects, values-X*.o and values-xpg*.o.
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    21
 
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    22
+   The values-X*.o objects set the variable _lib_version to one of strict_ansi,
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    23
+   ansi_1, or c_issue_4.  Ignoring '-Xt' and '-Xs', unless '-Xc' is used with
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    24
+   the Solaris Studio C/C++ compilers, it appears that values-Xa.o is linked
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    25
+   into resulting executable program regardless of which '-std=' setting is
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    26
+   selected.
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    27
+
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    28
+   The values-xpg*.o objects define one or more __xpg* variables.  No
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    29
+   values-xpg*.o object is linked in unless the equivalent of '-std=c99|c11'
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    30
+   is used during the linking of an executable program.  In either of those
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    31
+   cases, values-xpg6.o is linked.
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    32
+
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    33
+   The below spec string is reasonably consistent with that behaviour. */
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    34
+#undef STARTFILE_ARCH32_SPEC
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    35
+#define STARTFILE_ARCH32_SPEC \
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    36
+    "%{!shared:%{!symbolic: \
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    37
+       %{ansi:values-Xc.o%s; :values-Xa.o%s} \
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    38
+       %{std=c99|std=c9x|std=gnu99|std=gnu9x:values-xpg6.o%s} \
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    39
+       %{std=c11|std=c1x|std=gnu11|std=gnu1x:values-xpg6.o%s} \
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    40
+       %{std=c++11|std=c++0x|std=gnu++11|std=gnu++0x:values-xpg6.o%s} \
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    41
+       %{std=c++14|std=c++1y|std=gnu++14|std=gnu++1y:values-xpg6.o%s} \
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    42
+       %{std=c++1z|std=gnu++1z:values-xpg6.o%s}}}"
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    43
+ 
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    44
 #undef STARTFILE_ARCH_SPEC
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    45
 #define STARTFILE_ARCH_SPEC STARTFILE_ARCH32_SPEC
338aea22bf22 24440950 GCC 4.9 should be updated to 4.9.4
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff changeset
    46