Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e08d8aae authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Fix posix_types.h userspace breakage from sh64 merge. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 6e3037d3

include/asm-sh/Kbuild

+5 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += cpu-features.h



unifdef-y += unistd_32.h

unifdef-y += unistd_64.h

unifdef-y += posix_types_32.h

unifdef-y += posix_types_64.h

include/asm-sh/posix_types.h

+7 −122
Original line number Diff line number Diff line 
#ifndef __ASM_SH_POSIX_TYPES_H

#define __ASM_SH_POSIX_TYPES_H



/*

 * This file is generally used by user-level software, so you need to

 * be a little careful about namespace pollution etc.  Also, we cannot

 * assume GCC is being used.

 */



typedef unsigned long	__kernel_ino_t;

typedef unsigned short	__kernel_mode_t;

typedef unsigned short	__kernel_nlink_t;

typedef long		__kernel_off_t;

typedef int		__kernel_pid_t;

typedef unsigned short	__kernel_ipc_pid_t;

typedef unsigned short	__kernel_uid_t;

typedef unsigned short	__kernel_gid_t;

typedef unsigned int	__kernel_size_t;

typedef int		__kernel_ssize_t;

typedef int		__kernel_ptrdiff_t;

typedef long		__kernel_time_t;

typedef long		__kernel_suseconds_t;

typedef long		__kernel_clock_t;

typedef int		__kernel_timer_t;

typedef int		__kernel_clockid_t;

typedef int		__kernel_daddr_t;

typedef char *		__kernel_caddr_t;

typedef unsigned short	__kernel_uid16_t;

typedef unsigned short	__kernel_gid16_t;

typedef unsigned int	__kernel_uid32_t;

typedef unsigned int	__kernel_gid32_t;



typedef unsigned short	__kernel_old_uid_t;

typedef unsigned short	__kernel_old_gid_t;

typedef unsigned short	__kernel_old_dev_t;



#ifdef __GNUC__

typedef long long	__kernel_loff_t;

#ifdef __KERNEL__

# ifdef CONFIG_SUPERH32

#  include "posix_types_32.h"

# else

#  include "posix_types_64.h"

# endif



typedef struct {

#if defined(__KERNEL__) || defined(__USE_ALL)

	int	val[2];

#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */

	int	__val[2];

#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */

} __kernel_fsid_t;



#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)



#undef	__FD_SET

static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)

{

	unsigned long __tmp = __fd / __NFDBITS;

	unsigned long __rem = __fd % __NFDBITS;

	__fdsetp->fds_bits[__tmp] |= (1UL<<__rem);

}



#undef	__FD_CLR

static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)

{

	unsigned long __tmp = __fd / __NFDBITS;

	unsigned long __rem = __fd % __NFDBITS;

	__fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);

}





#undef	__FD_ISSET

static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)

{ 

	unsigned long __tmp = __fd / __NFDBITS;

	unsigned long __rem = __fd % __NFDBITS;

	return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;

}



/*

 * This will unroll the loop for the normal constant case (8 ints,

 * for a 256-bit fd_set)

 */

#undef	__FD_ZERO

static __inline__ void __FD_ZERO(__kernel_fd_set *__p)

{

	unsigned long *__tmp = __p->fds_bits;

	int __i;



	if (__builtin_constant_p(__FDSET_LONGS)) {

		switch (__FDSET_LONGS) {

		case 16:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			__tmp[ 4] = 0; __tmp[ 5] = 0;

			__tmp[ 6] = 0; __tmp[ 7] = 0;

			__tmp[ 8] = 0; __tmp[ 9] = 0;

			__tmp[10] = 0; __tmp[11] = 0;

			__tmp[12] = 0; __tmp[13] = 0;

			__tmp[14] = 0; __tmp[15] = 0;

			return;



		case 8:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			__tmp[ 4] = 0; __tmp[ 5] = 0;

			__tmp[ 6] = 0; __tmp[ 7] = 0;

			return;



		case 4:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			return;

		}

	}

	__i = __FDSET_LONGS;

	while (__i) {

		__i--;

		*__tmp = 0;

		__tmp++;

	}

}



