summaryrefslogtreecommitdiff
path: root/fixincludes
diff options
context:
space:
mode:
Diffstat (limited to 'fixincludes')
-rw-r--r--fixincludes/ChangeLog8
-rw-r--r--fixincludes/fixincl.x56
-rw-r--r--fixincludes/inclhack.def26
-rw-r--r--fixincludes/tests/base/pthread.h10
4 files changed, 17 insertions, 83 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 4f59eda0bd0..aff2eae1947 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,5 +1,13 @@
2012-03-14 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+ * inclhack.def (math_exception): Remove duplicate.
+ (solaris_cond_init): Remove.
+ (solaris_sys_va_list): Remove Solaris 8 support.
+ * fixincl.x: Regenerate.
+ * tests/base/pthread.h [SOLARIS_COND_INIT_CHECK]: Remove.
+
+2012-03-14 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
* inclhack.def (broken_cabs): Remove IRIX and SunOS 4 support.
(irix___restrict): Remove.
(irix___generic1): Remove.
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index ba7babc17be..b6a804dcb41 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Wednesday March 14, 2012 at 02:41:19 PM MET
+ * It has been AutoGen-ed Wednesday March 14, 2012 at 03:19:50 PM MET
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Mar 14 14:41:19 MET 2012
+/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Mar 14 15:19:50 MET 2012
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -15,7 +15,7 @@
* certain ANSI-incompatible system header files which are fixed to work
* correctly with ANSI C and placed in a directory that GNU C will search.
*
- * This file contains 212 fixup descriptions.
+ * This file contains 211 fixup descriptions.
*
* See README for more information.
*
@@ -5720,44 +5720,6 @@ extern \"C\" {\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description of Solaris_Cond_Init fix
- */
-tSCC zSolaris_Cond_InitName[] =
- "solaris_cond_init";
-
-/*
- * File name selection pattern
- */
-tSCC zSolaris_Cond_InitList[] =
- "pthread.h\0";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzSolaris_Cond_InitMachs[] = {
- "*-*-solaris2.8",
- (const char*)NULL };
-
-/*
- * content selection pattern - do fix if pattern found
- */
-tSCC zSolaris_Cond_InitSelect0[] =
- "@\\(#\\)pthread.h[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
-
-#define SOLARIS_COND_INIT_TEST_CT 1
-static tTestDesc aSolaris_Cond_InitTests[] = {
- { TT_EGREP, zSolaris_Cond_InitSelect0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Solaris_Cond_Init
- */
-static const char* apzSolaris_Cond_InitPatch[] = {
- "format",
- "%1, 0x4356%2",
- "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+\\{.*0)(\\},[ \t]*0\\}.*)$",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
* Description of Solaris_Cxx_Linkage fix
*/
tSCC zSolaris_Cxx_LinkageName[] =
@@ -6725,7 +6687,7 @@ tSCC zSolaris_Sys_Va_ListList[] =
* Machine/OS name selection pattern
*/
tSCC* apzSolaris_Sys_Va_ListMachs[] = {
- "*-*-solaris2.[89]",
+ "*-*-solaris2.9",
(const char*)NULL };
/*
@@ -8630,9 +8592,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 255
+#define REGEX_COUNT 254
#define MACH_LIST_SIZE_LIMIT 181
-#define FIX_COUNT 212
+#define FIX_COUNT 211
/*
* Enumerate the fixes
@@ -8778,7 +8740,6 @@ typedef enum {
SOLARIS___RESTRICT_FIXIDX,
SOLARIS_COMPLEX_FIXIDX,
SOLARIS_COMPLEX_CXX_FIXIDX,
- SOLARIS_COND_INIT_FIXIDX,
SOLARIS_CXX_LINKAGE_FIXIDX,
SOLARIS_GETC_STRICT_STDC_FIXIDX,
SOLARIS_LONGJMP_NORETURN_FIXIDX,
@@ -9553,11 +9514,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
SOLARIS_COMPLEX_CXX_TEST_CT, FD_MACH_ONLY,
aSolaris_Complex_CxxTests, apzSolaris_Complex_CxxPatch, 0 },
- { zSolaris_Cond_InitName, zSolaris_Cond_InitList,
- apzSolaris_Cond_InitMachs,
- SOLARIS_COND_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
- aSolaris_Cond_InitTests, apzSolaris_Cond_InitPatch, 0 },
-
{ zSolaris_Cxx_LinkageName, zSolaris_Cxx_LinkageList,
apzSolaris_Cxx_LinkageMachs,
SOLARIS_CXX_LINKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 8f36077829a..2d632b32d0f 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -2382,7 +2382,7 @@ fix = {
files = math.h;
select = "struct exception";
/*
- * This should be bypassed on __cplusplus, but some supposedly C++ C++
+ * This should be bypassed on __cplusplus, but some supposedly C++
* aware headers, such as Solaris 8 and 9, don't wrap their struct
* exception either. So currently we bypass only for glibc, based on a
* comment in the fixed glibc header. Ick.
@@ -2926,26 +2926,6 @@ fix = {
/*
- * Solaris 8 PTHREAD_COND_INITIALIZER lacks the __pthread_cond_magic field.
- * COND_MAGIC is only defined in <synch.h> and pollutes the namespace, so
- * use the value literally instead.
- */
-fix = {
- hackname = solaris_cond_init;
- select = '@\(#\)pthread.h' "[ \t]+1.[0-9]+[ \t]+[0-9/]+ SMI";
- files = pthread.h;
- mach = '*-*-solaris2.8';
- c_fix = format;
- c_fix_arg = "%1, 0x4356%2";
- c_fix_arg = "^(#define[ \t]+PTHREAD_COND_INITIALIZER[ \t]+"
- "\\{.*0)(\\},[ \t]*0\\}.*)$";
- test_text =
- '#pragma ident "@(#)pthread.h 1.29 01/07/07 SMI"'"\n"
- '#define PTHREAD_COND_INITIALIZER {{{0}, 0}, 0} /* = DEFAULTCV */';
-};
-
-
-/*
* g++ rejects functions declared with both C and C++ linkage.
*/
fix = {
@@ -3422,13 +3402,13 @@ fix = {
/*
- * On Solaris 8 and 9, __va_list needs to become a typedef for
+ * On Solaris 9, __va_list needs to become a typedef for
* __builtin_va_list to make -Wmissing-format-attribute work.
*/
fix = {
hackname = solaris_sys_va_list;
files = sys/va_list.h;
- mach = '*-*-solaris2.[89]';
+ mach = '*-*-solaris2.9';
select = "#if.*__STDC__.*\n"
"typedef void \\*__va_list;\n"
"#else\n"
diff --git a/fixincludes/tests/base/pthread.h b/fixincludes/tests/base/pthread.h
index cb4cfc9a0f7..dc719166049 100644
--- a/fixincludes/tests/base/pthread.h
+++ b/fixincludes/tests/base/pthread.h
@@ -75,16 +75,6 @@ extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask);
#endif /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */
-#if defined( SOLARIS_COND_INIT_CHECK )
-#pragma ident "@(#)pthread.h 1.29 01/07/07 SMI"
-#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
-#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, 0} /* = DEFAULTCV */
-#else
-#define PTHREAD_COND_INITIALIZER {{{0}, 0, 0x4356}, {0}} /* = DEFAULTCV */
-#endif
-#endif /* SOLARIS_COND_INIT_CHECK */
-
-
#if defined( SOLARIS_MUTEX_INIT_2_CHECK )
#ident "@(#)pthread.h 1.26 98/04/12 SMI"
#if __STDC__ - 0 == 0 && !defined(_NO_LONGLONG)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 10:34:57 +0000