Index: gcc/ada/s-oscons-tmplt.c
===================================================================
--- gcc/ada/s-oscons-tmplt.c	(revision 158265)
+++ gcc/ada/s-oscons-tmplt.c	(working copy)
@@ -386,197 +386,197 @@
 CND(EACCES, "Permission denied")
 
 #ifndef EADDRINUSE
-# define EADDRINUSE -1
+# define EADDRINUSE -2
 #endif
 CND(EADDRINUSE, "Address already in use")
 
 #ifndef EADDRNOTAVAIL
-# define EADDRNOTAVAIL -1
+# define EADDRNOTAVAIL -3
 #endif
 CND(EADDRNOTAVAIL, "Cannot assign address")
 
 #ifndef EAFNOSUPPORT
-# define EAFNOSUPPORT -1
+# define EAFNOSUPPORT -4
 #endif
 CND(EAFNOSUPPORT, "Addr family not supported")
 
 #ifndef EALREADY
-# define EALREADY -1
+# define EALREADY -5
 #endif
 CND(EALREADY, "Operation in progress")
 
 #ifndef EBADF
-# define EBADF -1
+# define EBADF -6
 #endif
 CND(EBADF, "Bad file descriptor")
 
 #ifndef ECONNABORTED
-# define ECONNABORTED -1
+# define ECONNABORTED -7
 #endif
 CND(ECONNABORTED, "Connection aborted")
 
 #ifndef ECONNREFUSED
-# define ECONNREFUSED -1
+# define ECONNREFUSED -8
 #endif
 CND(ECONNREFUSED, "Connection refused")
 
 #ifndef ECONNRESET
-# define ECONNRESET -1
+# define ECONNRESET -8
 #endif
 CND(ECONNRESET, "Connection reset by peer")
 
 #ifndef EDESTADDRREQ
-# define EDESTADDRREQ -1
+# define EDESTADDRREQ -10
 #endif
 CND(EDESTADDRREQ, "Destination addr required")
 
 #ifndef EFAULT
-# define EFAULT -1
+# define EFAULT -11
 #endif
 CND(EFAULT, "Bad address")
 
 #ifndef EHOSTDOWN
-# define EHOSTDOWN -1
+# define EHOSTDOWN -12
 #endif
 CND(EHOSTDOWN, "Host is down")
 
 #ifndef EHOSTUNREACH
-# define EHOSTUNREACH -1
+# define EHOSTUNREACH -13
 #endif
 CND(EHOSTUNREACH, "No route to host")
 
 #ifndef EINPROGRESS
-# define EINPROGRESS -1
+# define EINPROGRESS -14
 #endif
 CND(EINPROGRESS, "Operation now in progress")
 
 #ifndef EINTR
-# define EINTR -1
+# define EINTR -15
 #endif
 CND(EINTR, "Interrupted system call")
 
 #ifndef EINVAL
-# define EINVAL -1
+# define EINVAL -16
 #endif
 CND(EINVAL, "Invalid argument")
 
 #ifndef EIO
-# define EIO -1
+# define EIO -17
 #endif
 CND(EIO, "Input output error")
 
 #ifndef EISCONN
-# define EISCONN -1
+# define EISCONN -18
 #endif
 CND(EISCONN, "Socket already connected")
 
 #ifndef ELOOP
-# define ELOOP -1
+# define ELOOP -19
 #endif
 CND(ELOOP, "Too many symbolic links")
 
 #ifndef EMFILE
-# define EMFILE -1
+# define EMFILE -20
 #endif
 CND(EMFILE, "Too many open files")
 
 #ifndef EMSGSIZE
-# define EMSGSIZE -1
+# define EMSGSIZE -21
 #endif
 CND(EMSGSIZE, "Message too long")
 
 #ifndef ENAMETOOLONG
-# define ENAMETOOLONG -1
+# define ENAMETOOLONG -22
 #endif
 CND(ENAMETOOLONG, "Name too long")
 
 #ifndef ENETDOWN
-# define ENETDOWN -1
+# define ENETDOWN -23
 #endif
 CND(ENETDOWN, "Network is down")
 
 #ifndef ENETRESET
-# define ENETRESET -1
+# define ENETRESET -24
 #endif
 CND(ENETRESET, "Disconn. on network reset")
 
 #ifndef ENETUNREACH
-# define ENETUNREACH -1
+# define ENETUNREACH -25
 #endif
 CND(ENETUNREACH, "Network is unreachable")
 
 #ifndef ENOBUFS
-# define ENOBUFS -1
+# define ENOBUFS -26
 #endif
 CND(ENOBUFS, "No buffer space available")
 
 #ifndef ENOPROTOOPT
-# define ENOPROTOOPT -1
+# define ENOPROTOOPT -27
 #endif
 CND(ENOPROTOOPT, "Protocol not available")
 
 #ifndef ENOTCONN
-# define ENOTCONN -1
+# define ENOTCONN -28
 #endif
 CND(ENOTCONN, "Socket not connected")
 
 #ifndef ENOTSOCK
-# define ENOTSOCK -1
+# define ENOTSOCK -29
 #endif
 CND(ENOTSOCK, "Operation on non socket")
 
 #ifndef EOPNOTSUPP
-# define EOPNOTSUPP -1
+# define EOPNOTSUPP -30
 #endif
 CND(EOPNOTSUPP, "Operation not supported")
 
 #ifndef EPIPE
-# define EPIPE -1
+# define EPIPE -31
 #endif
 CND(EPIPE, "Broken pipe")
 
 #ifndef EPFNOSUPPORT
-# define EPFNOSUPPORT -1
+# define EPFNOSUPPORT -32
 #endif
 CND(EPFNOSUPPORT, "Unknown protocol family")
 
 #ifndef EPROTONOSUPPORT
-# define EPROTONOSUPPORT -1
+# define EPROTONOSUPPORT -33
 #endif
 CND(EPROTONOSUPPORT, "Unknown protocol")
 
 #ifndef EPROTOTYPE
-# define EPROTOTYPE -1
+# define EPROTOTYPE -34
 #endif
 CND(EPROTOTYPE, "Unknown protocol type")
 
 #ifndef ERANGE
-# define ERANGE -1
+# define ERANGE -35
 #endif
 CND(ERANGE, "Result too large")
 
 #ifndef ESHUTDOWN
-# define ESHUTDOWN -1
+# define ESHUTDOWN -36
 #endif
 CND(ESHUTDOWN, "Cannot send once shutdown")
 
 #ifndef ESOCKTNOSUPPORT
-# define ESOCKTNOSUPPORT -1
+# define ESOCKTNOSUPPORT -37
 #endif
 CND(ESOCKTNOSUPPORT, "Socket type not supported")
 
 #ifndef ETIMEDOUT
-# define ETIMEDOUT -1
+# define ETIMEDOUT -38
 #endif
 CND(ETIMEDOUT, "Connection timed out")
 
 #ifndef ETOOMANYREFS
-# define ETOOMANYREFS -1
+# define ETOOMANYREFS -39
 #endif
 CND(ETOOMANYREFS, "Too many references")
 
 #ifndef EWOULDBLOCK
-# define EWOULDBLOCK -1
+# define EWOULDBLOCK -40
 #endif
 CND(EWOULDBLOCK, "Operation would block")