sys/arch/{arm,i386}/include: merges

The follwoing file have been merged as far as reasonably possible:

 * sys/arch/arm/include/:
   - ansi.h
   - asm.h

 * sys/arch/arm/include/:
   - ansi.h
   - asm.h
   - cdef.h

Unlike on NetBSD, the definition of size_t, ssize_t and ptrdiff_t are
the same as the ones on intel.

Change-Id: I3b52e9c03991e575450ca42567877cd4fd14976a

diff --git a/sys/arch/arm/include/ansi.h b/sys/arch/arm/include/ansi.h
index 0a0acf758fc4c72b04f9c0ca616771e23e275d6d..a5a1f54104d203550634685680934c974d483634 100644 (file)
--- a/sys/arch/arm/include/ansi.h
+++ b/sys/arch/arm/include/ansi.h
@@ -31,7 +31,6 @@
  *     from: @(#)ansi.h        8.2 (Berkeley) 1/4/94
  */
 
-
 #ifndef        _ANSI_H_
 #define        _ANSI_H_
 
@@ -49,9 +48,13 @@
  *     #endif
  */
 #define        _BSD_CLOCK_T_           unsigned int    /* clock() */
+#if defined(__minix)
+/* To change this, this require also changing the defintion of size_t in GCC,
+ * and to adapt the following headers: int_fmt.h, int_types.h */
 #define        _BSD_PTRDIFF_T_         int             /* ptr1 - ptr2 */
 #define        _BSD_SIZE_T_            unsigned int    /* sizeof() */
 #define        _BSD_SSIZE_T_           int             /* byte count or error */
+#endif /* defined(__minix) */
 #define        _BSD_TIME_T_            __int64_t       /* time() */
 #define        _BSD_CLOCKID_T_         int             /* clockid_t */
 #define        _BSD_TIMER_T_           int             /* timer_t */

diff --git a/sys/arch/arm/include/asm.h b/sys/arch/arm/include/asm.h
index f5845cd24c5eb4ac812be6669c58bf99569b3605..d28bf53d2cfac598b78f7e6bcfb2dbd8950820e9 100644 (file)
--- a/sys/arch/arm/include/asm.h
+++ b/sys/arch/arm/include/asm.h
@@ -88,12 +88,6 @@
 #define        ASENTRY_NP(y)   _ENTRY(_ASM_LABEL(y))
 #define        ASEND(y)        _END(_ASM_LABEL(y))
 
-#if defined(__minix)
-#define _LABEL(x) \
-       .globl x; x:
-#define        LABEL(y)        _LABEL(_C_LABEL(y))
-#endif /* defined(__minix) */
-
 #define        ASMSTR          .asciz
 
 #if defined(PIC)
@@ -182,9 +176,13 @@
 # define RETc(c)       __CONCAT(mov,c) pc, lr
 #endif
 
-#ifdef __minix
+#if defined(__minix)
+#define _LABEL(x) \
+       .globl x; x:
+#define        LABEL(y)        _LABEL(_C_LABEL(y))
+
 #define IMPORT(sym)               \
         .extern _C_LABEL(sym)
-#endif
+#endif /* defined(__minix) */
 
 #endif /* !_ARM_ASM_H_ */

diff --git a/sys/arch/i386/include/ansi.h b/sys/arch/i386/include/ansi.h
index 77a27bd32abc9e18c4ff76838d91470e25e6a51d..cdfafc5ed7e6d6014b5ace40e9e8e93d1c4672fa 100644 (file)
--- a/sys/arch/i386/include/ansi.h
+++ b/sys/arch/i386/include/ansi.h
@@ -31,7 +31,6 @@
  *     @(#)ansi.h      8.2 (Berkeley) 1/4/94
  */
 
-
 #ifndef        _I386_ANSI_H_
 #define        _I386_ANSI_H_
 

diff --git a/sys/arch/i386/include/asm.h b/sys/arch/i386/include/asm.h
index a08f4e4e3d50d3c51d6978e6d4ce5dc11754e801..1ceb6ea073cde01d519564b21d214a263da57af6 100644 (file)
--- a/sys/arch/i386/include/asm.h
+++ b/sys/arch/i386/include/asm.h
@@ -191,7 +191,7 @@
 #define        __KERNEL_RCSID(_n, _s)  RCSID(_s)
 #endif
 
-#if defined(__ELF__) || defined(__minix)
+#ifdef __ELF__
 #define        WEAK_ALIAS(alias,sym)                                           \
        .weak alias;                                                    \
        alias = sym

diff --git a/sys/arch/i386/include/cdefs.h b/sys/arch/i386/include/cdefs.h
index 6002b786f0d8dc05be697b8b2adb56cf35b44c5b..49cbedd730e9d0f4049bdc8f1c0bd54920ebb40d 100644 (file)
--- a/sys/arch/i386/include/cdefs.h
+++ b/sys/arch/i386/include/cdefs.h
@@ -9,9 +9,4 @@
 
 #define __ALIGNBYTES   (sizeof(int) - 1)
 
-#if defined(__minix)
-#ifndef __ELF__
-#define __LEADING_UNDERSCORE
-#endif
-#endif /* defined(__minix) */
 #endif /* !_I386_CDEFS_H_ */