From 334b74710e90be7f39ed368ea54a7dca1e44175e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= Date: Tue, 14 Dec 2004 17:09:39 +0000 Subject: ppc64 port --- mdk-stage1/dietlibc/include/sys/ioctl.h | 2 +- mdk-stage1/dietlibc/include/sys/mman.h | 2 +- mdk-stage1/dietlibc/include/sys/ptrace.h | 2 +- mdk-stage1/dietlibc/include/sys/shm.h | 2 +- mdk-stage1/dietlibc/include/sys/stat.h | 26 ++++++++++++- mdk-stage1/dietlibc/include/sys/types.h | 59 ++++++++++++++++++------------ mdk-stage1/dietlibc/include/sys/ucontext.h | 2 +- 7 files changed, 66 insertions(+), 29 deletions(-) (limited to 'mdk-stage1/dietlibc/include/sys') diff --git a/mdk-stage1/dietlibc/include/sys/ioctl.h b/mdk-stage1/dietlibc/include/sys/ioctl.h index a7890f038..653bbdc6a 100644 --- a/mdk-stage1/dietlibc/include/sys/ioctl.h +++ b/mdk-stage1/dietlibc/include/sys/ioctl.h @@ -13,7 +13,7 @@ #include #elif defined(__mips__) #include -#elif defined(__powerpc__) +#elif defined(powerpc) || defined(__powerpc64__) #include #elif defined(__s390__) #include diff --git a/mdk-stage1/dietlibc/include/sys/mman.h b/mdk-stage1/dietlibc/include/sys/mman.h index 298773a92..18510884f 100644 --- a/mdk-stage1/dietlibc/include/sys/mman.h +++ b/mdk-stage1/dietlibc/include/sys/mman.h @@ -75,7 +75,7 @@ #define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */ #define MADV_WILLNEED 0x3 /* pre-fault pages */ #define MADV_DONTNEED 0x4 /* discard these pages */ -#elif defined(__sparc__) || defined (__powerpc__) +#elif defined(__sparc__) || defined (powerpc) || defined(__powerpc64__) #define MAP_RENAME MAP_ANONYMOUS /* In SunOS terminology */ #define MAP_NORESERVE 0x40 /* don't reserve swap pages */ #define MAP_INHERIT 0x80 /* SunOS doesn't do this, but... */ diff --git a/mdk-stage1/dietlibc/include/sys/ptrace.h b/mdk-stage1/dietlibc/include/sys/ptrace.h index b09d3ac3a..27c95cb1e 100644 --- a/mdk-stage1/dietlibc/include/sys/ptrace.h +++ b/mdk-stage1/dietlibc/include/sys/ptrace.h @@ -635,7 +635,7 @@ struct sparc_stackf { #define PTRACE_GETUCODE 29 /* stupid bsd-ism */ -#elif defined(__powerpc__) +#elif defined(powerpc) || defined(__powerpc64__) struct pt_regs { unsigned long gpr[32]; diff --git a/mdk-stage1/dietlibc/include/sys/shm.h b/mdk-stage1/dietlibc/include/sys/shm.h index 879a8786e..36a04f8c6 100644 --- a/mdk-stage1/dietlibc/include/sys/shm.h +++ b/mdk-stage1/dietlibc/include/sys/shm.h @@ -58,7 +58,7 @@ struct shm_info { unsigned long swap_successes; }; -#if defined(__i386__) || defined(__mips__) || defined(__arm__) || defined(__powerpc__) || defined(__s390__) || defined(__hppa__) || defined(__x86_64__) || defined(__ia64__) +#if defined(__i386__) || defined(__mips__) || defined(__arm__) || defined(powerpc) || defined(__powerpc64__) || defined(__s390__) || defined(__hppa__) || defined(__x86_64__) || defined(__ia64__) #define PAGE_SIZE 4096UL #define PAGE_SHIFT 12 #elif defined(__alpha__) || defined(__sparc__) diff --git a/mdk-stage1/dietlibc/include/sys/stat.h b/mdk-stage1/dietlibc/include/sys/stat.h index d31cbd1f2..c821f60a1 100644 --- a/mdk-stage1/dietlibc/include/sys/stat.h +++ b/mdk-stage1/dietlibc/include/sys/stat.h @@ -193,7 +193,8 @@ __extension__ long long st_size; unsigned long st_pad2; __extension__ long long st_blocks; }; -#elif defined(__powerpc__) +#elif defined(powerpc) || defined(__powerpc64__) +#if defined(powerpc) struct stat { dev_t st_dev; ino_t st_ino; @@ -214,6 +215,29 @@ struct stat { unsigned long __unused4; unsigned long __unused5; }; +#else +struct stat { + unsigned long st_dev; + ino_t st_ino; + nlink_t st_nlink; + mode_t st_mode; + uid_t st_uid; + gid_t st_gid; + unsigned long st_rdev; + off_t st_size; + unsigned long st_blksize; + unsigned long st_blocks; + unsigned long st_atime; + unsigned long st_atime_nsec; + unsigned long st_mtime; + unsigned long st_mtime_nsec; + unsigned long st_ctime; + unsigned long st_ctime_nsec; + unsigned long __unused4; + unsigned long __unused5; + unsigned long __unused6; +}; +#endif /* This matches struct stat64 in glibc2.1. */ diff --git a/mdk-stage1/dietlibc/include/sys/types.h b/mdk-stage1/dietlibc/include/sys/types.h index a3d2bf4be..75753cf19 100644 --- a/mdk-stage1/dietlibc/include/sys/types.h +++ b/mdk-stage1/dietlibc/include/sys/types.h @@ -41,29 +41,42 @@ typedef unsigned long int clock_t; /* Used for system times in Used for timer ID returned by timer_create(). */ -#if defined(__alpha__) || defined(__mips__) || defined(__powerpc__) || defined(__hppa__) || defined(__sparc64__) \ - || defined(__x86_64__) || defined(__ia64__) -typedef unsigned int uid_t; /* Used for user IDs. */ -typedef unsigned int gid_t; /* Used for group IDs. */ -typedef unsigned int dev_t; /* Used for device IDs. */ -#else -typedef unsigned short uid_t; /* Used for user IDs. */ -typedef unsigned short gid_t; /* Used for group IDs. */ -typedef unsigned short dev_t; /* Used for device IDs. */ -#endif - -#if defined(__alpha__) || defined(__mips__) || defined(__powerpc__) || defined(__sparc64__) \ - || defined(__x86_64__) || defined(__ia64__) -typedef unsigned int mode_t; /* Used for some file attributes. */ -#else -typedef unsigned short mode_t; /* Used for some file attributes. */ -#endif - -#if defined(__alpha__) || defined(__mips__) || defined(__sparc64__) \ - || defined(__x86_64__) || defined(__ia64__) -typedef unsigned int nlink_t; /* Used for link counts. */ -#else -typedef unsigned short nlink_t; /* Used for link counts. */ +#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__s390x__) + typedef unsigned int dev_t; /* Used for device IDs. */ + typedef unsigned int gid_t; /* Used for group IDs. */ + typedef unsigned int mode_t; /* Used for some file attributes. */ + typedef unsigned int nlink_t; /* Used for link counts. */ + typedef unsigned int uid_t; /* Used for user IDs. */ +#elif defined(__arm__) || defined(__i386__) || defined(__sparc__) || defined(__s390__) /* make sure __s390x__ hits before __s390__ */ + typedef unsigned short dev_t; + typedef unsigned short gid_t; + typedef unsigned short mode_t; + typedef unsigned short nlink_t; + typedef unsigned short uid_t; +#elif defined(__hppa__) + typedef unsigned int dev_t; + typedef unsigned int gid_t; + typedef unsigned short mode_t; + typedef unsigned short nlink_t; + typedef unsigned int uid_t; +#elif defined(__mips__) + typedef unsigned int dev_t; + typedef int gid_t; + typedef unsigned int mode_t; + typedef int nlink_t; + typedef int uid_t; +#elif defined(powerpc) + typedef unsigned int dev_t; + typedef unsigned int gid_t; + typedef unsigned int mode_t; + typedef unsigned short nlink_t; + typedef unsigned int uid_t; +#elif defined(__powerpc64__) || defined(__x86_64__) + typedef unsigned long dev_t; + typedef unsigned int gid_t; + typedef unsigned int mode_t; + typedef unsigned long nlink_t; + typedef unsigned int uid_t; #endif typedef signed int id_t; /* Used as a general identifier; can be diff --git a/mdk-stage1/dietlibc/include/sys/ucontext.h b/mdk-stage1/dietlibc/include/sys/ucontext.h index 573c6c7fb..c380cb3aa 100644 --- a/mdk-stage1/dietlibc/include/sys/ucontext.h +++ b/mdk-stage1/dietlibc/include/sys/ucontext.h @@ -6,7 +6,7 @@ typedef struct sigcontext mcontext_t; -#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__mips64__) || defined(__powerpc__) || defined(__hppa__) +#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__mips64__) || defined(powerpc) || defined(__powerpc64__) || defined(__hppa__) struct ucontext { unsigned long uc_flags; struct ucontext *uc_link; -- cgit v1.2.1