25 files changed, 32 insertions, 30 deletions
diff --git a/libgloss/nds32/Makefile.in b/libgloss/nds32/Makefile.in
index 976e9ad77..99ccae814 100644
--- a/libgloss/nds32/Makefile.in
+++ b/libgloss/nds32/Makefile.in
@@ -68,11 +68,11 @@ CRT1 = crt1.o
 
 
 
-SYSCALLS1 = syscall_exit.o syscall_open.o syscall_close.o syscall_read.o syscall_write.o
-SYSCALLS2 = syscall_lseek.o syscall_unlink.o syscall_getpid.o syscall_kill.o syscall_fstat.o
-SYSCALLS3 = syscall_argvlen.o syscall_argv.o syscall_chdir.o syscall_stat.o syscall_chmod.o
-SYSCALLS4 = syscall_utime.o syscall_time.o syscall_gettimeofday.o syscall_times.o syscall_link.o
-SYSCALLS5 = syscall_rename.o syscall_isatty.o syscall_system.o syscall_sbrk.o syscall_error_handler.o
+SYSCALLS1 = _exit.o _open.o _close.o _read.o _write.o
+SYSCALLS2 = _lseek.o _unlink.o _getpid.o _kill.o _fstat.o
+SYSCALLS3 = _argvlen.o _argv.o _chdir.o _stat.o _chmod.o
+SYSCALLS4 = _utime.o _time.o _gettimeofday.o _times.o _link.o
+SYSCALLS5 = _rename.o _isatty.o _system.o _sbrk.o syscall_error_handler.o
 SYSCALLS  = $(SYSCALLS1) $(SYSCALLS2) $(SYSCALLS3) $(SYSCALLS4) $(SYSCALLS5)
 GENERIC_LIBOBJS =
 
@@ -119,27 +119,28 @@ config.status: configure
 # to support SunOS VPATH
 crt0.o: crt0.S
 crt1.o: crt1.S
-syscall_exit.o: syscall_exit.S
-syscall_open.o: syscall_open.S
-syscall_close.o: syscall_close.S
-syscall_read.o: syscall_read.S
-syscall_write.o: syscall_write.S
-syscall_lseek.o: syscall_lseek.S
-syscall_unlink.o: syscall_unlink.S
-syscall_getpid.o: syscall_getpid.S
-syscall_kill.o: syscall_kill.S
-syscall_fstat.o: syscall_fstat.S
-syscall_argvlen.o: syscall_argvlen.S
-syscall_argv.o: syscall_argv.S
-syscall_chdir.o: syscall_chdir.S
-syscall_stat.o: syscall_stat.S
-syscall_chmod.o: syscall_chmod.S
-syscall_utime.o: syscall_utime.S
-syscall_time.o: syscall_time.S
-syscall_gettimeofday.o: syscall_gettimeofday.S
-syscall_times.o: syscall_times.S
-syscall_link.o: syscall_link.S
-syscall_rename.o: syscall_rename.S
-syscall_isatty.o: syscall_isatty.S
-syscall_system.o: syscall_system.S
-syscall_sbrk.o: syscall_sbrk.S
+_exit.o: _exit.S
+_open.o: _open.S
+_close.o: _close.S
+_read.o: _read.S
+_write.o: _write.S
+_lseek.o: _lseek.S
+_unlink.o: _unlink.S
+_getpid.o: _getpid.S
+_kill.o: _kill.S
+_fstat.o: _fstat.S
+_argvlen.o: _argvlen.S
+_argv.o: _argv.S
+_chdir.o: _chdir.S
+_stat.o: _stat.S
+_chmod.o: _chmod.S
+_utime.o: _utime.S
+_time.o: _time.S
+_gettimeofday.o: _gettimeofday.S
+_times.o: _times.S
+_link.o: _link.S
+_rename.o: _rename.S
+_isatty.o: _isatty.S
+_system.o: _system.S
+_sbrk.o: _sbrk.S
+syscall_error_handler.o: syscall_error_handler.S
diff --git a/libgloss/nds32/syscall_argv.S b/libgloss/nds32/_argv.S
index 2fcf1f1d8..2fcf1f1d8 100644
--- a/libgloss/nds32/syscall_argv.S
+++ b/libgloss/nds32/_argv.S
diff --git a/libgloss/nds32/syscall_argvlen.S b/libgloss/nds32/_argvlen.S
index 3f88a418f..3f88a418f 100644
--- a/libgloss/nds32/syscall_argvlen.S
+++ b/libgloss/nds32/_argvlen.S
diff --git a/libgloss/nds32/syscall_chdir.S b/libgloss/nds32/_chdir.S
index 0fd291e18..0fd291e18 100644
--- a/libgloss/nds32/syscall_chdir.S
+++ b/libgloss/nds32/_chdir.S
diff --git a/libgloss/nds32/syscall_chmod.S b/libgloss/nds32/_chmod.S
index 70c903da5..70c903da5 100644
--- a/libgloss/nds32/syscall_chmod.S
+++ b/libgloss/nds32/_chmod.S
diff --git a/libgloss/nds32/syscall_close.S b/libgloss/nds32/_close.S
index c0abe59b3..c0abe59b3 100644
--- a/libgloss/nds32/syscall_close.S
+++ b/libgloss/nds32/_close.S
diff --git a/libgloss/nds32/syscall_exit.S b/libgloss/nds32/_exit.S
index c886fc410..46a204054 100644
--- a/libgloss/nds32/syscall_exit.S
+++ b/libgloss/nds32/_exit.S
@@ -27,7 +27,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "syscall.h"
+#include "../syscall.h"
+#include "syscall_extra.h"
 
 
 	.section .text
