Hi! On Wed, 30 Sep 2015 09:45:25 -0400, Ulrich Drepper <drep...@gmail.com> wrote: > Except that this is missing: [...]
Yes, I also had already prepared such a patch; now checked in (as
obvious), include some further cleanup; r228298:
commit 5ab4aeae1dba9c2a04dd213474d8c33b6b69e2e3
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed Sep 30 15:14:29 2015 +0000
More DEF_FUNCTION_TYPE_VAR_6/DEF_FUNCTION_TYPE_VAR_11 cleanup
gcc/ada/
* gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_11): Don't define.
gcc/jit/
* jit-builtins.h: Undefine DEF_FUNCTION_TYPE_VAR_6 after use.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228298
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ada/ChangeLog | 4 ++++
gcc/ada/gcc-interface/utils.c | 8 --------
gcc/jit/ChangeLog | 5 +++++
gcc/jit/jit-builtins.h | 1 +
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git gcc/ada/ChangeLog gcc/ada/ChangeLog
index efb2d3a..d4c505c 100644
--- gcc/ada/ChangeLog
+++ gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-30 Thomas Schwinge <tho...@codesourcery.com>
+
+ * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_11): Don't define.
+
2015-09-28 Tom de Vries <t...@codesourcery.com>
* gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_6): Define
diff --git gcc/ada/gcc-interface/utils.c gcc/ada/gcc-interface/utils.c
index 672b910..0f3087d 100644
--- gcc/ada/gcc-interface/utils.c
+++ gcc/ada/gcc-interface/utils.c
@@ -5380,8 +5380,6 @@ enum c_builtin_type
ARG6) NAME,
#define DEF_FUNCTION_TYPE_VAR_7(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
ARG6, ARG7) NAME,
-#define DEF_FUNCTION_TYPE_VAR_11(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
- ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) NAME,
#define DEF_POINTER_TYPE(NAME, TYPE) NAME,
#include "builtin-types.def"
#undef DEF_PRIMITIVE_TYPE
@@ -5402,7 +5400,6 @@ enum c_builtin_type
#undef DEF_FUNCTION_TYPE_VAR_5
#undef DEF_FUNCTION_TYPE_VAR_6
#undef DEF_FUNCTION_TYPE_VAR_7
-#undef DEF_FUNCTION_TYPE_VAR_11
#undef DEF_POINTER_TYPE
BT_LAST
};
@@ -5514,10 +5511,6 @@ install_builtin_function_types (void)
#define DEF_FUNCTION_TYPE_VAR_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
ARG6, ARG7) \
def_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7);
-#define DEF_FUNCTION_TYPE_VAR_11(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
- ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) \
- def_fn_type (ENUM, RETURN, 1, 11, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6,
\
- ARG7, ARG8, ARG9, ARG10, ARG11);
#define DEF_POINTER_TYPE(ENUM, TYPE) \
builtin_types[(int) ENUM] = build_pointer_type (builtin_types[(int) TYPE]);
@@ -5541,7 +5534,6 @@ install_builtin_function_types (void)
#undef DEF_FUNCTION_TYPE_VAR_5
#undef DEF_FUNCTION_TYPE_VAR_6
#undef DEF_FUNCTION_TYPE_VAR_7
-#undef DEF_FUNCTION_TYPE_VAR_11
#undef DEF_POINTER_TYPE
builtin_types[(int) BT_LAST] = NULL_TREE;
}
diff --git gcc/jit/ChangeLog gcc/jit/ChangeLog
index faa8545..05fa9e6 100644
--- gcc/jit/ChangeLog
+++ gcc/jit/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-30 Thomas Schwinge <tho...@codesourcery.com>
+ Ulrich Drepper <drep...@gmail.com>
+
+ * jit-builtins.h: Undefine DEF_FUNCTION_TYPE_VAR_6 after use.
+
2015-09-30 Matthias Klose <d...@ubuntu.com>
* jit-builtins.h Define DEF_FUNCTION_TYPE_VAR_6,
diff --git gcc/jit/jit-builtins.h gcc/jit/jit-builtins.h
index 0b6f974..3d76247 100644
--- gcc/jit/jit-builtins.h
+++ gcc/jit/jit-builtins.h
@@ -72,6 +72,7 @@ enum jit_builtin_type
#undef DEF_FUNCTION_TYPE_VAR_3
#undef DEF_FUNCTION_TYPE_VAR_4
#undef DEF_FUNCTION_TYPE_VAR_5
+#undef DEF_FUNCTION_TYPE_VAR_6
#undef DEF_FUNCTION_TYPE_VAR_7
#undef DEF_POINTER_TYPE
BT_LAST
Grüße,
Thomas
signature.asc
Description: PGP signature
