1*4882a593SmuzhiyunFrom 90ebe548922538b854de52e8b687384f44360984 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Romain Naour <romain.naour@gmail.com> 3*4882a593SmuzhiyunDate: Fri, 22 Jun 2018 22:40:26 +0200 4*4882a593SmuzhiyunSubject: [PATCH] gdbserver: fix build for m68k 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunAs for strace [1], when <sys/reg.h> is included after <linux/ptrace.h>, 10*4882a593Smuzhiyunthe build fails on m68k with the following diagnostics: 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunIn file included from ./../nat/linux-ptrace.h:28:0, 13*4882a593Smuzhiyun from linux-low.h:27, 14*4882a593Smuzhiyun from linux-m68k-low.c:20: 15*4882a593Smuzhiyun[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant 16*4882a593Smuzhiyun PT_D1 = 0, 17*4882a593Smuzhiyun ^ 18*4882a593Smuzhiyun[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant 19*4882a593Smuzhiyun[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant 20*4882a593SmuzhiyunIn file included from linux-m68k-low.c:27:0: 21*4882a593Smuzhiyun[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token 22*4882a593Smuzhiyun }; 23*4882a593Smuzhiyun ^ 24*4882a593Smuzhiyun 25*4882a593SmuzhiyunFix this by moving <sys/reg.h> on top of "linux-low.h". 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 28*4882a593Smuzhiyun 29*4882a593SmuzhiyunSigned-off-by: Romain Naour <romain.naour@gmail.com> 30*4882a593Smuzhiyun--- 31*4882a593Smuzhiyun gdbserver/linux-m68k-low.cc | 9 +++++---- 32*4882a593Smuzhiyun 1 file changed, 5 insertions(+), 4 deletions(-) 33*4882a593Smuzhiyun 34*4882a593Smuzhiyundiff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc 35*4882a593Smuzhiyunindex 838ba353b0b..36679682b9a 100644 36*4882a593Smuzhiyun--- a/gdbserver/linux-m68k-low.cc 37*4882a593Smuzhiyun+++ b/gdbserver/linux-m68k-low.cc 38*4882a593Smuzhiyun@@ -17,6 +17,11 @@ 39*4882a593Smuzhiyun along with this program. If not, see <http://www.gnu.org/licenses/>. */ 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun #include "server.h" 42*4882a593Smuzhiyun+ 43*4882a593Smuzhiyun+#ifdef HAVE_SYS_REG_H 44*4882a593Smuzhiyun+#include <sys/reg.h> 45*4882a593Smuzhiyun+#endif 46*4882a593Smuzhiyun+ 47*4882a593Smuzhiyun #include "linux-low.h" 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun /* Linux target op definitions for the m68k architecture. */ 50*4882a593Smuzhiyun@@ -80,10 +85,6 @@ m68k_target::low_decr_pc_after_break () 51*4882a593Smuzhiyun void init_registers_m68k (void); 52*4882a593Smuzhiyun extern const struct target_desc *tdesc_m68k; 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun-#ifdef HAVE_SYS_REG_H 55*4882a593Smuzhiyun-#include <sys/reg.h> 56*4882a593Smuzhiyun-#endif 57*4882a593Smuzhiyun- 58*4882a593Smuzhiyun #define m68k_num_regs 29 59*4882a593Smuzhiyun #define m68k_num_gregs 18 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun-- 62*4882a593Smuzhiyun2.29.2 63*4882a593Smuzhiyun 64