diff --git a/libgloss/nds32/syscall_fstat.S b/libgloss/nds32/_fstat.S
index 94e58ad1f..94e58ad1f 100644
--- a/libgloss/nds32/syscall_fstat.S
+++ b/libgloss/nds32/_fstat.S
diff --git a/libgloss/nds32/syscall_getpid.S b/libgloss/nds32/_getpid.S
index 8468d3f5b..8468d3f5b 100644
--- a/libgloss/nds32/syscall_getpid.S
+++ b/libgloss/nds32/_getpid.S
diff --git a/libgloss/nds32/syscall_gettimeofday.S b/libgloss/nds32/_gettimeofday.S
index 85e2eaec3..85e2eaec3 100644
--- a/libgloss/nds32/syscall_gettimeofday.S
+++ b/libgloss/nds32/_gettimeofday.S
diff --git a/libgloss/nds32/syscall_isatty.S b/libgloss/nds32/_isatty.S
index bd30248db..bd30248db 100644
--- a/libgloss/nds32/syscall_isatty.S
+++ b/libgloss/nds32/_isatty.S
diff --git a/libgloss/nds32/syscall_kill.S b/libgloss/nds32/_kill.S
index 4a040f668..4a040f668 100644
--- a/libgloss/nds32/syscall_kill.S
+++ b/libgloss/nds32/_kill.S
diff --git a/libgloss/nds32/syscall_link.S b/libgloss/nds32/_link.S
index cbcb7592b..cbcb7592b 100644
--- a/libgloss/nds32/syscall_link.S
+++ b/libgloss/nds32/_link.S
diff --git a/libgloss/nds32/syscall_lseek.S b/libgloss/nds32/_lseek.S
index 86e2d31d5..86e2d31d5 100644
--- a/libgloss/nds32/syscall_lseek.S
+++ b/libgloss/nds32/_lseek.S
diff --git a/libgloss/nds32/syscall_open.S b/libgloss/nds32/_open.S
index 6ef79cb84..6ef79cb84 100644
--- a/libgloss/nds32/syscall_open.S
+++ b/libgloss/nds32/_open.S
diff --git a/libgloss/nds32/syscall_read.S b/libgloss/nds32/_read.S
index ad15dd40d..ad15dd40d 100644
--- a/libgloss/nds32/syscall_read.S
+++ b/libgloss/nds32/_read.S
diff --git a/libgloss/nds32/syscall_rename.S b/libgloss/nds32/_rename.S
index 0781e3a88..0781e3a88 100644
--- a/libgloss/nds32/syscall_rename.S
+++ b/libgloss/nds32/_rename.S
diff --git a/libgloss/nds32/syscall_sbrk.S b/libgloss/nds32/_sbrk.S
index ae32e8dcd..ae32e8dcd 100644
--- a/libgloss/nds32/syscall_sbrk.S
+++ b/libgloss/nds32/_sbrk.S
diff --git a/libgloss/nds32/syscall_stat.S b/libgloss/nds32/_stat.S
index 105fda4cb..105fda4cb 100644
--- a/libgloss/nds32/syscall_stat.S
+++ b/libgloss/nds32/_stat.S
diff --git a/libgloss/nds32/syscall_system.S b/libgloss/nds32/_system.S
index 3422d8672..3422d8672 100644
--- a/libgloss/nds32/syscall_system.S
+++ b/libgloss/nds32/_system.S
diff --git a/libgloss/nds32/syscall_time.S b/libgloss/nds32/_time.S
index 811dd126d..811dd126d 100644
--- a/libgloss/nds32/syscall_time.S
+++ b/libgloss/nds32/_time.S
diff --git a/libgloss/nds32/syscall_times.S b/libgloss/nds32/_times.S
index 2d21814e4..2d21814e4 100644
--- a/libgloss/nds32/syscall_times.S
+++ b/libgloss/nds32/_times.S
diff --git a/libgloss/nds32/syscall_unlink.S b/libgloss/nds32/_unlink.S
index 77a62d6ff..77a62d6ff 100644
--- a/libgloss/nds32/syscall_unlink.S
+++ b/libgloss/nds32/_unlink.S
diff --git a/libgloss/nds32/syscall_utime.S b/libgloss/nds32/_utime.S
index 45af323cc..45af323cc 100644
--- a/libgloss/nds32/syscall_utime.S
+++ b/libgloss/nds32/_utime.S
diff --git a/libgloss/nds32/syscall_write.S b/libgloss/nds32/_write.S
index 1b1752c5a..1b1752c5a 100644
--- a/libgloss/nds32/syscall_write.S
+++ b/libgloss/nds32/_write.S