#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */



#endif /* __ASM_SH_POSIX_TYPES_H */
 
#endif /* __KERNEL__ */

include/asm-sh/posix_types_32.h

0 → 100644
+122 −0
Original line number Diff line number Diff line 
#ifndef __ASM_SH_POSIX_TYPES_H

#define __ASM_SH_POSIX_TYPES_H



/*

 * This file is generally used by user-level software, so you need to

 * be a little careful about namespace pollution etc.  Also, we cannot

 * assume GCC is being used.

 */



typedef unsigned long	__kernel_ino_t;

typedef unsigned short	__kernel_mode_t;

typedef unsigned short	__kernel_nlink_t;

typedef long		__kernel_off_t;

typedef int		__kernel_pid_t;

typedef unsigned short	__kernel_ipc_pid_t;

typedef unsigned short	__kernel_uid_t;

typedef unsigned short	__kernel_gid_t;

typedef unsigned int	__kernel_size_t;

typedef int		__kernel_ssize_t;

typedef int		__kernel_ptrdiff_t;

typedef long		__kernel_time_t;

typedef long		__kernel_suseconds_t;

typedef long		__kernel_clock_t;

typedef int		__kernel_timer_t;

typedef int		__kernel_clockid_t;

typedef int		__kernel_daddr_t;

typedef char *		__kernel_caddr_t;

typedef unsigned short	__kernel_uid16_t;

typedef unsigned short	__kernel_gid16_t;

typedef unsigned int	__kernel_uid32_t;

typedef unsigned int	__kernel_gid32_t;



typedef unsigned short	__kernel_old_uid_t;

typedef unsigned short	__kernel_old_gid_t;

typedef unsigned short	__kernel_old_dev_t;



#ifdef __GNUC__

typedef long long	__kernel_loff_t;

#endif



typedef struct {

#if defined(__KERNEL__) || defined(__USE_ALL)

	int	val[2];

#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */

	int	__val[2];

#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */

} __kernel_fsid_t;



#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)



#undef	__FD_SET

static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)

{

	unsigned long __tmp = __fd / __NFDBITS;

	unsigned long __rem = __fd % __NFDBITS;

	__fdsetp->fds_bits[__tmp] |= (1UL<<__rem);

}



#undef	__FD_CLR

static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)

{

	unsigned long __tmp = __fd / __NFDBITS;

	unsigned long __rem = __fd % __NFDBITS;

	__fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);

}





#undef	__FD_ISSET

static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)

{ 

	unsigned long __tmp = __fd / __NFDBITS;

	unsigned long __rem = __fd % __NFDBITS;

	return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;

}



/*

 * This will unroll the loop for the normal constant case (8 ints,

 * for a 256-bit fd_set)

 */

#undef	__FD_ZERO

static __inline__ void __FD_ZERO(__kernel_fd_set *__p)

{

	unsigned long *__tmp = __p->fds_bits;

	int __i;



	if (__builtin_constant_p(__FDSET_LONGS)) {

		switch (__FDSET_LONGS) {

		case 16:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			__tmp[ 4] = 0; __tmp[ 5] = 0;

			__tmp[ 6] = 0; __tmp[ 7] = 0;

			__tmp[ 8] = 0; __tmp[ 9] = 0;

			__tmp[10] = 0; __tmp[11] = 0;

			__tmp[12] = 0; __tmp[13] = 0;

			__tmp[14] = 0; __tmp[15] = 0;

			return;



		case 8:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			__tmp[ 4] = 0; __tmp[ 5] = 0;

			__tmp[ 6] = 0; __tmp[ 7] = 0;

			return;



		case 4:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			return;

		}

	}

	__i = __FDSET_LONGS;

	while (__i) {

		__i--;

		*__tmp = 0;

		__tmp++;

	}

}



#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */



#endif /* __ASM_SH_POSIX_TYPES_H */

include/asm-sh/posix_types_64.h

