gentoo new year resync : 01.01.2021

1 files changed, 33 insertions, 32 deletions

diff --git a/dev-util/rt-tests/files/rt-tests-1.9-musl.patch b/dev-util/rt-tests/files/rt-tests-1.10-musl.patch
index 0114cd004473..2dc17d504922 100644
--- a/dev-util/rt-tests/files/rt-tests-1.9-musl.patch
+++ b/dev-util/rt-tests/files/rt-tests-1.10-musl.patch
@@ -1,4 +1,4 @@
-From fd78f200ac8e9d1eb7579cd9e4adaaa1a4dc2d46 Mon Sep 17 00:00:00 2001
+From 0b7a1e0d3463aa8aa4b7dcad0ec154e658d68036 Mon Sep 17 00:00:00 2001
 From: Kurt Kanzenbach <kurt@kmk-computers.de>
 Date: Wed, 1 Apr 2020 20:15:24 +0200
 Subject: [PATCH] all: Fix musl build
@@ -16,7 +16,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 ---
  Makefile                              |  5 --
  src/backfire/sendme.c                 |  1 +
- src/cyclictest/cyclictest.c           | 68 ++++-----------------------
+ src/cyclictest/cyclictest.c           | 70 ++++-----------------------
  src/hackbench/hackbench.c             |  4 +-
  src/include/musl.h                    | 28 +++++++++++
  src/lib/rt-utils.c                    |  1 +
@@ -26,11 +26,11 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  src/ptsematest/ptsematest.c           |  1 +
  src/rt-migrate-test/rt-migrate-test.c |  1 +
  src/sched_deadline/cyclicdeadline.c   |  2 +
- 12 files changed, 50 insertions(+), 66 deletions(-)
+ 12 files changed, 51 insertions(+), 67 deletions(-)
  create mode 100644 src/include/musl.h
 
 diff --git a/Makefile b/Makefile
-index c3ebbd7b2a2e..8815c113c0df 100644
+index 636f1914a777..01732ee2647f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -7,7 +7,6 @@ OBJDIR = bld
@@ -41,17 +41,17 @@ index c3ebbd7b2a2e..8815c113c0df 100644
  	  pmqtest.c \
  	  ptsematest.c \
  	  rt-migrate-test.c \
-@@ -36,7 +35,6 @@ LDFLAGS ?=
- PYLIB  ?= $(shell python3 -c 'import distutils.sysconfig;  print (distutils.sysconfig.get_python_lib())')
+@@ -42,7 +41,6 @@ ifeq (${PYLIB},)
+ endif
  
  MANPAGES = src/cyclictest/cyclictest.8 \
 -	   src/pi_tests/pi_stress.8 \
  	   src/ptsematest/ptsematest.8 \
  	   src/rt-migrate-test/rt-migrate-test.8 \
  	   src/sigwaittest/sigwaittest.8 \
-@@ -129,9 +127,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
- signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
+@@ -130,9 +128,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
+ signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a $(OBJDIR)/librttestnuma.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(RTTESTNUMA)
  
 -pi_stress: $(OBJDIR)/pi_stress.o $(OBJDIR)/librttest.a
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
@@ -72,18 +72,18 @@ index d963723b1c93..b355bbbcfece 100644
  #include <utmpx.h>
  #include <sys/types.h>
 diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
-index b41d42f13f24..56b27a4e0547 100644
+index f38c453f1975..b6b91218f756 100644
 --- a/src/cyclictest/cyclictest.c
 +++ b/src/cyclictest/cyclictest.c
-@@ -36,6 +36,7 @@
- #include "rt_numa.h"
+@@ -37,6 +37,7 @@
  
  #include "rt-utils.h"
+ #include "rt-numa.h"
 +#include "musl.h"
  
  #include <bionic.h>
  
-@@ -501,12 +502,8 @@ static void *timerthread(void *param)
+@@ -500,12 +501,8 @@ static void *timerthread(void *param)
  {
  	struct thread_param *par = param;
  	struct sched_param schedp;
@@ -96,7 +96,7 @@ index b41d42f13f24..56b27a4e0547 100644
  	struct thread_stat *stat = par->stats;
  	int stopped = 0;
  	cpu_set_t mask;
-@@ -537,14 +534,6 @@ static void *timerthread(void *param)
+@@ -536,14 +533,6 @@ static void *timerthread(void *param)
  	sigaddset(&sigset, par->signal);
  	sigprocmask(SIG_BLOCK, &sigset, NULL);
  
@@ -111,7 +111,7 @@ index b41d42f13f24..56b27a4e0547 100644
  	memset(&schedp, 0, sizeof(schedp));
  	schedp.sched_priority = par->prio;
  	if (setscheduler(0, par->policy, &schedp))
-@@ -599,20 +588,6 @@ static void *timerthread(void *param)
+@@ -598,20 +587,6 @@ static void *timerthread(void *param)
  		stop = now;
  		stop.tv_sec += duration;
  	}
@@ -132,7 +132,7 @@ index b41d42f13f24..56b27a4e0547 100644
  
  	stat->threadstarted++;
  
-@@ -620,16 +595,10 @@ static void *timerthread(void *param)
+@@ -619,16 +594,10 @@ static void *timerthread(void *param)
  
  		uint64_t diff;
  		unsigned long diff_smi = 0;
