[hurd,commited 0/2] hurd: build fixes

[hurd,commited 0/2] hurd: build fixes

[Samuel Thibault]

Samuel Thibault (2):
  hurd: disable hp timing
  hurd: Add tlsdesc.sym

 ChangeLog                          |  2 ++
 sysdeps/mach/hurd/hp-timing.h      | 38 ++++++++++++++++++++++++++++++++++++++
 sysdeps/mach/hurd/i386/tlsdesc.sym | 19 +++++++++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 sysdeps/mach/hurd/hp-timing.h
 create mode 100644 sysdeps/mach/hurd/i386/tlsdesc.sym

-- 
2.15.1

[hurd,commited 1/2] hurd: disable hp timing

[Samuel Thibault]

We don't have support for hp timing for now, even the i686 variant, which needs
to know the CPU speed.
Copied from sysdeps/generic/hp-timing.h

	* sysdeps/mach/hurd/hp-timing.h: New file.
---
 ChangeLog                     |  1 +
 sysdeps/mach/hurd/hp-timing.h | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 sysdeps/mach/hurd/hp-timing.h

diff --git a/ChangeLog b/ChangeLog
index 64b3943546..a49103451c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
 	[!defined NDEBUG] (__assert_fail): Define to __malloc_assert.
 	* bits/fcntl.h: Fix comment for FREAD and FWRITE.
 	* sysdeps/mach/hurd/bits/fcntl.h: Likewise.
+	* sysdeps/mach/hurd/hp-timing.h: New file.
 
 2018-01-29  Darius Rad  <darius@bluespec.com>
 
diff --git a/sysdeps/mach/hurd/hp-timing.h b/sysdeps/mach/hurd/hp-timing.h
new file mode 100644
index 0000000000..d1845e17b2
--- /dev/null
+++ b/sysdeps/mach/hurd/hp-timing.h
@@ -0,0 +1,38 @@
+/* High precision, low overhead timing functions.  Generic version.
+   Copyright (C) 1998-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _HP_TIMING_H
+#define _HP_TIMING_H	1
+
+/* We don't have support for high precision timing for now. */
+
+/* Provide dummy definitions.  */
+#define HP_TIMING_AVAIL		(0)
+#define HP_SMALL_TIMING_AVAIL	(0)
+#define HP_TIMING_INLINE	(0)
+typedef int hp_timing_t;
+#define HP_TIMING_NOW(var)
+#define HP_TIMING_DIFF(Diff, Start, End)
+#define HP_TIMING_ACCUM_NT(Sum, Diff)
+#define HP_TIMING_PRINT(Buf, Len, Val)
+
+/* Since this implementation is not available we tell the user about it.  */
+#define HP_TIMING_NONAVAIL	1
+
+#endif	/* hp-timing.h */
-- 
2.15.1

[hurd,commited 2/2] hurd: Add tlsdesc.sym

[Samuel Thibault]

	* sysdeps/mach/hurd/i386/tlsdesc.sym: New file.
---
 ChangeLog                          |  1 +
 sysdeps/mach/hurd/i386/tlsdesc.sym | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 sysdeps/mach/hurd/i386/tlsdesc.sym

diff --git a/ChangeLog b/ChangeLog
index a49103451c..80ad4c6b10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
 	* bits/fcntl.h: Fix comment for FREAD and FWRITE.
 	* sysdeps/mach/hurd/bits/fcntl.h: Likewise.
 	* sysdeps/mach/hurd/hp-timing.h: New file.
+	* sysdeps/mach/hurd/i386/tlsdesc.sym: New file.
 
 2018-01-29  Darius Rad  <darius@bluespec.com>
 
diff --git a/sysdeps/mach/hurd/i386/tlsdesc.sym b/sysdeps/mach/hurd/i386/tlsdesc.sym
new file mode 100644
index 0000000000..a358f7e325
--- /dev/null
+++ b/sysdeps/mach/hurd/i386/tlsdesc.sym
@@ -0,0 +1,19 @@
+#include <stddef.h>
+#include <sysdep.h>
+#include <tls.h>
+#include <link.h>
+#include <dl-tlsdesc.h>
+
+--
+
+-- We have to override sysdeps/i386/tlsdesc.sym to adapt to our libpthread.
+
+-- Abuse tls.h macros to derive offsets relative to the thread register.
+
+DTV_OFFSET			offsetof(tcbhead_t, dtv)
+
+TLSDESC_ARG			offsetof(struct tlsdesc, arg)
+
+TLSDESC_GEN_COUNT		offsetof(struct tlsdesc_dynamic_arg, gen_count)
+TLSDESC_MODID			offsetof(struct tlsdesc_dynamic_arg, tlsinfo.ti_module)
+TLSDESC_MODOFF			offsetof(struct tlsdesc_dynamic_arg, tlsinfo.ti_offset)
-- 
2.15.1

Re: [hurd,commited 1/2] hurd: disable hp timing

[Joseph Myers]

On Tue, 30 Jan 2018, Samuel Thibault wrote:

> We don't have support for hp timing for now, even the i686 variant, which needs
> to know the CPU speed.
> Copied from sysdeps/generic/hp-timing.h

I'd think that #include <sysdeps/generic/hp-timing.h>, possibly with a 
comment, would be better than copying it.

-- 
Joseph S. Myers
joseph@codesourcery.com