From 647ca77f52ace83cd8f42cb3f8655018be8d7cc7 Mon Sep 17 00:00:00 2001
From: Dave Watson <davejwatson@fb.com>
Date: Tue, 9 Jan 2018 07:41:19 -0800
Subject: [PATCH] s390x: remove PROTECTED visibility

---
 src/s390x/Gapply_reg_state.c    | 2 +-
 src/s390x/Gcreate_addr_space.c  | 2 +-
 src/s390x/Gget_proc_info.c      | 2 +-
 src/s390x/Gget_save_loc.c       | 2 +-
 src/s390x/Ginit.c               | 4 ++--
 src/s390x/Ginit_local.c         | 6 +++---
 src/s390x/Ginit_remote.c        | 2 +-
 src/s390x/Gis_signal_frame.c    | 2 +-
 src/s390x/Greg_states_iterate.c | 2 +-
 src/s390x/Gresume.c             | 2 +-
 src/s390x/Gstep.c               | 4 ++--
 src/s390x/is_fpreg.c            | 2 +-
 src/s390x/regname.c             | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/s390x/Gapply_reg_state.c b/src/s390x/Gapply_reg_state.c
index eec93046..82f056da 100644
--- a/src/s390x/Gapply_reg_state.c
+++ b/src/s390x/Gapply_reg_state.c
@@ -27,7 +27,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include "unwind_i.h"
 
