aboutsummaryrefslogtreecommitdiff
path: root/fixincludes
diff options
context:
space:
mode:
authorGeoffrey Keating <geoffk@apple.com>2004-10-27 23:02:39 +0000
committerGeoffrey Keating <geoffk@gcc.gnu.org>2004-10-27 23:02:39 +0000
commit005c1a13e5649b1c7a213c8d76f8e0e20d25a891 (patch)
treecfb4cd621b8390f148fe008b597f52830668a28b /fixincludes
parent9a3137c336cf8e3f34d86a36a8eb76043abec00b (diff)
downloadgcc-005c1a13e5649b1c7a213c8d76f8e0e20d25a891.zip
gcc-005c1a13e5649b1c7a213c8d76f8e0e20d25a891.tar.gz
gcc-005c1a13e5649b1c7a213c8d76f8e0e20d25a891.tar.bz2
Index: fixincludes/ChangeLog
2004-10-27 Geoffrey Keating <geoffk@apple.com> * inclhack.def (darwin_gcc4_breakage): New. * fixincl.x: Regenerate. Index: gcc/ChangeLog 2004-10-27 Geoffrey Keating <geoffk@apple.com> * config/rs6000/rs6000.c (rs6000_attribute_table): Add SUBTARGET_ATTRIBUTE_TABLE. * config/darwin.h (ASM_WEAKEN_DECL): Handle weak_import. (SUBTARGET_ATTRIBUTE_TABLE): Define. * config/darwin.c (darwin_handle_weak_import_attribute): New. (HAVE_DEAD_STRIP): Delete. (no_dead_strip): Don't test HAVE_DEAD_STRIP. * config/darwin-protos.h (darwin_handle_weak_import_attribute): Prototype. Index: gcc/testsuite/ChangeLog 2004-10-27 Geoffrey Keating <geoffk@apple.com> * gcc.dg/darwin-weakimport-1.c: New. From-SVN: r89716
Diffstat (limited to 'fixincludes')
-rw-r--r--fixincludes/ChangeLog5
-rw-r--r--fixincludes/fixincl.x53
-rw-r--r--fixincludes/inclhack.def17
3 files changed, 70 insertions, 5 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index c50e4d7..defdb65 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-27 Geoffrey Keating <geoffk@apple.com>
+
+ * inclhack.def (darwin_gcc4_breakage): New.
+ * fixincl.x: Regenerate.
+
2004-10-27 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
PR bootstrap/17832
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index f6d1300..69098ae 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 Saturday September 18, 2004 at 10:59:03 AM MDT
+ * It has been AutoGen-ed Tuesday October 26, 2004 at 01:55:22 PM PDT
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Sep 18 10:59:03 MDT 2004
+/* DO NOT CVS-MERGE THIS FILE, EITHER Tue Oct 26 13:55:22 PDT 2004
*
* 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 179 fixup descriptions.
+ * This file contains 180 fixup descriptions.
*
* See README for more information.
*
@@ -1642,6 +1642,43 @@ extern \"C\" {\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
+ * Description of Darwin_Gcc4_Breakage fix
+ */
+tSCC zDarwin_Gcc4_BreakageName[] =
+ "darwin_gcc4_breakage";
+
+/*
+ * File name selection pattern
+ */
+tSCC zDarwin_Gcc4_BreakageList[] =
+ "|AvailabilityMacros.h|";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzDarwin_Gcc4_BreakageMachs[] = {
+ "*-*-darwin*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zDarwin_Gcc4_BreakageSelect0[] =
+ "\\(__GNUC__ >= 3\\) && \\(__GNUC_MINOR__ >= 1\\)";
+
+#define DARWIN_GCC4_BREAKAGE_TEST_CT 1
+static tTestDesc aDarwin_Gcc4_BreakageTests[] = {
+ { TT_EGREP, zDarwin_Gcc4_BreakageSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Darwin_Gcc4_Breakage
+ */
+static const char* apzDarwin_Gcc4_BreakagePatch[] = {
+ "format",
+ "((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
* Description of Darwin_Private_Extern fix
*/
tSCC zDarwin_Private_ExternName[] =
@@ -7102,9 +7139,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 202
+#define REGEX_COUNT 203
#define MACH_LIST_SIZE_LIMIT 261
-#define FIX_COUNT 179
+#define FIX_COUNT 180
/*
* Enumerate the fixes
@@ -7148,6 +7185,7 @@ typedef enum {
CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX,
+ DARWIN_GCC4_BREAKAGE_FIXIDX,
DARWIN_PRIVATE_EXTERN_FIXIDX,
DEC_INTERN_ASM_FIXIDX,
DJGPP_WCHAR_H_FIXIDX,
@@ -7482,6 +7520,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 },
+ { zDarwin_Gcc4_BreakageName, zDarwin_Gcc4_BreakageList,
+ apzDarwin_Gcc4_BreakageMachs,
+ DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aDarwin_Gcc4_BreakageTests, apzDarwin_Gcc4_BreakagePatch, 0 },
+
{ zDarwin_Private_ExternName, zDarwin_Private_ExternList,
apzDarwin_Private_ExternMachs,
DARWIN_PRIVATE_EXTERN_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 38021c3..00c5ae6 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -978,6 +978,23 @@ fix = {
/*
+ * AvailabilityMacros.h on Darwin breaks with GCC 4.0, because of
+ * bad __GNUC__ tests.
+ */
+
+fix = {
+ hackname = darwin_gcc4_breakage;
+ mach = "*-*-darwin*";
+ files = AvailabilityMacros.h;
+ select = "\\(__GNUC__ >= 3\\) && \\(__GNUC_MINOR__ >= 1\\)";
+ c_fix = format;
+ c_fix_arg = "((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))";
+ test_text = "#if defined(__GNUC__) && (__GNUC__ >= 3) && "
+ "(__GNUC_MINOR__ >= 1)\n";
+};
+
+
+/*
* __private_extern__ doesn't exist in FSF GCC. Even if it did,
* why would you ever put it in a system header file?
*/