[Glibc-bsd-commits] r3242 - in trunk/kfreebsd-kernel-headers/debian: . patches
Robert Millan
rmh at alioth.debian.org
Thu Jan 27 15:16:29 UTC 2011
Author: rmh
Date: 2011-01-27 15:16:28 +0000 (Thu, 27 Jan 2011)
New Revision: 3242
Added:
trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/control
trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/debian/rules
Log:
MIPS support.
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2011-01-25 07:30:33 UTC (rev 3241)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2011-01-27 15:16:28 UTC (rev 3242)
@@ -6,8 +6,9 @@
[ Robert Millan ]
* Add <sys/kerneldump.h> for savecore (freebsd-utils).
* Remove <sys/sbuf.h> (now provided by libsbuf-dev).
+ * MIPS support.
- -- Robert Millan <rmh at debian.org> Mon, 10 Jan 2011 16:02:23 +0100
+ -- Robert Millan <rmh at debian.org> Thu, 27 Jan 2011 16:16:03 +0100
kfreebsd-kernel-headers (0.53) unstable; urgency=low
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2011-01-25 07:30:33 UTC (rev 3241)
+++ trunk/kfreebsd-kernel-headers/debian/control 2011-01-27 15:16:28 UTC (rev 3242)
@@ -9,7 +9,7 @@
Standards-Version: 3.9.1
Package: kfreebsd-kernel-headers
-Architecture: kfreebsd-i386 kfreebsd-amd64
+Architecture: kfreebsd-any
Depends: ${misc:Depends}
Replaces: kfreebsd-headers, libc0.1-dev (<= 2.3.6.ds1-8)
Conflicts: kfreebsd-headers
Added: trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff 2011-01-27 15:16:28 UTC (rev 3242)
@@ -0,0 +1,22 @@
+--- a/sys/mips/include/frame.h
++++ b/sys/mips/include/frame.h
+@@ -37,6 +37,8 @@
+ #ifndef _MACHINE_FRAME_H_
+ #define _MACHINE_FRAME_H_
+
++#include <machine/_types.h> /* f_register_t */
++
+ struct trapframe {
+ register_t zero;
+ register_t ast;
+--- a/sys/mips/include/reg.h
++++ b/sys/mips/include/reg.h
+@@ -42,6 +42,8 @@
+ #ifndef _MACHINE_REG_H_
+ #define _MACHINE_REG_H_
+
++#include <machine/_types.h> /* f_register_t */
++
+ /*
+ * Location of the users' stored registers relative to ZERO.
+ * must be visible to assembly code.
Modified: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2011-01-25 07:30:33 UTC (rev 3241)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2011-01-27 15:16:28 UTC (rev 3242)
@@ -106,3 +106,107 @@
typedef __uint64_t __uintfptr_t;
typedef __uint64_t __uintmax_t;
typedef __uint64_t __uintptr_t;
+--- a/sys/mips/include/_types.h
++++ b/sys/mips/include/_types.h
+@@ -40,10 +40,13 @@
+ #ifndef _MACHINE__TYPES_H_
+ #define _MACHINE__TYPES_H_
+
++#include <sys/types.h>
++#include <sys/cdefs.h>
+ #ifndef _SYS_CDEFS_H_
+-#error this file needs sys/cdefs.h as a prerequisite
++#include <sys/param.h>
+ #endif
+
++#ifndef __GLIBC__
+ /*
+ * Basic types upon which most other types are built.
+ */
+@@ -73,11 +76,14 @@
+ typedef unsigned long long __uint64_t;
+ #endif
+ #endif
++#endif
+
+ /*
+ * Standard type definitions.
+ */
++#ifndef __GLIBC__
+ typedef __int32_t __clock_t; /* clock()... */
++#endif
+ typedef unsigned int __cpumask_t;
+ #ifdef __mips64
+ typedef __int64_t __critical_t;
+@@ -88,11 +94,15 @@
+ typedef double __float_t;
+ #ifdef __mips64
+ typedef __int64_t __intfptr_t;
++#ifndef __GLIBC__
+ typedef __int64_t __intptr_t;
++#endif
+ #else
+ typedef __int32_t __intfptr_t;
++#ifndef __GLIBC__
+ typedef __int32_t __intptr_t;
+ #endif
++#endif
+ typedef __int64_t __intmax_t;
+ typedef __int32_t __int_fast8_t;
+ typedef __int32_t __int_fast16_t;
+@@ -103,28 +113,46 @@
+ typedef __int32_t __int_least32_t;
+ typedef __int64_t __int_least64_t;
+ #if defined(__mips64) || defined(ISA_MIPS64)
++#ifndef __GLIBC__
+ typedef __int64_t __register_t;
++#endif
+ typedef __int64_t f_register_t;
+ #else
++#ifndef __GLIBC__
+ typedef __int32_t __register_t;
++#endif
+ typedef __int32_t f_register_t;
+ #endif
+ #ifdef __mips64
++#ifndef __GLIBC__
+ typedef __int64_t __ptrdiff_t;
++#endif
+ typedef __int64_t __segsz_t;
++#ifndef __GLIBC__
+ typedef __uint64_t __size_t;
+ typedef __int64_t __ssize_t;
++#endif
+ typedef __uint64_t __uintfptr_t;
++#ifndef __GLIBC__
+ typedef __uint64_t __uintptr_t;
++#endif
+ #else
++#ifndef __GLIBC__
+ typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
++#endif
+ typedef __int32_t __segsz_t; /* segment size (in pages) */
++#ifndef __GLIBC__
+ typedef __uint32_t __size_t; /* sizeof() */
+ typedef __int32_t __ssize_t; /* byte count or error */
++#endif
+ typedef __uint32_t __uintfptr_t;
++#ifndef __GLIBC__
+ typedef __uint32_t __uintptr_t;
+ #endif
++#endif
++#ifndef __GLIBC__
+ typedef __int64_t __time_t; /* time()... */
++#endif
+ typedef __uint64_t __uintmax_t;
+ typedef __uint32_t __uint_fast8_t;
+ typedef __uint32_t __uint_fast16_t;
+@@ -163,7 +191,7 @@
+ #endif
+
+ typedef struct label_t {
+- __register_t val[13];
++ register_t val[13];
+ } label_t;
+
+ #endif /* !_MACHINE__TYPES_H_ */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2011-01-25 07:30:33 UTC (rev 3241)
+++ trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2011-01-27 15:16:28 UTC (rev 3242)
@@ -672,3 +672,61 @@
#define __MAKE_SET(set, sym) \
static void const * const __set_##set##_sym_##sym \
__section("set_" #set) __used = &sym
+--- a/sys/mips/include/bus.h
++++ b/sys/mips/include/bus.h
+@@ -820,7 +820,7 @@
+ bus_size_t offset __unused, bus_size_t len __unused, int flags)
+ {
+ #if 0
+-#ifdef __GNUCLIKE_ASM
++#ifdef __GNUC__
+ if (flags & BUS_SPACE_BARRIER_READ)
+ __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
+ else
+--- a/sys/mips/include/bus_octeon.h
++++ b/sys/mips/include/bus_octeon.h
+@@ -793,7 +793,7 @@
+ bus_size_t offset __unused, bus_size_t len __unused, int flags)
+ {
+ #if 0
+-#ifdef __GNUCLIKE_ASM
++#ifdef __GNUC__
+ if (flags & BUS_SPACE_BARRIER_READ)
+ __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
+ else
+--- a/sys/mips/include/endian.h
++++ b/sys/mips/include/endian.h
+@@ -68,7 +68,7 @@
+ #endif
+
+ #ifndef __ASSEMBLER__
+-#if defined(__GNUCLIKE_BUILTIN_CONSTANT_P) && defined(__OPTIMIZE__)
++#if defined(__GNUC__) && defined(__OPTIMIZE__)
+ #define __is_constant(x) __builtin_constant_p(x)
+ #else
+ #define __is_constant(x) 0
+--- a/sys/mips/include/_types.h
++++ b/sys/mips/include/_types.h
+@@ -63,7 +63,7 @@
+ typedef long long __int64_t;
+ /* LONGLONG */
+ typedef unsigned long long __uint64_t;
+-#elif defined(__GNUCLIKE_ATTRIBUTE_MODE_DI)
++#elif defined(__GNUC__)
+ typedef int __attribute__((__mode__(__DI__))) __int64_t;
+ typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t;
+ #else
+@@ -151,11 +151,11 @@
+ /*
+ * Unusual type definitions.
+ */
+-#ifdef __GNUCLIKE_BUILTIN_VARARGS
++#ifdef __GNUC__
+ typedef __builtin_va_list __va_list; /* internally known to gcc */
+ #else
+ typedef char * __va_list;
+-#endif /* __GNUCLIKE_BUILTIN_VARARGS */
++#endif /* __GNUC__ */
+ #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \
+ && !defined(__NO_GNUC_VA_LIST)
+ #define __GNUC_VA_LIST
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2011-01-25 07:30:33 UTC (rev 3241)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2011-01-27 15:16:28 UTC (rev 3242)
@@ -10,6 +10,7 @@
010_glibc.diff
011_wine.diff
012_strace.diff
+013_mips.diff
014_misc.diff
015_cam.diff
018_sys__types.diff
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2011-01-25 07:30:33 UTC (rev 3241)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2011-01-27 15:16:28 UTC (rev 3242)
@@ -7,6 +7,12 @@
kfreebsd_cpu := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+ifeq ($(cpu), mipsel)
+kfreebsd_cpu := mips
+else
+kfreebsd_cpu := $(cpu)
+endif
+
HEADERS_PACKAGE := $(CURDIR)/debian/kfreebsd-kernel-headers
SRC_TAR := /usr/src/kfreebsd-source-8.1.tar.xz
SRC_DIR := kfreebsd-source-8.1
More information about the Glibc-bsd-commits
mailing list