new patch fixing a harmless build warning by dpkg-shlibdepsNotice: this object is not reachable from any branch.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Notice: this object is not reachable from any branch.

2 files changed, 114 insertions, 0 deletions

diff --git a/debian/patches/debian_has_recent_glibc b/debian/patches/debian_has_recent_glibc
new file mode 100644
index 0000000..bc86ff2
--- /dev/null
+++ b/debian/patches/debian_has_recent_glibc
@@ -0,0 +1,113 @@
+From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Subject: remove cruft needed to build on glibc < 2.6
+
+All Debian platforms (but m68k which doesn't matter much) use a glibc >= 2.6.
+
+This fixes a (harmless) build warning
+
+	dpkg-shlibdeps: warning: dependency on libdl.so.2 could be avoided if "debian/rt-tests/usr/bin/svsematest debian/rt-tests/usr/bin/pmqtest debian/rt-tests/usr/bin/sendme debian/rt-tests/usr/bin/sigwaittest debian/rt-tests/usr/bin/ptsematest" were not uselessly linked against it (they use none of its symbols).
+
+Forwarded: not-needed
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+---
+ Makefile                 |   11 +++++------
+ src/include/rt-get_cpu.h |   19 +------------------
+ src/lib/rt-get_cpu.c     |   27 ---------------------------
+ 3 files changed, 6 insertions(+), 51 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,6 @@
+ TARGETS = $(sources:.c=)
+ 
+ LIBS 	= -lrt -lpthread
+-EXTRA_LIBS ?= -ldl	# for get_cpu
+ DESTDIR	?=
+ prefix  ?= /usr/local
+ bindir  ?= $(prefix)/bin
+@@ -69,19 +68,19 @@
+ rt-migrate-test: rt-migrate-test.o
+ 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+ 
+-ptsematest: ptsematest.o rt-utils.o rt-get_cpu.o
++ptsematest: ptsematest.o rt-utils.o
+ 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
+ 
+-sigwaittest: sigwaittest.o rt-utils.o rt-get_cpu.o
++sigwaittest: sigwaittest.o rt-utils.o
+ 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
+ 
+-svsematest: svsematest.o rt-utils.o rt-get_cpu.o
++svsematest: svsematest.o rt-utils.o
+ 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
+ 
+-pmqtest: pmqtest.o rt-utils.o rt-get_cpu.o
++pmqtest: pmqtest.o rt-utils.o
+ 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
+ 
+-sendme: sendme.o rt-utils.o rt-get_cpu.o
++sendme: sendme.o rt-utils.o
+ 	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
+ 
+ pip_stress: pip_stress.o error.o rt-utils.o
+--- a/src/include/rt-get_cpu.h
++++ b/src/include/rt-get_cpu.h
+@@ -19,27 +19,10 @@
+         s = syscall(__NR_getcpu, &c, NULL, NULL);
+         return (s == -1) ? s : c;
+ }
+-#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)	\
+-	&& __GLIBC__>=2 && __GLIBC_MINOR__>=6
++#else
+ #include <utmpx.h>
+ static inline int get_cpu_setup(void) { return 0; }
+ static inline int get_cpu(void) { return sched_getcpu(); }
+-#else
+-extern int get_cpu_setup(void);
+-extern int (*get_cpu)(void);
+-extern int (*get_cpu_vdsop)(unsigned int *, unsigned int *, void *);
+-
+-static inline int getcpu_vdso(void)
+-{
+-	unsigned int c,s;
+-	/* Show the source of get_cpu */
+-#ifdef DEBUG
+-	fprintf(stderr, "getcpu_vdso\n");
+-#endif
+-	s = get_cpu_vdsop(&c, NULL, NULL);
+-        return (s == -1) ? s : c;
+-}
+-
+ #endif
+ 
+ #endif	/* __RT_GET_CPU_H */
+--- a/src/lib/rt-get_cpu.c
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/*
+- * Copyright (C) 2009 John Kacur <jkacur@redhat.com>
+- */
+-#include "rt-get_cpu.h"
+-#ifdef __NR_getcpu
+-#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)	\
+-	&& __GLIBC__>=2 && __GLIBC_MINOR__>=6
+-#else
+-int (*get_cpu)(void);
+-int (*get_cpu_vdsop)(unsigned int *, unsigned int *, void *);
+-
+-int get_cpu_setup(void)
+-{
+-	void *handle = dlopen("linux-vdso.so.1", RTLD_LAZY);
+-	get_cpu_vdsop = NULL;
+-	if (handle) {
+-		get_cpu_vdsop = dlsym(handle, "getcpu");
+-		dlclose(handle);
+-		if (get_cpu_vdsop) {
+-			get_cpu = getcpu_vdso;
+-			return 0;
+-		}
+-	}
+-	return -1;
+-}
+-
+-#endif
diff --git a/debian/patches/series b/debian/patches/series
index b9d66d7..4233cb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ install_hwlatdetect_into_sbindir
 debian_adapt_errormsg_on_failure_to_open_device
 kernvar_fix_possible_buffer_overflow
 manpage_pip_stress.patch
+debian_has_recent_glibc