On 8/24/2012 4:59 PM, Bruce Korb wrote:
Hi Robert,
If you are going to defer, then:
On Fri, Aug 24, 2012 at 1:20 PM, rbmj <r...@verizon.net> wrote:
diff --git a/fixincludes/fixinc.in b/fixincludes/fixinc.in
index e73aed9..de7be35 100755
--- a/fixincludes/fixinc.in
+++ b/fixincludes/fixinc.in
@@ -128,6 +128,18 @@ fi
# # # # # # # # # # # # # # # # # # # # #
#
+# Check to see if the machine_name fix needs to be disabled.
+#
+
+case "${target_canonical}" in
+ *-*-vxworks*)
+ machine_name_override="OVERRIDE"
^^^^ replace this line with:
test -f ${MACRO_LIST} && rm -f ${MACRO_LIST}
The remaining part of the patch to this file is not necessary.
I like it!
Done, and patch is attached.
--
Robert Mason
>From 7980875af4a4ebc5e57f80d7143c59baeba2e98e Mon Sep 17 00:00:00 2001
From: rbmj <r...@verizon.net>
Date: Fri, 24 Aug 2012 15:32:10 -0400
Subject: [PATCH] Add ability to skip the machine_name fixincludes fix.
This patch adds the ability to skip the machine_name fixincludes
fix in fixinc.in by deleting the macro list.
It also removes vxworks from the list of no-op fix platforms in
order to allow necessary include fixes to allow a successful
build of the latest GCC.
---
fixincludes/fixinc.in | 16 ++++++++++++++++
fixincludes/mkfixinc.sh | 1 -
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/fixincludes/fixinc.in b/fixincludes/fixinc.in
index e73aed9..53d1b23 100755
--- a/fixincludes/fixinc.in
+++ b/fixincludes/fixinc.in
@@ -128,6 +128,22 @@ fi
# # # # # # # # # # # # # # # # # # # # #
#
+# Check to see if the machine_name fix needs to be disabled.
+#
+# On some platforms, machine_name doesn't work properly and
+# breaks some of the header files. Since everything works
+# properly without it, just delete the macro list to
+# disable the fix.
+
+case "${target_canonical}" in
+ *-*-vxworks*)
+ test -f ${MACRO_LIST} && rm -f ${MACRO_LIST}
+ ;;
+esac
+
+
+# # # # # # # # # # # # # # # # # # # # #
+#
# In the file macro_list are listed all the predefined
# macros that are not in the C89 reserved namespace (the reserved
# namespace is all identifiers beginnning with two underscores or one
diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh
index 89e8ab7..6653fed 100755
--- a/fixincludes/mkfixinc.sh
+++ b/fixincludes/mkfixinc.sh
@@ -15,7 +15,6 @@ case $machine in
i?86-*-mingw32* | \
x86_64-*-mingw32* | \
i?86-*-interix* | \
- *-*-vxworks* | \
powerpc-*-eabisim* | \
powerpc-*-eabi* | \
powerpc-*-rtems* | \
--
1.7.10.4