@@ -150,7 +150,7 @@ index b41d42f13f24..56b27a4e0547 100644
  		case MODE_CLOCK_NANOSLEEP:
  			if (par->timermode == TIMER_ABSTIME) {
  				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
-@@ -751,11 +720,6 @@ static void *timerthread(void *param)
+@@ -749,11 +718,6 @@ static void *timerthread(void *param)
  
  		next.tv_sec += interval.tv_sec;
  		next.tv_nsec += interval.tv_nsec;
@@ -162,7 +162,7 @@ index b41d42f13f24..56b27a4e0547 100644
  		tsnorm(&next);
  
  		while (tsgreater(&now, &next)) {
-@@ -780,17 +744,6 @@ out:
+@@ -778,17 +742,6 @@ out:
  		pthread_mutex_unlock(&refresh_on_max_lock);
  	}
  
@@ -180,7 +180,7 @@ index b41d42f13f24..56b27a4e0547 100644
  	/* close msr file */
  	if (smi)
  		close(par->msr_fd);
-@@ -1305,7 +1258,8 @@ static void process_options (int argc, char *argv[], int max_cpus)
+@@ -1159,7 +1112,8 @@ static void process_options(int argc, char *argv[], int max_cpus)
  		case OPT_VERBOSE: verbose = 1; break;
  		case 'x':
  		case OPT_POSIX_TIMERS:
@@ -190,7 +190,7 @@ index b41d42f13f24..56b27a4e0547 100644
  		case '?':
  		case OPT_HELP:
  			display_help(0); break;
-@@ -1338,13 +1292,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
+@@ -1192,13 +1146,6 @@ static void process_options(int argc, char *argv[], int max_cpus)
  		}
  	}
  
@@ -203,8 +203,8 @@ index b41d42f13f24..56b27a4e0547 100644
 -
  	/* if smp wasn't requested, test for numa automatically */
  	if (!smp) {
- #ifdef NUMA
-@@ -2038,7 +1985,6 @@ int main(int argc, char **argv)
+ 		if (numa_initialize())
+@@ -1881,7 +1828,6 @@ int main(int argc, char **argv)
  
  	}
  
@@ -212,7 +212,7 @@ index b41d42f13f24..56b27a4e0547 100644
  	mode = use_nanosleep + use_system;
  
  	sigemptyset(&sigset);
-@@ -2088,16 +2034,18 @@ int main(int argc, char **argv)
+@@ -1931,16 +1877,18 @@ int main(int argc, char **argv)
  			void *stack;
  			void *currstk;
  			size_t stksize;
@@ -221,8 +221,9 @@ index b41d42f13f24..56b27a4e0547 100644
  			/* find the memory node associated with the cpu i */
  			node = rt_numa_numa_node_of_cpu(cpu);
  
- 			/* get the stack size set for for this thread */
+-			/* get the stack size set for this thread */
 -			if (pthread_attr_getstack(&attr, &currstk, &stksize))
++			/* get the stack size set for for this thread */
 +			err = pthread_attr_getstack(&attr, &currstk, &stksize);
 +			if (err != EINVAL)
  				fatal("failed to get stack size for thread %d\n", i);
@@ -234,7 +235,7 @@ index b41d42f13f24..56b27a4e0547 100644
  
  			/*  allocate memory for a stack on appropriate node */
 diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
-index 2cddff654df6..46f09fa9e7ba 100644
+index 268c23233004..bbbb29a3a430 100644
 --- a/src/hackbench/hackbench.c
 +++ b/src/hackbench/hackbench.c
 @@ -24,13 +24,15 @@
@@ -289,7 +290,7 @@ index 000000000000..ea5075e768c8
 +
 +#endif /* _MUSL_H_ */
 diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c
-index f786588706cd..c1a55272dfdb 100644
+index 2d68d62cd875..529d427c8084 100644
 --- a/src/lib/rt-utils.c
 +++ b/src/lib/rt-utils.c
 @@ -23,6 +23,7 @@
@@ -327,7 +328,7 @@ index 97a345edd26e..1028d344edff 100644
  #define TIMEOUT 2
  
 diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
-index 5db8d348cdf8..2de6c1417e4a 100644
+index 5f7a24d55db6..555679cf36ef 100644
 --- a/src/pmqtest/pmqtest.c
 +++ b/src/pmqtest/pmqtest.c
 @@ -24,6 +24,7 @@
@@ -339,7 +340,7 @@ index 5db8d348cdf8..2de6c1417e4a 100644
  #include <pthread.h>
  
 diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
-index de8ea2fe1b0c..1568f3b78711 100644
+index 2e392299fdc4..b45d35755865 100644
 --- a/src/ptsematest/ptsematest.c
 +++ b/src/ptsematest/ptsematest.c
 @@ -22,6 +22,7 @@
@@ -351,7 +352,7 @@ index de8ea2fe1b0c..1568f3b78711 100644
  #include <pthread.h>
  
 diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c
-index 4863238edeb4..9f1aba159dc7 100644
+index 9bf716c9178c..f51d388d9150 100644
 --- a/src/rt-migrate-test/rt-migrate-test.c
 +++ b/src/rt-migrate-test/rt-migrate-test.c
 @@ -25,6 +25,7 @@
@@ -363,12 +364,12 @@ index 4863238edeb4..9f1aba159dc7 100644
  int nr_tasks;
  int lfd;
 diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
-index a08e28e73c42..675a0ea1a162 100644
+index 98eb367248ac..45b27f72a5a7 100644
 --- a/src/sched_deadline/cyclicdeadline.c
 +++ b/src/sched_deadline/cyclicdeadline.c
-@@ -32,6 +32,8 @@
- #include <rt-utils.h>
+@@ -34,6 +34,8 @@
  #include <rt-sched.h>
+ #include <error.h>
  
 +#include "musl.h"
 +