|
7965
|
1 |
--- gcc-4.6.2/fixincludes/fixincl.x 2010-11-09 11:26:09.000000000 +0100
|
|
|
2 |
+++ gcc-4.6.2-patch/fixincludes/fixincl.x 2011-12-02 13:08:56.282070301 +0100
|
|
|
3 |
@@ -15,7 +15,7 @@
|
|
|
4 |
* certain ANSI-incompatible system header files which are fixed to work
|
|
|
5 |
* correctly with ANSI C and placed in a directory that GNU C will search.
|
|
|
6 |
*
|
|
|
7 |
- * This file contains 210 fixup descriptions.
|
|
|
8 |
+ * This file contains 211 fixup descriptions.
|
|
|
9 |
*
|
|
|
10 |
* See README for more information.
|
|
|
11 |
*
|
|
|
12 |
@@ -6969,6 +6969,43 @@
|
|
|
13 |
|
|
|
14 |
/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
|
15 |
*
|
|
|
16 |
+ * Description of Solaris_Posix_Spawn_Restrict fix
|
|
|
17 |
+ */
|
|
|
18 |
+tSCC zSolaris_Posix_Spawn_RestrictName[] =
|
|
|
19 |
+ "solaris_posix_spawn_restrict";
|
|
|
20 |
+
|
|
|
21 |
+/*
|
|
|
22 |
+ * File name selection pattern
|
|
|
23 |
+ */
|
|
|
24 |
+tSCC zSolaris_Posix_Spawn_RestrictList[] =
|
|
|
25 |
+ "spawn.h\0";
|
|
|
26 |
+/*
|
|
|
27 |
+ * Machine/OS name selection pattern
|
|
|
28 |
+ */
|
|
|
29 |
+tSCC* apzSolaris_Posix_Spawn_RestrictMachs[] = {
|
|
|
30 |
+ "*-*-solaris2*",
|
|
|
31 |
+ (const char*)NULL };
|
|
|
32 |
+
|
|
|
33 |
+/*
|
|
|
34 |
+ * content selection pattern - do fix if pattern found
|
|
|
35 |
+ */
|
|
|
36 |
+tSCC zSolaris_Posix_Spawn_RestrictSelect0[] =
|
|
|
37 |
+ "(.*[ \t]+)([a-z]+)\\[_RESTRICT_KYWD\\](.*)";
|
|
|
38 |
+
|
|
|
39 |
+#define SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT 1
|
|
|
40 |
+static tTestDesc aSolaris_Posix_Spawn_RestrictTests[] = {
|
|
|
41 |
+ { TT_EGREP, zSolaris_Posix_Spawn_RestrictSelect0, (regex_t*)NULL }, };
|
|
|
42 |
+
|
|
|
43 |
+/*
|
|
|
44 |
+ * Fix Command Arguments for Solaris_Posix_Spawn_Restrict
|
|
|
45 |
+ */
|
|
|
46 |
+static const char* apzSolaris_Posix_Spawn_RestrictPatch[] = {
|
|
|
47 |
+ "format",
|
|
|
48 |
+ "%1*_RESTRICT_KYWD %2%3",
|
|
|
49 |
+ (char*)NULL };
|
|
|
50 |
+
|
|
|
51 |
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
|
52 |
+ *
|
|
|
53 |
* Description of Solaris_Stdio_Tag fix
|
|
|
54 |
*/
|
|
|
55 |
tSCC zSolaris_Stdio_TagName[] =
|
|
|
56 |
@@ -8552,9 +8589,9 @@
|
|
|
57 |
*
|
|
|
58 |
* List of all fixes
|
|
|
59 |
*/
|
|
|
60 |
-#define REGEX_COUNT 249
|
|
|
61 |
+#define REGEX_COUNT 250
|
|
|
62 |
#define MACH_LIST_SIZE_LIMIT 181
|
|
|
63 |
-#define FIX_COUNT 210
|
|
|
64 |
+#define FIX_COUNT 211
|
|
|
65 |
|
|
|
66 |
/*
|
|
|
67 |
* Enumerate the fixes
|
|
|
68 |
@@ -8731,6 +8768,7 @@
|
|
|
69 |
SOLARIS_INT_LIMITS_2_FIXIDX,
|
|
|
70 |
SOLARIS_INT_LIMITS_3_FIXIDX,
|
|
|
71 |
SOLARIS_INT_TYPES_FIXIDX,
|
|
|
72 |
+ SOLARIS_POSIX_SPAWN_RESTRICT_FIXIDX,
|
|
|
73 |
SOLARIS_STDIO_TAG_FIXIDX,
|
|
|
74 |
SOLARIS_SYS_VA_LIST_FIXIDX,
|
|
|
75 |
STATSSWTCH_FIXIDX,
|
|
|
76 |
@@ -9628,6 +9666,11 @@
|
|
|
77 |
SOLARIS_INT_TYPES_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
|
|
78 |
aSolaris_Int_TypesTests, apzSolaris_Int_TypesPatch, 0 },
|
|
|
79 |
|
|
|
80 |
+ { zSolaris_Posix_Spawn_RestrictName, zSolaris_Posix_Spawn_RestrictList,
|
|
|
81 |
+ apzSolaris_Posix_Spawn_RestrictMachs,
|
|
|
82 |
+ SOLARIS_POSIX_SPAWN_RESTRICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
|
|
|
83 |
+ aSolaris_Posix_Spawn_RestrictTests, apzSolaris_Posix_Spawn_RestrictPatch, 0 },
|
|
|
84 |
+
|
|
|
85 |
{ zSolaris_Stdio_TagName, zSolaris_Stdio_TagList,
|
|
|
86 |
apzSolaris_Stdio_TagMachs,
|
|
|
87 |
SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
|
|
|
88 |
--- gcc-4.6.2/fixincludes/inclhack.def 2010-11-09 11:26:09.000000000 +0100
|
|
|
89 |
+++ gcc-4.6.2-patch/fixincludes/inclhack.def 2011-12-02 13:06:53.974190573 +0100
|
|
|
90 |
@@ -3693,6 +3693,23 @@
|
|
|
91 |
|
|
|
92 |
|
|
|
93 |
/*
|
|
|
94 |
+ * Solaris 10+ <spawn.h> uses char *const argv[_RESTRICT_KYWD] in the
|
|
|
95 |
+ * posix_spawn declarations, which doesn't work with C++.
|
|
|
96 |
+ */
|
|
|
97 |
+fix = {
|
|
|
98 |
+ hackname = solaris_posix_spawn_restrict;
|
|
|
99 |
+ files = spawn.h;
|
|
|
100 |
+ mach = '*-*-solaris2*';
|
|
|
101 |
+ c_fix = format;
|
|
|
102 |
+ c_fix_arg = "%1*_RESTRICT_KYWD %2%3";
|
|
|
103 |
+ select = "(.*[ \t]+)([a-z]+)\\[_RESTRICT_KYWD\\](.*)";
|
|
|
104 |
+ test_text =
|
|
|
105 |
+ "char *const argv[_RESTRICT_KYWD],\n"
|
|
|
106 |
+ "char *const envp[_RESTRICT_KYWD]);";
|
|
|
107 |
+};
|
|
|
108 |
+
|
|
|
109 |
+
|
|
|
110 |
+/*
|
|
|
111 |
* Sun Solaris 8 has what appears to be some gross workaround for
|
|
|
112 |
* some old version of their c++ compiler. G++ doesn't want it
|
|
|
113 |
* either, but doesn't want to be tied to SunPRO version numbers.
|
|
|
114 |
--- gcc-4.6.2/fixincludes/spawn.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
115 |
+++ gcc-4.6.2-patch/fixincludes/spawn.h 2011-12-02 13:04:16.806543614 +0100
|
|
|
116 |
@@ -0,0 +1,15 @@
|
|
|
117 |
+/* DO NOT EDIT THIS FILE.
|
|
|
118 |
+
|
|
|
119 |
+ It has been auto-edited by fixincludes from:
|
|
|
120 |
+
|
|
|
121 |
+ "fixinc/tests/inc/spawn.h"
|
|
|
122 |
+
|
|
|
123 |
+ This had to be done to correct non-standard usages in the
|
|
|
124 |
+ original, manufacturer supplied header file. */
|
|
|
125 |
+
|
|
|
126 |
+
|
|
|
127 |
+
|
|
|
128 |
+#if defined( SOLARIS_POSIX_SPAWN_RESTRICT_CHECK )
|
|
|
129 |
+char *const *_RESTRICT_KYWD argv,
|
|
|
130 |
+char *const *_RESTRICT_KYWD envp);
|
|
|
131 |
+#endif /* SOLARIS_POSIX_SPAWN_RESTRICT_CHECK */
|