From d08707f577b1e2b5fafcfe5100a66a3b0bfef6be Mon Sep 17 00:00:00 2001
From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Sat, 16 Aug 2014 21:00:15 +0000
Subject: [PATCH] * Unbreak build on macos (and on other platforms) that do not
 have HAVE_DLINFO_RTLD_DI_TLS_MODID. * add the copyright notice in
 auxprogs/getoff.c * add more prereq to hgtls.vgtest

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14297
---
 auxprogs/getoff.c            | 26 ++++++++++++++++++++++++++
 gdbserver_tests/hgtls.vgtest |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/auxprogs/getoff.c b/auxprogs/getoff.c
index 36f57517f5..aed5f29d43 100644
--- a/auxprogs/getoff.c
+++ b/auxprogs/getoff.c
@@ -1,3 +1,27 @@
+/*
+   This file is part of Valgrind, a dynamic binary instrumentation
+   framework.
+
+   Copyright (C) 2014-2014 Philippe Waroquiers
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   This program 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
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307, USA.
+
+   The GNU General Public License is contained in the file COPYING.
+*/
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
@@ -9,8 +33,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_DLINFO_RTLD_DI_TLS_MODID
 #include <link.h>
 #include <dlfcn.h>
+#endif
 
 /* true if arg matches the provided option */
 static
diff --git a/gdbserver_tests/hgtls.vgtest b/gdbserver_tests/hgtls.vgtest
index 42bc68d77d..e455013a26 100644
--- a/gdbserver_tests/hgtls.vgtest
+++ b/gdbserver_tests/hgtls.vgtest
@@ -1,7 +1,7 @@
 # test tls addresses
 prog: ../none/tests/tls
 vgopts: --tool=helgrind --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-hgtls -q 
-prereq: test -e ../none/tests/tls
+prereq: test -e ../none/tests/tls && grep '^#define HAVE_TLS 1' ../config.h > /dev/null  && grep '^#define HAVE_DLINFO_RTLD_DI_TLS_MODID 1'  ../config.h > /dev/null
 stdout_filter: filter_make_empty
 stderr_filter: filter_make_empty
 progB: gdb
-- 
2.47.2