sim: common: sort nltvals.def

This was largely already done, but I think people didn't quite notice.

3 files changed, 95 insertions, 90 deletions

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 8ab1c90..f6346e9 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-30  Mike Frysinger  <vapier@gentoo.org>
+
+	* gennltvals.sh (gen_arches): Sort calls by first arg.
+	* nltvals.def: Regenerate.
+
 2021-01-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* Make-common.in (version.c): Simplifiy args and call move-if-change.
diff --git a/sim/common/gennltvals.sh b/sim/common/gennltvals.sh
index 005fa5b..869cba2 100755
--- a/sim/common/gennltvals.sh
+++ b/sim/common/gennltvals.sh
@@ -149,20 +149,20 @@ gen_arch() {
 
 gen_arches() {
   gen_arch bfin
-  gen_arch d10v newlib/libc/sys/d10v/sys
   gen_arch cr16 libgloss/cr16/sys
+  gen_arch d10v newlib/libc/sys/d10v/sys
   gen_arch fr30
   gen_arch frv
   gen_arch i960 libgloss/i960
+  gen_arch lm32
   gen_arch m32r
   gen_arch mcore libgloss/mcore
   gen_arch mn10200
   gen_arch mn10300
   gen_arch msp430
+  gen_arch pru
   gen_arch sparc
   gen_arch v850 libgloss/v850/sys
-  gen_arch lm32
-  gen_arch pru
 }
 
 # Process the script command line options.
diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def
index 08df7d5..a196be2 100644
--- a/sim/common/nltvals.def
+++ b/sim/common/nltvals.def
@@ -187,73 +187,73 @@
 /* end bfin sys target macros */
 #endif
 #endif
-#ifdef NL_TARGET_d10v
+#ifdef NL_TARGET_cr16
 #ifdef sys_defs
 /* from syscall.h */
-/* begin d10v sys target macros */
+/* begin cr16 sys target macros */
  { "SYS_ARG", 24 },
  { "SYS_chdir", 12 },
  { "SYS_chmod", 15 },
  { "SYS_chown", 16 },
- { "SYS_close", 6 },
- { "SYS_creat", 8 },
+ { "SYS_close", 0x402 },
+ { "SYS_create", 8 },
  { "SYS_execv", 11 },
  { "SYS_execve", 59 },
- { "SYS_exit", 1 },
+ { "SYS_exit", 0x410 },
  { "SYS_fork", 2 },
  { "SYS_fstat", 22 },
  { "SYS_getpid", 20 },
  { "SYS_isatty", 21 },
  { "SYS_kill", 60 },
  { "SYS_link", 9 },
- { "SYS_lseek", 19 },
+ { "SYS_lseek", 0x405 },
  { "SYS_mknod", 14 },
- { "SYS_open", 5 },
+ { "SYS_open", 0x401 },
  { "SYS_pipe", 42 },
- { "SYS_read", 3 },
+ { "SYS_read", 0x403 },
+ { "SYS_rename", 0x406 },
  { "SYS_stat", 38 },
- { "SYS_time", 23 },
- { "SYS_unlink", 10 },
+ { "SYS_time", 0x300 },
+ { "SYS_unlink", 0x407 },
  { "SYS_utime", 201 },
  { "SYS_wait", 202 },
  { "SYS_wait4", 7 },
- { "SYS_write", 4 },
-/* end d10v sys target macros */
+ { "SYS_write", 0x404 },
+/* end cr16 sys target macros */
 #endif
 #endif
-#ifdef NL_TARGET_cr16
+#ifdef NL_TARGET_d10v
 #ifdef sys_defs
 /* from syscall.h */
-/* begin cr16 sys target macros */
+/* begin d10v sys target macros */
  { "SYS_ARG", 24 },
  { "SYS_chdir", 12 },
  { "SYS_chmod", 15 },
  { "SYS_chown", 16 },
- { "SYS_close", 0x402 },
- { "SYS_create", 8 },
+ { "SYS_close", 6 },
+ { "SYS_creat", 8 },
  { "SYS_execv", 11 },
  { "SYS_execve", 59 },
- { "SYS_exit", 0x410 },
+ { "SYS_exit", 1 },
  { "SYS_fork", 2 },
  { "SYS_fstat", 22 },
  { "SYS_getpid", 20 },
  { "SYS_isatty", 21 },
  { "SYS_kill", 60 },
  { "SYS_link", 9 },
- { "SYS_lseek", 0x405 },
+ { "SYS_lseek", 19 },
  { "SYS_mknod", 14 },
- { "SYS_open", 0x401 },
+ { "SYS_open", 5 },
  { "SYS_pipe", 42 },
- { "SYS_read", 0x403 },
- { "SYS_rename", 0x406 },
+ { "SYS_read", 3 },
  { "SYS_stat", 38 },
- { "SYS_time", 0x300 },
- { "SYS_unlink", 0x407 },
+ { "SYS_time", 23 },
+ { "SYS_unlink", 10 },
  { "SYS_utime", 201 },
  { "SYS_wait", 202 },
  { "SYS_wait4", 7 },
- { "SYS_write", 0x404 },
-/* end cr16 sys target macros */
+ { "SYS_write", 4 },
+/* end d10v sys target macros */
 #endif
 #endif
 #ifdef NL_TARGET_fr30
@@ -342,6 +342,37 @@
 /* end i960 sys target macros */
 #endif
 #endif
+#ifdef NL_TARGET_lm32
+#ifdef sys_defs
+/* from syscall.h */
+/* begin lm32 sys target macros */
+ { "SYS_argc", 22 },
+ { "SYS_argn", 24 },
+ { "SYS_argnlen", 23 },
+ { "SYS_argv", 13 },
+ { "SYS_argvlen", 12 },
+ { "SYS_chdir", 14 },
+ { "SYS_chmod", 16 },
+ { "SYS_close", 3 },
+ { "SYS_exit", 1 },
+ { "SYS_fstat", 10 },
+ { "SYS_getpid", 8 },
+ { "SYS_gettimeofday", 19 },
+ { "SYS_kill", 9 },
+ { "SYS_link", 21 },
+ { "SYS_lseek", 6 },
+ { "SYS_open", 2 },
+ { "SYS_read", 4 },
+ { "SYS_reconfig", 25 },
+ { "SYS_stat", 15 },
+ { "SYS_time", 18 },
+ { "SYS_times", 20 },
+ { "SYS_unlink", 7 },
+ { "SYS_utime", 17 },
+ { "SYS_write", 5 },
+/* end lm32 sys target macros */
+#endif
+#endif
 #ifdef NL_TARGET_m32r
 #ifdef sys_defs
 /* from syscall.h */
@@ -484,6 +515,37 @@
 /* end msp430 sys target macros */
 #endif
 #endif
+#ifdef NL_TARGET_pru
+#ifdef sys_defs
+/* from syscall.h */
+/* begin pru sys target macros */
+ { "SYS_argc", 22 },
+ { "SYS_argn", 24 },
+ { "SYS_argnlen", 23 },
+ { "SYS_argv", 13 },
+ { "SYS_argvlen", 12 },
+ { "SYS_chdir", 14 },
+ { "SYS_chmod", 16 },
+ { "SYS_close", 3 },
+ { "SYS_exit", 1 },
+ { "SYS_fstat", 10 },
+ { "SYS_getpid", 8 },
+ { "SYS_gettimeofday", 19 },
+ { "SYS_kill", 9 },
+ { "SYS_link", 21 },
+ { "SYS_lseek", 6 },
+ { "SYS_open", 2 },
+ { "SYS_read", 4 },
+ { "SYS_reconfig", 25 },
+ { "SYS_stat", 15 },
+ { "SYS_time", 18 },
+ { "SYS_times", 20 },
+ { "SYS_unlink", 7 },
+ { "SYS_utime", 17 },
+ { "SYS_write", 5 },
+/* end pru sys target macros */
+#endif
+#endif
 #ifdef NL_TARGET_sparc
 #ifdef sys_defs
 /* from syscall.h */
@@ -550,65 +612,3 @@
 /* end v850 sys target macros */
 #endif
 #endif
-#ifdef NL_TARGET_lm32
-#ifdef sys_defs
-/* from syscall.h */
-/* begin lm32 sys target macros */
- { "SYS_argc", 22 },
- { "SYS_argn", 24 },
- { "SYS_argnlen", 23 },
- { "SYS_argv", 13 },
- { "SYS_argvlen", 12 },
- { "SYS_chdir", 14 },
- { "SYS_chmod", 16 },
- { "SYS_close", 3 },
- { "SYS_exit", 1 },
- { "SYS_fstat", 10 },
- { "SYS_getpid", 8 },
- { "SYS_gettimeofday", 19 },
- { "SYS_kill", 9 },
- { "SYS_link", 21 },
- { "SYS_lseek", 6 },
- { "SYS_open", 2 },
- { "SYS_read", 4 },
- { "SYS_reconfig", 25 },
- { "SYS_stat", 15 },
- { "SYS_time", 18 },
- { "SYS_times", 20 },
- { "SYS_unlink", 7 },
- { "SYS_utime", 17 },
- { "SYS_write", 5 },
-/* end lm32 sys target macros */
-#endif
-#endif
-#ifdef NL_TARGET_pru
-#ifdef sys_defs
-/* from syscall.h */
-/* begin pru sys target macros */
- { "SYS_argc", 22 },
- { "SYS_argn", 24 },
- { "SYS_argnlen", 23 },
- { "SYS_argv", 13 },
- { "SYS_argvlen", 12 },
- { "SYS_chdir", 14 },
- { "SYS_chmod", 16 },
- { "SYS_close", 3 },
- { "SYS_exit", 1 },
- { "SYS_fstat", 10 },
- { "SYS_getpid", 8 },
- { "SYS_gettimeofday", 19 },
- { "SYS_kill", 9 },
- { "SYS_link", 21 },
- { "SYS_lseek", 6 },
- { "SYS_open", 2 },
- { "SYS_read", 4 },
- { "SYS_reconfig", 25 },
- { "SYS_stat", 15 },
- { "SYS_time", 18 },
- { "SYS_times", 20 },
- { "SYS_unlink", 7 },
- { "SYS_utime", 17 },
- { "SYS_write", 5 },
-/* end pru sys target macros */
-#endif
-#endif