From 2eff14701519ab3abf8eeb479f1c831a80ee1cc5 Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Wed, 5 Aug 2015 23:18:09 +0000 Subject: [PATCH] coretypes.h (enum symbol_visibility): Relocate here. 2015-08-05 Andrew MacLeod * coretypes.h (enum symbol_visibility): Relocate here. * flag-types.h (enum symbol_visibility): Remove. * tree-core.h (enum symbol_visibility): Remove. From-SVN: r226648 --- gcc/ChangeLog | 6 ++++++ gcc/coretypes.h | 10 ++++++++++ gcc/flag-types.h | 13 ------------- gcc/tree-core.h | 11 ----------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 81a1430160a..646dd18d044 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-08-05 Andrew MacLeod + + * coretypes.h (enum symbol_visibility): Relocate here. + * flag-types.h (enum symbol_visibility): Remove. + * tree-core.h (enum symbol_visibility): Remove. + 2015-08-05 Lynn Boger PR target/66870 diff --git a/gcc/coretypes.h b/gcc/coretypes.h index e3cec01f4d8..17e2b40c825 100644 --- a/gcc/coretypes.h +++ b/gcc/coretypes.h @@ -270,6 +270,16 @@ enum function_class { function_c11_misc }; +/* Enumerate visibility settings. This is deliberately ordered from most + to least visibility. */ +enum symbol_visibility +{ + VISIBILITY_DEFAULT, + VISIBILITY_PROTECTED, + VISIBILITY_HIDDEN, + VISIBILITY_INTERNAL +}; + /* Suppose that higher bits are target dependent. */ #define MEMMODEL_MASK ((1<<16)-1) diff --git a/gcc/flag-types.h b/gcc/flag-types.h index 2f820a5a764..ac9ca0b75e0 100644 --- a/gcc/flag-types.h +++ b/gcc/flag-types.h @@ -91,19 +91,6 @@ enum debug_struct_file DINFO_STRUCT_FILE_ANY /* Debug structs defined in all files. */ }; -/* Enumerate visibility settings. This is deliberately ordered from most - to least visibility. */ -#ifndef SYMBOL_VISIBILITY_DEFINED -#define SYMBOL_VISIBILITY_DEFINED -enum symbol_visibility -{ - VISIBILITY_DEFAULT, - VISIBILITY_PROTECTED, - VISIBILITY_HIDDEN, - VISIBILITY_INTERNAL -}; -#endif - /* Enumerate Objective-c instance variable visibility settings. */ enum ivar_visibility diff --git a/gcc/tree-core.h b/gcc/tree-core.h index ecefdb97998..560ce4bcdfc 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -433,17 +433,6 @@ enum cv_qualifier { TYPE_QUAL_ATOMIC = 0x8 }; -/* Enumerate visibility settings. */ -#ifndef SYMBOL_VISIBILITY_DEFINED -#define SYMBOL_VISIBILITY_DEFINED -enum symbol_visibility { - VISIBILITY_DEFAULT, - VISIBILITY_PROTECTED, - VISIBILITY_HIDDEN, - VISIBILITY_INTERNAL -}; -#endif // SYMBOL_VISIBILITY_DEFINED - /* Standard named or nameless data types of the C compiler. */ enum tree_index { TI_ERROR_MARK, -- 2.30.2