Thanks, applied as c7f3d4fff4d12bbaba0a78a81bf145260bb1db38. Michael
[sent from post-receive hook] On Mon, 18 May 2026 09:53:43 +0200, Thorsten Scherer <[email protected]> wrote: > Signed-off-by: Thorsten Scherer <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/calibrator-20070821-1/0001-rename-round-_round-to-avoid-name-conficts.patch > > b/patches/calibrator-20070821-1/0001-rename-round-_round-to-avoid-name-conficts.patch > deleted file mode 100644 > index 25f1d4ca444d..000000000000 > --- > a/patches/calibrator-20070821-1/0001-rename-round-_round-to-avoid-name-conficts.patch > +++ /dev/null > @@ -1,104 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Sun, 13 Feb 2011 20:42:38 +0100 > -Subject: [PATCH] rename round -> _round to avoid name conficts > - > -calibrator.c:131:5: error: conflicting types for 'round' > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - calibrator.c | 30 +++++++++++++++--------------- > - 1 files changed, 15 insertions(+), 15 deletions(-) > - > -diff --git a/calibrator.c b/calibrator.c > -index e045dfd..45f2eb4 100644 > ---- a/calibrator.c > -+++ b/calibrator.c > -@@ -128,7 +128,7 @@ void ErrXit(char *format, ...) { > - exit(1); > - } > - > --lng round(dbl x) > -+lng _round(dbl x) > - { > - return (lng)(x + 0.5); > - } > -@@ -890,16 +890,16 @@ void plotCache(cacheInfo *cache, lng **result, lng > MHz, char *fn, FILE *fp, lng > - fprintf(fp, ")\n"); > - fprintf(fp, "set y2tics"); > - for (l = 0, s = " ("; l <= cache->levels; l++, s = ", ") { > -- if (!delay) fprintf(fp, "%s'(%ld)' %f", s, > round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - > delay)); > -- else fprintf(fp, "%s'(%ld)' %f", s, > round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - > delay)); > -+ if (!delay) fprintf(fp, "%s'(%ld)' %f", s, > _round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - > delay)); > -+ else fprintf(fp, "%s'(%ld)' %f", s, > _round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - > delay)); > - } > - for (y = 1; y <= yh; y *= 10) { > - fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y); > - } > - fprintf(fp, ")\n"); > - for (l = 0; l <= cache->levels; l++) { > -- if (!delay) z = (dbl)round(CYperIt(cache->latency1[l] - > delay)) * 1000.0 / (dbl)MHz; > -- else z = (dbl)round(CYperIt(cache->latency2[l] - > delay)) * 1000.0 / (dbl)MHz; > -+ if (!delay) z = (dbl)_round(CYperIt(cache->latency1[l] - > delay)) * 1000.0 / (dbl)MHz; > -+ else z = (dbl)_round(CYperIt(cache->latency2[l] - > delay)) * 1000.0 / (dbl)MHz; > - fprintf(fp, "set label %ld '(%1.3g) ' at %f,%f right\n", l + > 1, z, xl, z); > - fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", > l + 1, xl, z, xh, z); > - } > -@@ -986,16 +986,16 @@ void plotTLB(TLBinfo *TLB, lng **result, lng MHz, char > *fn, FILE *fp, lng delay) > - fprintf(fp, "%s'<L1>' %ld)\n", s, TLB->mincachelines); > - fprintf(fp, "set y2tics"); > - for (l = 0, s = " ("; l <= TLB->levels; l++, s = ", ") { > -- if (!delay) fprintf(fp, "%s'(%ld)' %f", s, > round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay)); > -- else fprintf(fp, "%s'(%ld)' %f", s, > round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay)); > -+ if (!delay) fprintf(fp, "%s'(%ld)' %f", s, > _round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay)); > -+ else fprintf(fp, "%s'(%ld)' %f", s, > _round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay)); > - } > - for (y = 1; y <= yh; y *= 10) { > - fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y); > - } > - fprintf(fp, ")\n"); > - for (l = 0; l <= TLB->levels; l++) { > -- if (!delay) z = (dbl)round(CYperIt(TLB->latency1[l] - > delay)) * 1000.0 / (dbl)MHz; > -- else z = (dbl)round(CYperIt(TLB->latency2[l] - > delay)) * 1000.0 / (dbl)MHz; > -+ if (!delay) z = (dbl)_round(CYperIt(TLB->latency1[l] - > delay)) * 1000.0 / (dbl)MHz; > -+ else z = (dbl)_round(CYperIt(TLB->latency2[l] - > delay)) * 1000.0 / (dbl)MHz; > - fprintf(fp, "set label %ld '(%1.3g) ' at %f,%f right\n", l + > 1, z, xl, z); > - fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", > l + 1, xl, z, xh, z); > - } > -@@ -1023,9 +1023,9 @@ void printCPU(cacheInfo *cache, lng MHz, lng delay) > - FILE *fp = stdout; > - > - fprintf(fp, "CPU loop + L1 access: "); > -- fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), > round(CYperIt(cache->latency1[0]))); > -+ fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), > _round(CYperIt(cache->latency1[0]))); > - fprintf(fp, " ( delay: "); > -- fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay), > round(CYperIt(delay))); > -+ fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay), > _round(CYperIt(delay))); > - fprintf(fp, "\n"); > - fflush(fp); > - } > -@@ -1047,8 +1047,8 @@ void printCache(cacheInfo *cache, lng MHz) > - fprintf(fp, " %3ld KB ", cache->size[l] / 1024); > - } > - fprintf(fp, " %3ld bytes ", cache->linesize[l + 1]); > -- fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l > + 1] - cache->latency2[l]), round(CYperIt(cache->latency2[l + 1] - > cache->latency2[l]))); > -- fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l > + 1] - cache->latency1[l]), round(CYperIt(cache->latency1[l + 1] - > cache->latency1[l]))); > -+ fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l > + 1] - cache->latency2[l]), _round(CYperIt(cache->latency2[l + 1] - > cache->latency2[l]))); > -+ fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l > + 1] - cache->latency1[l]), _round(CYperIt(cache->latency1[l + 1] - > cache->latency1[l]))); > - } > - fprintf(fp, "\n"); > - fflush(fp); > -@@ -1075,9 +1075,9 @@ void printTLB(TLBinfo *TLB, lng MHz) > - } else { > - fprintf(fp, " %3ld KB ", TLB->pagesize[l + 1] / 1024); > - } > -- fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + > 1] - TLB->latency2[l]), round(CYperIt(TLB->latency2[l + 1] - > TLB->latency2[l]))); > -+ fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + > 1] - TLB->latency2[l]), _round(CYperIt(TLB->latency2[l + 1] - > TLB->latency2[l]))); > - /* > -- fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + > 1] - TLB->latency1[l]), round(CYperIt(TLB->latency1[l + 1] - > TLB->latency1[l]))); > -+ fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + > 1] - TLB->latency1[l]), _round(CYperIt(TLB->latency1[l + 1] - > TLB->latency1[l]))); > - */ > - fprintf(fp, "\n"); > - } > --- > -1.7.2.3 > - > diff --git a/patches/calibrator-20070821-1/series > b/patches/calibrator-20070821-1/series > deleted file mode 100644 > index 246504a4977a..000000000000 > --- a/patches/calibrator-20070821-1/series > +++ /dev/null > @@ -1,3 +0,0 @@ > -# generated by git-ptx-patches > -0001-rename-round-_round-to-avoid-name-conficts.patch > -# 682c31e68ff1d6e2427b342da2b7433e - git-ptx-patches magic > diff --git a/rules/calibrator.in b/rules/calibrator.in > deleted file mode 100644 > index 03f87f5a3967..000000000000 > --- a/rules/calibrator.in > +++ /dev/null > @@ -1,18 +0,0 @@ > -## SECTION=staging > -## old section: > -### SECTION=test_suites > - > -config CALIBRATOR > - tristate > - prompt "calibrator" > - select LIBC_M > - help > - The Calibrator is a Cache-Memory and TLB Calibration Tool > - > - See http://homepages.cwi.nl/~manegold/Calibrator/ for details. > - > - STAGING: remove in PTXdist 2026.03.0 > - Unmaintained in PTXdist, upstream dead and fails to build with > - current toolchains. > - > -# vim: syntax=kconfig > diff --git a/rules/calibrator.make b/rules/calibrator.make > deleted file mode 100644 > index 67b858588882..000000000000 > --- a/rules/calibrator.make > +++ /dev/null > @@ -1,61 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2007 by Michael Olbrich <[email protected]> > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -PACKAGES-$(PTXCONF_CALIBRATOR) += calibrator > - > -# > -# Paths and names > -# > -CALIBRATOR_VERSION := 20070821-1 > -CALIBRATOR_MD5 := b26765e360144e951f4924aed6e6d45c > -CALIBRATOR := calibrator-$(CALIBRATOR_VERSION) > -CALIBRATOR_SUFFIX := tar.bz2 > -CALIBRATOR_URL := > http://www.pengutronix.de/software/ptxdist/temporary-src/$(CALIBRATOR).$(CALIBRATOR_SUFFIX) > -CALIBRATOR_SOURCE := $(SRCDIR)/$(CALIBRATOR).$(CALIBRATOR_SUFFIX) > -CALIBRATOR_DIR := $(BUILDDIR)/$(CALIBRATOR) > -CALIBRATOR_LICENSE := custom > -CALIBRATOR_LICENSE_FILES := > file://calibrator.c;md5=8f7790f3cb58345fcb862c4ceab869ce;startline=6;endline=37 > - > -# > ---------------------------------------------------------------------------- > -# Compile > -# > ---------------------------------------------------------------------------- > - > -CALIBRATOR_MAKE_ENV := $(CROSS_ENV) LDLIBS=-lm > -CALIBRATOR_MAKE_OPT := calibrator > - > -# > ---------------------------------------------------------------------------- > -# Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/calibrator.install: > - @$(call targetinfo) > - @$(call touch) > - > -# > ---------------------------------------------------------------------------- > -# Target-Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/calibrator.targetinstall: > - @$(call targetinfo) > - > - @$(call install_init, calibrator) > - @$(call install_fixup, calibrator,PRIORITY,optional) > - @$(call install_fixup, calibrator,SECTION,base) > - @$(call install_fixup, calibrator,AUTHOR,"Michael Olbrich > <[email protected]>") > - @$(call install_fixup, calibrator,DESCRIPTION,missing) > - > - @$(call install_copy, calibrator, 0, 0, 0755, > $(CALIBRATOR_DIR)/calibrator, /usr/bin/calibrator) > - > - @$(call install_finish, calibrator) > - > - @$(call touch) > - > -# vim: syntax=make