0 → 100644
+131 −0
Original line number Diff line number Diff line 
#ifndef __ASM_SH64_POSIX_TYPES_H

#define __ASM_SH64_POSIX_TYPES_H



/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * include/asm-sh64/posix_types.h

 *

 * Copyright (C) 2000, 2001  Paolo Alberelli

 * Copyright (C) 2003  Paul Mundt

 *

 * This file is generally used by user-level software, so you need to

 * be a little careful about namespace pollution etc.  Also, we cannot

 * assume GCC is being used.

 */



typedef unsigned long	__kernel_ino_t;

typedef unsigned short	__kernel_mode_t;

typedef unsigned short	__kernel_nlink_t;

typedef long		__kernel_off_t;

typedef int		__kernel_pid_t;

typedef unsigned short	__kernel_ipc_pid_t;

typedef unsigned short	__kernel_uid_t;

typedef unsigned short	__kernel_gid_t;

typedef long unsigned int	__kernel_size_t;

typedef int		__kernel_ssize_t;

typedef int		__kernel_ptrdiff_t;

typedef long		__kernel_time_t;

typedef long		__kernel_suseconds_t;

typedef long		__kernel_clock_t;

typedef int		__kernel_timer_t;

typedef int		__kernel_clockid_t;

typedef int		__kernel_daddr_t;

typedef char *		__kernel_caddr_t;

typedef unsigned short	__kernel_uid16_t;

typedef unsigned short	__kernel_gid16_t;

typedef unsigned int	__kernel_uid32_t;

typedef unsigned int	__kernel_gid32_t;



typedef unsigned short	__kernel_old_uid_t;

typedef unsigned short	__kernel_old_gid_t;

typedef unsigned short	__kernel_old_dev_t;



#ifdef __GNUC__

typedef long long	__kernel_loff_t;

#endif



typedef struct {

#if defined(__KERNEL__) || defined(__USE_ALL)

	int	val[2];

#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */

	int	__val[2];

#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */

} __kernel_fsid_t;



#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)



#undef	__FD_SET

static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)

{

	unsigned long __tmp = __fd / __NFDBITS;

	unsigned long __rem = __fd % __NFDBITS;

	__fdsetp->fds_bits[__tmp] |= (1UL<<__rem);

}



#undef	__FD_CLR

static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)

{

	unsigned long __tmp = __fd / __NFDBITS;

	unsigned long __rem = __fd % __NFDBITS;

	__fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);

}





#undef	__FD_ISSET

static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)

{

	unsigned long __tmp = __fd / __NFDBITS;

	unsigned long __rem = __fd % __NFDBITS;

	return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;

}



/*

 * This will unroll the loop for the normal constant case (8 ints,

 * for a 256-bit fd_set)

 */

#undef	__FD_ZERO

static __inline__ void __FD_ZERO(__kernel_fd_set *__p)

{

	unsigned long *__tmp = __p->fds_bits;

	int __i;



	if (__builtin_constant_p(__FDSET_LONGS)) {

		switch (__FDSET_LONGS) {

		case 16:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			__tmp[ 4] = 0; __tmp[ 5] = 0;

			__tmp[ 6] = 0; __tmp[ 7] = 0;

			__tmp[ 8] = 0; __tmp[ 9] = 0;

			__tmp[10] = 0; __tmp[11] = 0;

			__tmp[12] = 0; __tmp[13] = 0;

			__tmp[14] = 0; __tmp[15] = 0;

			return;



		case 8:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			__tmp[ 4] = 0; __tmp[ 5] = 0;

			__tmp[ 6] = 0; __tmp[ 7] = 0;

			return;



		case 4:

			__tmp[ 0] = 0; __tmp[ 1] = 0;

			__tmp[ 2] = 0; __tmp[ 3] = 0;

			return;

		}

	}

	__i = __FDSET_LONGS;

	while (__i) {

		__i--;

		*__tmp = 0;

		__tmp++;

	}

}



#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */



#endif /* __ASM_SH64_POSIX_TYPES_H */