summaryrefslogtreecommitdiff
path: root/fixincludes
diff options
context:
space:
mode:
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-14 17:08:03 +0000
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-14 17:08:03 +0000
commit264a5d115c6fca4028e1d1a03b55075d78f1df06 (patch)
tree39b15eece6c1f4effe291a240aa3ff5c07c2fa1a /fixincludes
parentc5204ca6afa0b4e3b7b91db16d3caf42c1755a98 (diff)
downloadgcc-264a5d115c6fca4028e1d1a03b55075d78f1df06.tar.gz
Remove obsolete Solaris 8 support
libstdc++-v3: * config/os/solaris/solaris2.8: Rename to ... * config/os/solaris/solaris2.9: ... this. * config/abi/post/solaris2.8: Rename to ... * config/abi/post/solaris2.9: ... this. * configure.host (os_include_dir): Remove solaris2.8. Reflect renaming. (abi_baseline_pair): Remove *-*-solaris2.8. Reflect renaming. * configure.ac (GLIBCXX_CHECK_MATH_PROTO): Remove (GLIBCXX_CHECK_STDLIB_PROTO): Remove. * acinclude.m4 (GLIBCXX_CHECK_MATH_PROTO): Remove (GLIBCXX_CHECK_STDLIB_PROTO): Remove. (GLIBCXX_CHECK_GTHREADS): Remove Solaris 8 handling. * crossconfig.m4 (GLIBCXX_CROSSCONFIG): Remove *-solaris2.8 handling. * configure: Regenerate. * config.h.in: Regenerate. * config/os/solaris/solaris2.9/os_defines.h (__CORRECT_ISO_CPP_MATH_H_PROTO): Define. (__CORRECT_ISO_CPP_STDLIB_H_PROTO): Define. * include/c_global/cmath: Rename __CORRECT_ISO_CPP_MATH_H_PROTO1 to __CORRECT_ISO_CPP_MATH_H_PROTO. [!__CORRECT_ISO_CPP_MATH_H_PROTO2]: Remove. * include/tr1/cmath: Rename __CORRECT_ISO_CPP_MATH_H_PROTO1 to __CORRECT_ISO_CPP_MATH_H_PROTO. * doc/xml/manual/configure.xml (Configure, --enable-libstdcxx-threads): Remove Solaris 8 reference. * testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc: Don't xfail on *-*-solaris2.8. * testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc: Likewise. * testsuite/ext/enc_filebuf/char/13598.cc: Don't xfail on *-*-solaris2.8. libjava: * configure.ac (THREADLIBS): Remove *-*-solaris2.8 handling. * configure: Regenerate. libgcc: * config/i386/sol2-unwind.h (x86_fallback_frame_state): Remove Solaris 8 handling. * config/sparc/sol2-unwind.h (sparc64_is_sighandler): Remove Solaris 8 handling. (sparc_is_sighandler): Likewise. libcpp: * lex.c: Remove Solaris 8 reference. gcc/testsuite: * g++.dg/warn/miss-format-1.C: Remove *-*-solaris2.8 handling. * gcc.dg/c99-stdint-6.c: Likewise. * gcc.dg/lto/20090210_0.c: Likewise. * gcc.dg/pr28796-2.c: Don't skip on sparc*-sun-solaris2.8. * gcc.dg/pragma-init-fini.c: Don't skip on i?86-*-solaris2.8. * gcc.dg/pragma-init-fini-2.c: Likewise. * gcc.dg/torture/pr47917.c: Remove *-*-solaris2.8 handling. * gcc.target/i386/pr22076.c: Remove i?86-*-solaris2.8 handling. * gcc.target/i386/pr22152.c: Likewise. * gcc.target/i386/vect8-ret.c: Likewise. * lib/target-supports.exp (add_options_for_tls): Remove Solaris 8 handling. gcc: * config.gcc (enable_obsolete): Remove *-*-solaris2.8*. (*-*-solaris2.[0-8], *-*-solaris2.[0-8].*): Mark unsupported. (i[34567]86-*-solaris2*, x86_64-*-solaris2.1[0-9]*): Remove Solaris 8 support. * configure.ac (gcc_cv_ld_hidden): Remove *-*-solaris2.8*. (ld_tls_support): Remove Solaris 8 references. (lwp_dir, lwp_spec): Remove support for alternate thread library. * acinclude.m4 (gcc_cv_initfini_array): Remove *-*-solaris2.* tests. * configure: Regenerate. * config.in: Regenerate. * config/sol2.h (LINK_SPEC): Remove LIB_THREAD_LDFLAGS_SPEC. * config/i386/sol2.h: Remove Solaris 8 references. * doc/install.texi (Specific, i?86-*-solaris2.[89]): Rename to ... (i?86-*-solaris2.9): ... this. Remove Solaris 8 references. (Specific, *-*-solaris2*): Document Solaris 8 removal. Remove Solaris 8 references. fixincludes: * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185392 138bc75d-0d04-0410-961f-82ee72b054a4
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)