From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 12 Feb 2013 16:15:19 +0000 (+0100)
Subject: Unify representations of struct user fields for subarchitectures
X-Git-Tag: v4.8~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=873e5a5a5c93a6e7b9b34311818f6f04031a1dd2;p=strace

Unify representations of struct user fields for subarchitectures

* process.c: Unify MIPS and LINUX_MIPSN32, and SH and SH64 parts of
struct_user_offsets[].

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/process.c b/process.c
index 2982022f..4cec1124 100644
--- a/process.c
+++ b/process.c
@@ -2179,19 +2179,7 @@ const struct xlat struct_user_offsets[] = {
 	{ uoff(magic),		"offsetof(struct user, magic)"		},
 	{ uoff(u_comm),		"offsetof(struct user, u_comm)"		},
 	{ sizeof(struct user),	"sizeof(struct user)"			},
-#elif defined(LINUX_MIPSN32)
-	{ uoff(u_tsize),	"offsetof(struct user, u_tsize)"	},
-	{ uoff(u_dsize),	"offsetof(struct user, u_dsize)"	},
-	{ uoff(u_ssize),	"offsetof(struct user, u_ssize)"	},
-	{ uoff(start_code),	"offsetof(struct user, start_code)"	},
-	{ uoff(start_data),	"offsetof(struct user, start_data)"	},
-	{ uoff(start_stack),	"offsetof(struct user, start_stack)"	},
-	{ uoff(signal),		"offsetof(struct user, signal)"		},
-	{ uoff(u_ar0),		"offsetof(struct user, u_ar0)"		},
-	{ uoff(magic),		"offsetof(struct user, magic)"		},
-	{ uoff(u_comm),		"offsetof(struct user, u_comm)"		},
-	{ sizeof(struct user),	"sizeof(struct user)"			},
-#elif defined(MIPS)
+#elif defined(MIPS) || defined(LINUX_MIPSN32)
 	{ uoff(u_tsize),	"offsetof(struct user, u_tsize)"	},
 	{ uoff(u_dsize),	"offsetof(struct user, u_dsize)"	},
 	{ uoff(u_ssize),	"offsetof(struct user, u_ssize)"	},
@@ -2217,21 +2205,7 @@ const struct xlat struct_user_offsets[] = {
 	{ sizeof(struct user),	"sizeof(struct user)"			},
 #elif defined(HPPA)
 	/* nothing */
-#elif defined(SH)
-	{ uoff(u_fpvalid),	"offsetof(struct user, u_fpvalid)"	},
-	{ uoff(u_tsize),	"offsetof(struct user, u_tsize)"	},
-	{ uoff(u_dsize),	"offsetof(struct user, u_dsize)"	},
-	{ uoff(u_ssize),	"offsetof(struct user, u_ssize)"	},
-	{ uoff(start_code),	"offsetof(struct user, start_code)"	},
-	{ uoff(start_data),	"offsetof(struct user, start_data)"	},
-	{ uoff(start_stack),	"offsetof(struct user, start_stack)"	},
-	{ uoff(signal),		"offsetof(struct user, signal)"		},
-	{ uoff(u_ar0),		"offsetof(struct user, u_ar0)"		},
-	{ uoff(u_fpstate),	"offsetof(struct user, u_fpstate)"	},
-	{ uoff(magic),		"offsetof(struct user, magic)"		},
-	{ uoff(u_comm),		"offsetof(struct user, u_comm)"		},
-	{ sizeof(struct user),	"sizeof(struct user)"			},
-#elif defined(SH64)
+#elif defined(SH) || defined(SH64)
 	{ uoff(u_fpvalid),	"offsetof(struct user, u_fpvalid)"	},
 	{ uoff(u_tsize),	"offsetof(struct user, u_tsize)"	},
 	{ uoff(u_dsize),	"offsetof(struct user, u_dsize)"	},