[PATCH 1/2] Avoid cyclic header dependencies

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] Avoid cyclic header dependencies

Sebastian Huber-4
RTEMS uses a considerable part of FreeBSD kernel and user space sources.
These sources are compiled with a __FreeBSD__ define.  On 2018-06-26
Gerald Pfeifer changed the GCC provided <stddef.h> so that it includes
<sys/_types.h> if __FreeBSD__ is defined.  The Newlib <sys/_types.h>
included <sys/lock.h> which includes <sys/cdefs.h> on RTEMS which
includes <stddef.h>.  To get rid of this cyclic dependency move the
optional _flock_t definition to <sys/reent.h>.

Signed-off-by: Sebastian Huber <[hidden email]>
---
 newlib/libc/include/sys/_types.h     | 5 -----
 newlib/libc/include/sys/reent.h      | 5 +++++
 newlib/libc/sys/linux/sys/_types.h   | 1 +
 newlib/libc/sys/phoenix/sys/_types.h | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index fc10531d5..90383b083 100644
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -22,7 +22,6 @@
 #include <newlib.h>
 #include <sys/config.h>
 #include <machine/_types.h>
-#include <sys/lock.h>
 
 #ifndef __machine_blkcnt_t_defined
 typedef long __blkcnt_t;
@@ -171,10 +170,6 @@ typedef struct
 } _mbstate_t;
 #endif
 
-#ifndef __machine_flock_t_defined
-typedef _LOCK_RECURSIVE_T _flock_t;
-#endif
-
 #ifndef __machine_iconv_t_defined
 /* Iconv descriptor type */
 typedef void *_iconv_t;
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 6e55e1c1f..7f8124deb 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -30,6 +30,11 @@ typedef unsigned __Long __ULong;
 #include <sys/types.h>
 #endif
 
+#ifndef __machine_flock_t_defined
+#include <sys/lock.h>
+typedef _LOCK_RECURSIVE_T _flock_t;
+#endif
+
 #ifndef __Long
 #define __Long __int32_t
 typedef __uint32_t __ULong;
diff --git a/newlib/libc/sys/linux/sys/_types.h b/newlib/libc/sys/linux/sys/_types.h
index 2fd140520..8d8edd1c3 100644
--- a/newlib/libc/sys/linux/sys/_types.h
+++ b/newlib/libc/sys/linux/sys/_types.h
@@ -50,6 +50,7 @@ typedef struct
 } __flock_mutex_t;
 
 typedef struct { __flock_mutex_t mutex; } _flock_t;
+#define __machine_flock_t_defined
 
 #define _CLOCK_T_ unsigned long /* clock() */
 #define _TIME_T_ long /* time() */
diff --git a/newlib/libc/sys/phoenix/sys/_types.h b/newlib/libc/sys/phoenix/sys/_types.h
index 39a3c5288..d19de73ca 100644
--- a/newlib/libc/sys/phoenix/sys/_types.h
+++ b/newlib/libc/sys/phoenix/sys/_types.h
@@ -68,5 +68,6 @@ typedef struct {
 typedef struct {
  __flock_mutex_t mutex;
 } _flock_t;
+#define __machine_flock_t_defined
 
 #endif
--
2.16.4

Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] Avoid <sys/cdefs.h> dependency in <sys/_types.h>

Sebastian Huber-4
Including <sys/cdefs.h> could result in cyclic header dependencies.

Signed-off-by: Sebastian Huber <[hidden email]>
---
 newlib/libc/include/sys/_types.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index 90383b083..0ed56ed44 100644
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -210,10 +210,15 @@ typedef unsigned short __nlink_t;
 typedef long __suseconds_t; /* microseconds (signed) */
 typedef unsigned long __useconds_t; /* microseconds (unsigned) */
 
-#ifdef __GNUCLIKE_BUILTIN_VARARGS
+/*
+ * Must be identical to the __GNUCLIKE_BUILTIN_VAALIST definition in
+ * <sys/cdefs.h>.  The <sys/cdefs.h> must not be included here to avoid cyclic
+ * header dependencies.
+ */
+#if __GNUC_MINOR__ > 95 || __GNUC__ >= 3
 typedef __builtin_va_list __va_list;
 #else
 typedef char * __va_list;
-#endif /* __GNUCLIKE_BUILTIN_VARARGS */
+#endif
 
 #endif /* _SYS__TYPES_H */
--
2.16.4

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 1/2] Avoid cyclic header dependencies

Sebastian Huber-4
In reply to this post by Sebastian Huber-4
On 15/05/2019 08:55, Sebastian Huber wrote:
>   newlib/libc/sys/linux/sys/_types.h   | 1 +
>   newlib/libc/sys/phoenix/sys/_types.h | 1 +

It seems the changes in these files are unnecessary since they user
their own <sys/types.h>. I will send a v2 of the patch set.

--
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : [hidden email]
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.