Revert "gdb/gdbserver: fix some defined but unused function warnings"

This reverts commit f4c19f89ef43dbce8065532c808e1aeb05d08994.

diff --git a/gdb/nat/x86-linux-tdesc.c b/gdb/nat/x86-linux-tdesc.c
index 8a02f77fa6a621e0e7a3a170b1175407b11131e0..c438dfae84f8da790296b39b2a8385338c283480 100644 (file)
--- a/gdb/nat/x86-linux-tdesc.c
+++ b/gdb/nat/x86-linux-tdesc.c
@@ -160,8 +160,6 @@ static constexpr x86_tdesc_feature x86_linux_all_tdesc_features[] = {
   { X86_XSTATE_X87,    true,   false,  false }
 };
 
-#if defined __i386__ || !defined IN_PROCESS_AGENT
-
 /* Return a compile time constant which is a mask of all the cpu features
    that are checked for when building an i386 target description.  */
 
@@ -177,10 +175,6 @@ x86_linux_i386_tdesc_feature_mask ()
   return mask;
 }
 
-#endif /* __i386__ || !IN_PROCESS_AGENT */
-
-#ifdef __x86_64__
-
 /* Return a compile time constant which is a mask of all the cpu features
    that are checked for when building an amd64 target description.  */
 
@@ -211,8 +205,6 @@ x86_linux_x32_tdesc_feature_mask ()
   return mask;
 }
 
-#endif /* __x86_64__ */
-
 /* Return a compile time constant which is a count of the number of cpu
    features that are checked for when building an i386 target description.  */
 
@@ -230,8 +222,6 @@ x86_linux_i386_tdesc_count ()
   return (1 << count);
 }
 
-#if defined __x86_64__ || defined IN_PROCESS_AGENT
-
 /* Return a compile time constant which is a count of the number of cpu
    features that are checked for when building an amd64 target description.  */
 
@@ -266,8 +256,6 @@ x86_linux_x32_tdesc_count ()
   return (1 << count);
 }
 
-#endif /* __x86_64__ || IN_PROCESS_AGENT */
-
 #ifdef IN_PROCESS_AGENT
 
 /* See linux-x86-tdesc.h.  */