-PROTECTED int
+int
 unw_apply_reg_state (unw_cursor_t *cursor,
 		     void *reg_states_data)
 {
diff --git a/src/s390x/Gcreate_addr_space.c b/src/s390x/Gcreate_addr_space.c
index 9c264c07..d4114549 100644
--- a/src/s390x/Gcreate_addr_space.c
+++ b/src/s390x/Gcreate_addr_space.c
@@ -35,7 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #define __BIG_ENDIAN _BIG_ENDIAN
 #endif
 
-PROTECTED unw_addr_space_t
+unw_addr_space_t
 unw_create_addr_space (unw_accessors_t *a, int byte_order)
 {
 #ifdef UNW_LOCAL_ONLY
diff --git a/src/s390x/Gget_proc_info.c b/src/s390x/Gget_proc_info.c
index 8def62d2..50de1e42 100644
--- a/src/s390x/Gget_proc_info.c
+++ b/src/s390x/Gget_proc_info.c
@@ -27,7 +27,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include "unwind_i.h"
 
-PROTECTED int
+int
 unw_get_proc_info (unw_cursor_t *cursor, unw_proc_info_t *pi)
 {
   struct cursor *c = (struct cursor *) cursor;
diff --git a/src/s390x/Gget_save_loc.c b/src/s390x/Gget_save_loc.c
index 7a672031..dc462c96 100644
--- a/src/s390x/Gget_save_loc.c
+++ b/src/s390x/Gget_save_loc.c
@@ -28,7 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include "unwind_i.h"
 
-PROTECTED int
+int
 unw_get_save_loc (unw_cursor_t *cursor, int reg, unw_save_loc_t *sloc)
 {
   struct cursor *c = (struct cursor *) cursor;
diff --git a/src/s390x/Ginit.c b/src/s390x/Ginit.c
index 260a1f96..8f3e369e 100644
--- a/src/s390x/Ginit.c
+++ b/src/s390x/Ginit.c
@@ -41,13 +41,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #ifdef UNW_REMOTE_ONLY
 
 /* unw_local_addr_space is a NULL pointer in this case.  */
-PROTECTED unw_addr_space_t unw_local_addr_space;
+unw_addr_space_t unw_local_addr_space;
 
 #else /* !UNW_REMOTE_ONLY */
 
 static struct unw_addr_space local_addr_space;
 
-PROTECTED unw_addr_space_t unw_local_addr_space = &local_addr_space;
+unw_addr_space_t unw_local_addr_space = &local_addr_space;
 
 HIDDEN unw_dyn_info_list_t _U_dyn_info_list;
 
diff --git a/src/s390x/Ginit_local.c b/src/s390x/Ginit_local.c
index 7696f11c..5eaead0f 100644
--- a/src/s390x/Ginit_local.c
+++ b/src/s390x/Ginit_local.c
@@ -30,7 +30,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #ifdef UNW_REMOTE_ONLY
 
-PROTECTED int
+int
 unw_init_local (unw_cursor_t *cursor, ucontext_t *uc)
 {
   return -UNW_EINVAL;
@@ -55,13 +55,13 @@ unw_init_local_common (unw_cursor_t *cursor, ucontext_t *uc, unsigned use_prev_i
   return common_init (c, use_prev_instr);
 }
 
-PROTECTED int
+int
 unw_init_local (unw_cursor_t *cursor, ucontext_t *uc)
 {
   return unw_init_local_common(cursor, uc, 1);
 }
 
-PROTECTED int
+int
 unw_init_local2 (unw_cursor_t *cursor, ucontext_t *uc, int flag)
 {
   if (!flag)
diff --git a/src/s390x/Ginit_remote.c b/src/s390x/Ginit_remote.c
index f3b7bb97..efd61d64 100644
--- a/src/s390x/Ginit_remote.c
+++ b/src/s390x/Ginit_remote.c
@@ -28,7 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include "init.h"
 #include "unwind_i.h"
 
-PROTECTED int
+int
 unw_init_remote (unw_cursor_t *cursor, unw_addr_space_t as, void *as_arg)
 {
 #ifdef UNW_LOCAL_ONLY
diff --git a/src/s390x/Gis_signal_frame.c b/src/s390x/Gis_signal_frame.c
index 161e46fd..7ed91e3c 100644
--- a/src/s390x/Gis_signal_frame.c
+++ b/src/s390x/Gis_signal_frame.c
@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
    - sigreturn:    svc 119 (0x0a77)
 */
 
-PROTECTED int
+int
 unw_is_signal_frame (unw_cursor_t *cursor)
 {
 #ifdef __linux__
diff --git a/src/s390x/Greg_states_iterate.c b/src/s390x/Greg_states_iterate.c
index a39837a1..a17dc1b5 100644
--- a/src/s390x/Greg_states_iterate.c
+++ b/src/s390x/Greg_states_iterate.c
@@ -27,7 +27,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include "unwind_i.h"
 
-PROTECTED int
+int
 unw_reg_states_iterate (unw_cursor_t *cursor,
 			unw_reg_states_callback cb, void *token)
 {
diff --git a/src/s390x/Gresume.c b/src/s390x/Gresume.c
index 8712ce76..fd9d1302 100644
--- a/src/s390x/Gresume.c
+++ b/src/s390x/Gresume.c
@@ -144,7 +144,7 @@ establish_machine_state (struct cursor *c)
   return 0;
 }
 
-PROTECTED int
+int
 unw_resume (unw_cursor_t *cursor)
 {
   struct cursor *c = (struct cursor *) cursor;
diff --git a/src/s390x/Gstep.c b/src/s390x/Gstep.c
index 4d9a8dfc..5f23debd 100644
--- a/src/s390x/Gstep.c
+++ b/src/s390x/Gstep.c
@@ -29,7 +29,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include "unwind_i.h"
 #include <signal.h>
 
-PROTECTED int
+int
 unw_handle_signal_frame (unw_cursor_t *cursor)
 {
   struct cursor *c = (struct cursor *) cursor;
@@ -86,7 +86,7 @@ unw_handle_signal_frame (unw_cursor_t *cursor)
   return 1;
 }
 
-PROTECTED int
+int
 unw_step (unw_cursor_t *cursor)
 {
   struct cursor *c = (struct cursor *) cursor;
diff --git a/src/s390x/is_fpreg.c b/src/s390x/is_fpreg.c
index eb0a9c4d..bc31f3e9 100644
--- a/src/s390x/is_fpreg.c
+++ b/src/s390x/is_fpreg.c
@@ -28,7 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 #include "libunwind_i.h"
 
-PROTECTED int
+int
 unw_is_fpreg (int regnum)
 {
   /* vector registers? */
diff --git a/src/s390x/regname.c b/src/s390x/regname.c
index 28932a01..2421b37e 100644
--- a/src/s390x/regname.c
+++ b/src/s390x/regname.c
@@ -47,7 +47,7 @@ static const char *regname[] =
     [UNW_S390X_IP]="IP"
    };
 
-PROTECTED const char *
+const char *
 unw_regname (unw_regnum_t reg)
 {
   if (reg < (unw_regnum_t) ARRAY_SIZE (regname))