From beb0b20e32098c34a79340d0b5c87e84bbbdfeec Mon Sep 17 00:00:00 2001
From: Russ Butler <russ.butler@arm.com>
Date: Fri, 17 Nov 2017 19:40:47 -0600
Subject: [PATCH] Use retarget defines where possible

Remove the condition code around the defines in mbed_retarget.h so
all toolchains use the defined values. Exclude a small subset of
values for GCC since these are in its standard header files.
---
 platform/mbed_retarget.cpp |  1 -
 platform/mbed_retarget.h   | 17 +++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/platform/mbed_retarget.cpp b/platform/mbed_retarget.cpp
index f77b3ce4fc..bbfb904e04 100644
--- a/platform/mbed_retarget.cpp
+++ b/platform/mbed_retarget.cpp
@@ -63,7 +63,6 @@ static SingletonPtr<PlatformMutex> _mutex;
 #   define STDERR_FILENO    2
 
 #else
-#   include <sys/stat.h>
 #   include <sys/syslimits.h>
 #   define PREFIX(x)    x
 #endif
diff --git a/platform/mbed_retarget.h b/platform/mbed_retarget.h
index 0f3e30b5e5..eb7ba7a5b3 100644
--- a/platform/mbed_retarget.h
+++ b/platform/mbed_retarget.h
@@ -28,15 +28,16 @@
 /* We can get the following standard types from sys/types for gcc, but we
  * need to define the types ourselves for the other compilers that normally
  * target embedded systems */
-#if defined(__ARMCC_VERSION) || defined(__ICCARM__)
 typedef signed   int  ssize_t;  ///< Signed size type, usually encodes negative errors
 typedef signed   long off_t;    ///< Offset in a data stream
+#if defined(__ARMCC_VERSION) || !defined(__GNUC__)
 typedef unsigned int  mode_t;   ///< Mode for opening files
 typedef unsigned int  dev_t;    ///< Device ID type
 typedef unsigned long ino_t;    ///< File serial number
 typedef unsigned int  nlink_t;  ///< Number of links to a file
 typedef unsigned int  uid_t;    ///< User ID
 typedef unsigned int  gid_t;    ///< Group ID
+#endif
 
 #define O_RDONLY 0      ///< Open for reading
 #define O_WRONLY 1      ///< Open for writing
@@ -45,19 +46,12 @@ typedef unsigned int  gid_t;    ///< Group ID
 #define O_TRUNC  0x0400 ///< Truncate file to zero length
 #define O_EXCL   0x0800 ///< Fail if file exists
 #define O_APPEND 0x0008 ///< Set file offset to end of file prior to each write
+#define O_BINARY 0x8000 ///< Open file in binary mode
 
 #define NAME_MAX 255    ///< Maximum size of a name in a file path
 
 #include <time.h>
 
-#else
-
-#include <sys/fcntl.h>
-#include <sys/types.h>
-#include <sys/syslimits.h>
-
-#endif
-
 /** \addtogroup platform */
 /** @{*/
 /**
@@ -94,7 +88,6 @@ extern "C" {
 #endif
 
 
-#if defined(__ARMCC_VERSION) || defined(__ICCARM__)
 /* The intent of this section is to unify the errno error values to match
  * the POSIX definitions for the GCC_ARM, ARMCC and IAR compilers. This is
  * necessary because the ARMCC/IAR errno.h, or sys/stat.h are missing some
@@ -365,9 +358,7 @@ extern "C" {
 #define EOWNERDEAD      130     /* Owner died */
 #undef  ENOTRECOVERABLE
 #define ENOTRECOVERABLE 131     /* State not recoverable */
-#endif
 
-#if defined(__ARMCC_VERSION) || defined(__ICCARM__)
 /* Missing stat.h defines.
  * The following are sys/stat.h definitions not currently present in the ARMCC
  * errno.h. Note, ARMCC errno.h defines some symbol values differing from
@@ -424,8 +415,6 @@ struct stat {
     time_t    st_ctime;   ///< Time of last status change
 };
 
-#endif /* defined(__ARMCC_VERSION) || defined(__ICCARM__) */
-
 
 /* The following are dirent.h definitions are declared here to garuntee
  * consistency where structure may be different with different toolchains