From aea06ed44302c204a137067f5c8c57ce6ff1e7c4 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 29 Jan 1997 15:54:31 +0000
Subject: Modifications to make go32 build using new i386-go32-rtems toolset
 and gcc 2.8.x -specs options.

---
 c/src/exec/libcsupport/src/newlibc.c | 9 ++++++---
 c/src/exec/libcsupport/src/no_libc.c | 2 +-
 c/src/lib/libc/newlibc.c             | 9 ++++++---
 c/src/lib/libc/no_libc.c             | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'c')

diff --git a/c/src/exec/libcsupport/src/newlibc.c b/c/src/exec/libcsupport/src/newlibc.c
index bd2d7133ed..af3023fac2 100644
--- a/c/src/exec/libcsupport/src/newlibc.c
+++ b/c/src/exec/libcsupport/src/newlibc.c
@@ -349,7 +349,8 @@ int get_errno()
 
 #include <stdio.h>
 
-#if !defined(RTEMS_UNIX) && !defined(__GO32__) && !defined(_AM29K)
+/* #if !defined(RTEMS_UNIX) && !defined(__GO32__) && !defined(_AM29K) */
+#if !defined(RTEMS_UNIX) && !defined(_AM29K)
 void _exit(int status)
 {
     rtems_shutdown_executive(status);
@@ -376,14 +377,16 @@ pid_t __getpid(void)
 }
 #endif
 
-#if !defined(RTEMS_POSIX_API) || defined(__GO32__)
+/* #if !defined(RTEMS_POSIX_API) || defined(__GO32__) */
+#if !defined(RTEMS_POSIX_API)
 pid_t getpid(void)
 {
   return __getpid();
 }
 #endif
 
-#if !defined(RTEMS_POSIX_API) || defined(__GO32__)
+/* #if !defined(RTEMS_POSIX_API) || defined(__GO32__) */
+#if !defined(RTEMS_POSIX_API)
 int kill( pid_t pid, int sig )
 {
   return 0;
diff --git a/c/src/exec/libcsupport/src/no_libc.c b/c/src/exec/libcsupport/src/no_libc.c
index 668764b44f..8a76bd6ef5 100644
--- a/c/src/exec/libcsupport/src/no_libc.c
+++ b/c/src/exec/libcsupport/src/no_libc.c
@@ -1,4 +1,3 @@
-#if  !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX)
 
 /*  no_libc.h
  *
@@ -18,6 +17,7 @@
 
 
 #include <rtems.h>
+#if  !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX)
 
 #include "libcsupport.h"
 #include "internal.h"
diff --git a/c/src/lib/libc/newlibc.c b/c/src/lib/libc/newlibc.c
index bd2d7133ed..af3023fac2 100644
--- a/c/src/lib/libc/newlibc.c
+++ b/c/src/lib/libc/newlibc.c
@@ -349,7 +349,8 @@ int get_errno()
 
 #include <stdio.h>
 
-#if !defined(RTEMS_UNIX) && !defined(__GO32__) && !defined(_AM29K)
+/* #if !defined(RTEMS_UNIX) && !defined(__GO32__) && !defined(_AM29K) */
+#if !defined(RTEMS_UNIX) && !defined(_AM29K)
 void _exit(int status)
 {
     rtems_shutdown_executive(status);
@@ -376,14 +377,16 @@ pid_t __getpid(void)
 }
 #endif
 
-#if !defined(RTEMS_POSIX_API) || defined(__GO32__)
+/* #if !defined(RTEMS_POSIX_API) || defined(__GO32__) */
+#if !defined(RTEMS_POSIX_API)
 pid_t getpid(void)
 {
   return __getpid();
 }
 #endif
 
-#if !defined(RTEMS_POSIX_API) || defined(__GO32__)
+/* #if !defined(RTEMS_POSIX_API) || defined(__GO32__) */
+#if !defined(RTEMS_POSIX_API)
 int kill( pid_t pid, int sig )
 {
   return 0;
diff --git a/c/src/lib/libc/no_libc.c b/c/src/lib/libc/no_libc.c
index 668764b44f..8a76bd6ef5 100644
--- a/c/src/lib/libc/no_libc.c
+++ b/c/src/lib/libc/no_libc.c
@@ -1,4 +1,3 @@
-#if  !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX)
 
 /*  no_libc.h
  *
@@ -18,6 +17,7 @@
 
 
 #include <rtems.h>
+#if  !defined(RTEMS_NEWLIB) && !defined(RTEMS_UNIX)
 
 #include "libcsupport.h"
 #include "internal.h"
-- 
cgit v1.2.3