r5258 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2012-05-26 17:58:48 +0000 (Sat, 26 May 2012)
New Revision: 5258
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd/local-sysdeps.diff: update to revision 4286 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-05-26 14:10:21 UTC (rev 5257)
+++ glibc-package/trunk/debian/changelog 2012-05-26 17:58:48 UTC (rev 5258)
@@ -28,6 +28,7 @@
linking.
[ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 4286 (from glibc-bsd).
* fixup any/local-linuxthreads-setclock.diff. Closes: #673711.
-- Clint Adams <clint@debian.org> Fri, 04 May 2012 23:39:00 -0400
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2012-05-26 14:10:21 UTC (rev 5257)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2012-05-26 17:58:48 UTC (rev 5258)
@@ -9053,7 +9053,7 @@
+}
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getosreldate.c
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
@@ -9127,12 +9127,16 @@
+ }
+ return (osreldate);
+}
++libc_hidden_def (__kernel_getosreldate)
++libc_hidden_def (__getosreldate)
+weak_alias (__getosreldate, getosreldate)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getosreldate.h
-@@ -0,0 +1,2 @@
+@@ -0,0 +1,4 @@
+int __kernel_getosreldate (void);
+int __getosreldate (void);
++libc_hidden_proto (__kernel_getosreldate)
++libc_hidden_proto (__getosreldate)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getpagesize.c
@@ -0,0 +1,42 @@
@@ -11123,7 +11127,7 @@
+weak_alias(__swapcontext, swapcontext)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sys/io.h
-@@ -0,0 +1,180 @@
+@@ -0,0 +1,184 @@
+/* Copyright (C) 1996, 2000, 2002, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -11145,6 +11149,10 @@
+#ifndef _SYS_IO_H
+#define _SYS_IO_H 1
+
++#ifdef _MACHINE_CPUFUNC_H_
++#error "This header must not be used in combination with <machine/cpufunc.h>."
++#endif
++
+#include <features.h>
+
+__BEGIN_DECLS
@@ -28451,7 +28459,7 @@
+weak_alias(__swapcontext, swapcontext)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/io.h
-@@ -0,0 +1,180 @@
+@@ -0,0 +1,184 @@
+/* Copyright (C) 1996, 2000, 2002, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -28473,6 +28481,10 @@
+#ifndef _SYS_IO_H
+#define _SYS_IO_H 1
+
++#ifdef _MACHINE_CPUFUNC_H_
++#error "This header must not be used in combination with <machine/cpufunc.h>."
++#endif
++
+#include <features.h>
+
+__BEGIN_DECLS
Reply to: