The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4a7d6666c5ddd135b2023b4b3b4962770ff2e73b
commit 4a7d6666c5ddd135b2023b4b3b4962770ff2e73b
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2025-01-17 14:51:00 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2025-02-03 14:45:40 +0000
contrib: Remove now-unused cortex-strings
Replaced by arm-optimized-routines in commit 2e8ff4d1d5b9 ("Switch to
Arm Optimized Routines for mem* & str*").
Reviewed by: andrew
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D48500
---
contrib/cortex-strings/.gitignore | 11 -
contrib/cortex-strings/Makefile.am | 327 ---------
contrib/cortex-strings/README | 111 ---
contrib/cortex-strings/autogen.sh | 69 --
contrib/cortex-strings/benchmarks/dhry/dhry.h | 311 ---------
contrib/cortex-strings/benchmarks/dhry/dhry_1.c | 778 ----------------------
contrib/cortex-strings/benchmarks/dhry/dhry_2.c | 186 ------
contrib/cortex-strings/benchmarks/multi/harness.c | 407 -----------
contrib/cortex-strings/configure.ac | 88 ---
contrib/cortex-strings/scripts/add-license.sh | 79 ---
contrib/cortex-strings/scripts/bench.py | 175 -----
contrib/cortex-strings/scripts/fixup.py | 27 -
contrib/cortex-strings/scripts/libplot.py | 78 ---
contrib/cortex-strings/scripts/plot-align.py | 67 --
contrib/cortex-strings/scripts/plot-sizes.py | 120 ----
contrib/cortex-strings/scripts/plot-top.py | 61 --
contrib/cortex-strings/scripts/plot.py | 123 ----
contrib/cortex-strings/scripts/trim.sh | 9 -
contrib/cortex-strings/src/aarch64/memchr.S | 172 -----
contrib/cortex-strings/src/aarch64/memcmp.S | 162 -----
contrib/cortex-strings/src/aarch64/memcpy.S | 225 -------
contrib/cortex-strings/src/aarch64/memmove.S | 150 -----
contrib/cortex-strings/src/aarch64/memset.S | 235 -------
contrib/cortex-strings/src/aarch64/strchr.S | 165 -----
contrib/cortex-strings/src/aarch64/strchrnul.S | 144 ----
contrib/cortex-strings/src/aarch64/strcmp.S | 166 -----
contrib/cortex-strings/src/aarch64/strcpy.S | 336 ----------
contrib/cortex-strings/src/aarch64/strlen.S | 233 -------
contrib/cortex-strings/src/aarch64/strncmp.S | 222 ------
contrib/cortex-strings/src/aarch64/strnlen.S | 181 -----
contrib/cortex-strings/src/arm/memchr.S | 155 -----
contrib/cortex-strings/src/arm/memcpy.S | 617 -----------------
contrib/cortex-strings/src/arm/memset.S | 122 ----
contrib/cortex-strings/src/arm/strchr.S | 80 ---
contrib/cortex-strings/src/arm/strcmp.S | 500 --------------
contrib/cortex-strings/src/thumb-2/strcpy.c | 173 -----
contrib/cortex-strings/src/thumb-2/strlen.S | 150 -----
contrib/cortex-strings/src/thumb/aeabi_idiv.S | 318 ---------
contrib/cortex-strings/src/thumb/strcmp-armv6m.S | 143 ----
39 files changed, 7676 deletions(-)
diff --git a/contrib/cortex-strings/.gitignore
b/contrib/cortex-strings/.gitignore
deleted file mode 100644
index 558ca155c736..000000000000
--- a/contrib/cortex-strings/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*.a
-*.o
-*.la
-*.lo
-*.png
-*.pyc
-.deps
-.dirstamp
-.libs
-try-*
-cache.txt
diff --git a/contrib/cortex-strings/Makefile.am
b/contrib/cortex-strings/Makefile.am
deleted file mode 100644
index db6bb93254a4..000000000000
--- a/contrib/cortex-strings/Makefile.am
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright (c) 2011, Linaro Limited
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# * Neither the name of the Linaro nor the
-# names of its contributors may be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-# Top level Makefile for cortex-strings
-
-# Used to record the compiler version in the executables
-COMPILER = $(shell $(CC) --version 2>&1 | head -n1)
-
-# The main library
-lib_LTLIBRARIES = \
- libcortex-strings.la
-
-## Test suite
-check_PROGRAMS = \
- tests/test-memchr \
- tests/test-memcmp \
- tests/test-memcpy \
- tests/test-memmove \
- tests/test-memset \
- tests/test-strchr \
- tests/test-strcmp \
- tests/test-strcpy \
- tests/test-strlen \
- tests/test-strncmp \
- tests/test-strnlen
-
-# Options for the tests
-tests_cflags = -I$(srcdir)/tests $(AM_CFLAGS)
-tests_ldadd = libcortex-strings.la
-tests_test_memchr_LDADD = $(tests_ldadd)
-tests_test_memchr_CFLAGS = $(tests_cflags)
-tests_test_memcmp_LDADD = $(tests_ldadd)
-tests_test_memcmp_CFLAGS = $(tests_cflags)
-tests_test_memcpy_LDADD = $(tests_ldadd)
-tests_test_memcpy_CFLAGS = $(tests_cflags)
-tests_test_memmove_LDADD = $(tests_ldadd)
-tests_test_memmove_CFLAGS = $(tests_cflags)
-tests_test_memset_LDADD = $(tests_ldadd)
-tests_test_memset_CFLAGS = $(tests_cflags)
-tests_test_strchr_LDADD = $(tests_ldadd)
-tests_test_strchr_CFLAGS = $(tests_cflags)
-tests_test_strcmp_LDADD = $(tests_ldadd)
-tests_test_strcmp_CFLAGS = $(tests_cflags)
-tests_test_strcpy_LDADD = $(tests_ldadd)
-tests_test_strcpy_CFLAGS = $(tests_cflags)
-tests_test_strlen_LDADD = $(tests_ldadd)
-tests_test_strlen_CFLAGS = $(tests_cflags)
-tests_test_strncmp_LDADD = $(tests_ldadd)
-tests_test_strncmp_CFLAGS = $(tests_cflags)
-
-TESTS = $(check_PROGRAMS)
-
-## Benchmarks
-noinst_PROGRAMS = \
- dhry \
- dhry-native \
- try-none \
- try-this \
- try-plain \
- try-newlib-c \
- try-bionic-c \
- try-glibc-c
-
-# Good 'ol Dhrystone
-dhry_SOURCES = \
- benchmarks/dhry/dhry_1.c \
- benchmarks/dhry/dhry_2.c \
- benchmarks/dhry/dhry.h
-
-dhry_CFLAGS = -Dcompiler="\"$(COMPILER)\"" -Doptions="\"$(CFLAGS)\""
-dhry_LDADD = libcortex-strings.la
-
-dhry_native_SOURCES = $(dhry_SOURCES)
-dhry_native_CFLAGS = $(dhry_CFLAGS)
-
-# Benchmark harness
-noinst_LIBRARIES = \
- libmulti.a \
- libbionic-c.a \
- libglibc-c.a \
- libnewlib-c.a \
- libplain.a
-
-libmulti_a_SOURCES = \
- benchmarks/multi/harness.c
-
-libmulti_a_CFLAGS = -DVERSION=\"$(VERSION)\" $(AM_CFLAGS)
-
-## Other architecture independant implementaions
-libbionic_c_a_SOURCES = \
- reference/bionic-c/bcopy.c \
- reference/bionic-c/memchr.c \
- reference/bionic-c/memcmp.c \
- reference/bionic-c/memcpy.c \
- reference/bionic-c/memset.c \
- reference/bionic-c/strchr.c \
- reference/bionic-c/strcmp.c \
- reference/bionic-c/strcpy.c \
- reference/bionic-c/strlen.c
-
-libglibc_c_a_SOURCES = \
- reference/glibc-c/memchr.c \
- reference/glibc-c/memcmp.c \
- reference/glibc-c/memcpy.c \
- reference/glibc-c/memset.c \
- reference/glibc-c/strchr.c \
- reference/glibc-c/strcmp.c \
- reference/glibc-c/strcpy.c \
- reference/glibc-c/strlen.c \
- reference/glibc-c/wordcopy.c \
- reference/glibc-c/memcopy.h \
- reference/glibc-c/pagecopy.h
-
-libnewlib_c_a_SOURCES = \
- reference/newlib-c/memchr.c \
- reference/newlib-c/memcmp.c \
- reference/newlib-c/memcpy.c \
- reference/newlib-c/memset.c \
- reference/newlib-c/strchr.c \
- reference/newlib-c/strcmp.c \
- reference/newlib-c/strcpy.c \
- reference/newlib-c/strlen.c \
- reference/newlib-c/shim.h
-
-libplain_a_SOURCES = \
- reference/plain/memset.c \
- reference/plain/memcpy.c \
- reference/plain/strcmp.c \
- reference/plain/strcpy.c
-
-try_none_SOURCES =
-try_none_LDADD = libmulti.a -lrt
-try_this_SOURCES =
-try_this_LDADD = libmulti.a libcortex-strings.la -lrt
-try_bionic_c_SOURCES =
-try_bionic_c_LDADD = libmulti.a libbionic-c.a -lrt
-try_glibc_c_SOURCES =
-try_glibc_c_LDADD = libmulti.a libglibc-c.a -lrt
-try_newlib_c_SOURCES =
-try_newlib_c_LDADD = libmulti.a libnewlib-c.a -lrt
-try_plain_SOURCES =
-try_plain_LDADD = libmulti.a libplain.a -lrt
-
-# Architecture specific
-
-if HOST_AARCH32
-
-if WITH_NEON
-# Pull in the NEON specific files
-neon_bionic_a9_sources = \
- reference/bionic-a9/memcpy.S \
- reference/bionic-a9/memset.S
-neon_bionic_a15_sources = \
- reference/bionic-a15/memcpy.S \
- reference/bionic-a15/memset.S
-fpu_flags = -mfpu=neon
-else
-if WITH_VFP
-fpu_flags = -mfpu=vfp
-else
-fpu_flags = -msoft-float
-endif
-endif
-
-# Benchmarks and example programs
-noinst_PROGRAMS += \
- try-bionic-a9 \
- try-bionic-a15 \
- try-csl \
- try-glibc \
- try-newlib \
- try-newlib-xscale
-
-# Libraries used in the benchmarks and examples
-noinst_LIBRARIES += \
- libbionic-a9.a \
- libbionic-a15.a \
- libcsl.a \
- libglibc.a \
- libnewlib.a \
- libnewlib-xscale.a
-
-# Main library
-libcortex_strings_la_SOURCES = \
- src/thumb-2/strcpy.c \
- src/arm/memchr.S \
- src/arm/strchr.S \
- src/thumb-2/strlen.S \
- src/arm/memset.S \
- src/arm/memcpy.S \
- src/arm/strcmp.S
-
-# Libraries containing the difference reference versions
-libbionic_a9_a_SOURCES = \
- $(neon_bionic_a9_sources) \
- reference/bionic-a9/memcmp.S \
- reference/bionic-a9/strcmp.S \
- reference/bionic-a9/strcpy.S \
- reference/bionic-a9/strlen.c
-
-libbionic_a9_a_CFLAGS = -Wa,-mimplicit-it=thumb
-
-libbionic_a15_a_SOURCES = \
- $(neon_bionic_a15_sources) \
- reference/bionic-a15/memcmp.S \
- reference/bionic-a15/strcmp.S \
- reference/bionic-a15/strcpy.S \
- reference/bionic-a15/strlen.c
-
-libbionic_a15_a_CFLAGS = -Wa,-mimplicit-it=thumb
-
-libcsl_a_SOURCES = \
- reference/csl/memcpy.c \
- reference/csl/memset.c \
- reference/csl/arm_asm.h
-
-libglibc_a_SOURCES = \
- reference/glibc/memcpy.S \
- reference/glibc/memset.S \
- reference/glibc/strchr.S \
- reference/glibc/strlen.S
-
-libnewlib_a_SOURCES = \
- reference/newlib/memcpy.S \
- reference/newlib/strcmp.S \
- reference/newlib/strcpy.c \
- reference/newlib/strlen.c \
- reference/newlib/arm_asm.h \
- reference/newlib/shim.h
-
-libnewlib_xscale_a_SOURCES = \
- reference/newlib-xscale/memchr.c \
- reference/newlib-xscale/memcpy.c \
- reference/newlib-xscale/memset.c \
- reference/newlib-xscale/strchr.c \
- reference/newlib-xscale/strcmp.c \
- reference/newlib-xscale/strcpy.c \
- reference/newlib-xscale/strlen.c \
- reference/newlib-xscale/xscale.h
-
-# Flags for the benchmark helpers
-try_bionic_a9_SOURCES =
-try_bionic_a9_LDADD = libmulti.a libbionic-a9.a -lrt
-try_bionic_a15_SOURCES =
-try_bionic_a15_LDADD = libmulti.a libbionic-a15.a -lrt
-try_csl_SOURCES =
-try_csl_LDADD = libmulti.a libcsl.a -lrt
-try_glibc_SOURCES =
-try_glibc_LDADD = libmulti.a libglibc.a -lrt
-try_newlib_SOURCES =
-try_newlib_LDADD = libmulti.a libnewlib.a -lrt
-try_newlib_xscale_SOURCES =
-try_newlib_xscale_LDADD = libmulti.a libnewlib-xscale.a -lrt
-
-AM_CPPFLAGS = $(fpu_flags)
-AM_LDFLAGS = $(fpu_flags)
-
-endif
-
-# aarch64 specific
-if HOST_AARCH64
-
-libcortex_strings_la_SOURCES = \
- src/aarch64/memchr.S \
- src/aarch64/memcmp.S \
- src/aarch64/memcpy.S \
- src/aarch64/memmove.S \
- src/aarch64/memset.S \
- src/aarch64/strchr.S \
- src/aarch64/strchrnul.S \
- src/aarch64/strcmp.S \
- src/aarch64/strcpy.S \
- src/aarch64/strlen.S \
- src/aarch64/strncmp.S \
- src/aarch64/strnlen.S
-
-endif
-
-libcortex_strings_la_LDFLAGS = -version-info 1:0:0
-
-AM_CFLAGS = \
- -std=gnu99 -Wall \
- -fno-builtin -fno-stack-protector -U_FORTIFY_SOURCE \
- $(AM_CPPFLAGS)
-
-if WITH_SUBMACHINE
-AM_CFLAGS += \
- -mtune=$(submachine)
-endif
-
-EXTRA_DIST = \
- tests/hp-timing.h \
- tests/test-string.h \
- tests/test-skeleton.c \
- scripts/add-license.sh \
- scripts/bench.py \
- scripts/fixup.py \
- scripts/libplot.py \
- scripts/plot-align.py \
- scripts/plot.py \
- scripts/plot-sizes.py \
- scripts/plot-top.py \
- scripts/trim.sh \
- autogen.sh
diff --git a/contrib/cortex-strings/README b/contrib/cortex-strings/README
deleted file mode 100644
index 5e9e9d3f1d6f..000000000000
--- a/contrib/cortex-strings/README
+++ /dev/null
@@ -1,111 +0,0 @@
-= Cortex-A String Routines =
-
-This package contains optimised string routines including memcpy(), memset(),
-strcpy(), strlen() for the ARM Cortex-A series of cores.
-
-Various implementations of these routines are provided, including generic
-implementations for ARMv7-A cores with/without Neon, Thumb2 implementations
-and generic implementations for cores supporting AArch64.
-
-== Getting started ==
-First configure and then install libcortex-strings.so. To make other
-applications use this library, either add -lcortex-strings to the link
-command or use LD_PRELOAD to load the library into existing applications.
-
-Our intent is to get these routines into the common C libraries such
-as GLIBC, Bionic, and Newlib. Your system may already include them!
-
-== Contents ==
- * src/ contains the routines themselves
- * tests/ contains the unit tests
- * reference/ contains reference copies of other ARM-focused
- implementations gathered from around the Internet
- * benchmarks/ contains various benchmarks, tools, and scripts used to
- check and report on the different implementations.
-
-The src directory contains different variants organised by the
-implementation they run on and optional features used. For example:
- * src/thumb-2 contains generic non-NEON routines for AArch32 (with Thumb-2).
- * src/arm contains tuned routines for Cortex-A class processors.
- * src/aarch64 contains generic routines for AArch64.
- * src/thumb contains generic routines for armv6-M (with Thumb).
-
-== Reference versions ==
-reference/ contains versions collected from various popular Open
-Source libraries. These have been modified for use in benchmarking.
-Please refer to the individual files for any licensing terms.
-
-The routines were collected from the following releases:
- * EGLIBC 2.13
- * Newlib 1.19.0
- * Bionic android-2.3.5_r1
-
-== Licensing ==
-All Linaro-authored routines are under the modified BSD license:
-
-Copyright (c) 2011, Linaro Limited
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the Linaro nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-All ARM-authored routines are under the modified BSD license:
-
-Copyright (c) 2014 ARM Ltd
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the Linaro nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-All third party routines are under a GPL compatible license.
-
-== Notes and Limitations ==
-Some of the implementations have been collected from other
-projects and have a variety of licenses and copyright holders.
-
-== Style ==
-Assembly code attempts to follow the GLIBC coding convetions. They
-are:
- * Copyright headers in C style comment blocks
- * Instructions indented with one tab
- * Operands indented with one tab
- * Text is wrapped at 70 characters
- * End of line comments are fine
diff --git a/contrib/cortex-strings/autogen.sh
b/contrib/cortex-strings/autogen.sh
deleted file mode 100755
index 8e0591cc315a..000000000000
--- a/contrib/cortex-strings/autogen.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-#
-# autogen.sh glue for hplip
-#
-# HPLIP used to have five or so different autotools trees. Upstream
-# has reduced it to two. Still, this script is capable of cleaning
-# just about any possible mess of autoconf files.
-#
-# BE CAREFUL with trees that are not completely automake-generated,
-# this script deletes all Makefile.in files it can find.
-#
-# Requires: automake 1.9, autoconf 2.57+
-# Conflicts: autoconf 2.13
-set -e
-
-# Refresh GNU autotools toolchain.
-echo Cleaning autotools files...
-find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
-find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
- -o -name depcomp -o -name ltmain.sh -o -name configure \
- -o -name config.sub -o -name config.guess \
- -o -name Makefile.in \) -print0 | xargs -0 rm -f
-
-echo Running autoreconf...
-autoreconf --force --install
-
-# For the Debian package build
-test -d debian && {
- # link these in Debian builds
- rm -f config.sub config.guess
- ln -s /usr/share/misc/config.sub .
- ln -s /usr/share/misc/config.guess .
-
- # refresh list of executable scripts, to avoid possible breakage if
- # upstream tarball does not include the file or if it is mispackaged
- # for whatever reason.
- [ "$1" = "updateexec" ] && {
- echo Generating list of executable files...
- rm -f debian/executable.files
- find -type f -perm +111 ! -name '.*' -fprint
debian/executable.files
- }
-
- # Remove any files in upstream tarball that we don't have in the Debian
- # package (because diff cannot remove files)
- version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e
's/-[^-]\+$//'`
- source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '`
- if test -r ../${source}_${version}.orig.tar.gz ; then
- echo Generating list of files that should be removed...
- rm -f debian/deletable.files
- touch debian/deletable.files
- [ -e debian/tmp ] && rm -rf debian/tmp
- mkdir debian/tmp
- ( cd debian/tmp ; tar -zxf
../../../${source}_${version}.orig.tar.gz )
- find debian/tmp/ -type f ! -name '.*' -print0 | xargs -0 -ri
echo '{}' | \
- while read -r i ; do
- if test -e "${i}" ; then
- filename=$(echo "${i}" | sed -e
's#.*debian/tmp/[^/]\+/##')
- test -e "${filename}" || echo "${filename}"
>>debian/deletable.files
- fi
- done
- rm -fr debian/tmp
- else
- echo Emptying list of files that should be deleted...
- rm -f debian/deletable.files
- touch debian/deletable.files
- fi
-}
-
-exit 0
diff --git a/contrib/cortex-strings/benchmarks/dhry/dhry.h
b/contrib/cortex-strings/benchmarks/dhry/dhry.h
deleted file mode 100644
index 3010aecdd31f..000000000000
--- a/contrib/cortex-strings/benchmarks/dhry/dhry.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- **************************************************************************
- * DHRYSTONE 2.1 BENCHMARK PC VERSION
- **************************************************************************
- *
- * "DHRYSTONE" Benchmark Program
- * -----------------------------
- *
- * Version: C, Version 2.1
- *
- * File: dhry.h (part 1 of 3)
- *
- * Date: May 25, 1988
- *
- * Author: Reinhold P. Weicker
- * Siemens AG, AUT E 51
- * Postfach 3220
- * 8520 Erlangen
- * Germany (West)
- * Phone: [+49]-9131-7-20330
- * (8-17 Central European Time)
- * Usenet: ..!mcsun!unido!estevax!weicker
- *
- * Original Version (in Ada) published in
- * "Communications of the ACM" vol. 27., no. 10 (Oct. 1984),
- * pp. 1013 - 1030, together with the statistics
- * on which the distribution of statements etc. is based.
- *
- * In this C version, the following C library functions are used:
- * - strcpy, strcmp (inside the measurement loop)
- * - printf, scanf (outside the measurement loop)
- * In addition, Berkeley UNIX system calls "times ()" or "time ()"
- * are used for execution time measurement. For measurements
- * on other systems, these calls have to be changed.
- *
- * Collection of Results:
- * Reinhold Weicker (address see above) and
- *
- * Rick Richardson
- * PC Research. Inc.
- * 94 Apple Orchard Drive
- * Tinton Falls, NJ 07724
- * Phone: (201) 389-8963 (9-17 EST)
- * Usenet: ...!uunet!pcrat!rick
- *
- * Please send results to Rick Richardson and/or Reinhold Weicker.
- * Complete information should be given on hardware and software used.
- * Hardware information includes: Machine type, CPU, type and size
- * of caches; for microprocessors: clock frequency, memory speed
- * (number of wait states).
- * Software information includes: Compiler (and runtime library)
- * manufacturer and version, compilation switches, OS version.
- * The Operating System version may give an indication about the
- * compiler; Dhrystone itself performs no OS calls in the measurement
- * loop.
- *
- * The complete output generated by the program should be mailed
- * such that at least some checks for correctness can be made.
- *
- **************************************************************************
- *
- * This version has changes made by Roy Longbottom to conform to a common
- * format for a series of standard benchmarks for PCs:
- *
- * Running time greater than 5 seconds due to inaccuracy of the PC clock.
- *
- * Automatic adjustment of run time, no manually inserted parameters.
- *
- * Initial display of calibration times to confirm linearity.
- *
- * Display of results within one screen (or at a slow speed as the test
- * progresses) so that it can be seen to have run successfully.
- *
- * Facilities to type in details of system used etc.
- *
- * All results and details appended to a results file.
- *
- *
- * Roy Longbottom
- * 101323.2...@compuserve.com
- *
- **************************************************************************
- *
- * For details of history, changes, other defines, benchmark construction
- * statistics see official versions from ftp.nosc.mil/pub/aburto where
- * the latest table of results (dhry.tbl) are available. See also
- * net...@ornl.gov
- *
- **************************************************************************
- *
- * Defines: The following "Defines" are possible:
- * -DREG=register (default: Not defined)
- * As an approximation to what an average C programmer
- * might do, the "register" storage class is applied
- * (if enabled by -DREG=register)
- * - for local variables, if they are used (dynamically)
- * five or more times
- * - for parameters if they are used (dynamically)
- * six or more times
- * Note that an optimal "register" strategy is
- * compiler-dependent, and that "register" declarations
- * do not necessarily lead to faster execution.
- * -DNOSTRUCTASSIGN (default: Not defined)
- * Define if the C compiler does not support
- * assignment of structures.
- * -DNOENUMS (default: Not defined)
- * Define if the C compiler does not support
- * enumeration types.
- ***************************************************************************
- *
- * Compilation model and measurement (IMPORTANT):
- *
- * This C version of Dhrystone consists of three files:
- * - dhry.h (this file, containing global definitions and comments)
- * - dhry_1.c (containing the code corresponding to Ada package Pack_1)
- * - dhry_2.c (containing the code corresponding to Ada package Pack_2)
- *
- * The following "ground rules" apply for measurements:
- * - Separate compilation
- * - No procedure merging
- * - Otherwise, compiler optimizations are allowed but should be indicated
- * - Default results are those without register declarations
- * See the companion paper "Rationale for Dhrystone Version 2" for a more
- * detailed discussion of these ground rules.
- *
- * For 16-Bit processors (e.g. 80186, 80286), times for all compilation
- * models ("small", "medium", "large" etc.) should be given if possible,
- * together with a definition of these models for the compiler system used.
- *
- **************************************************************************
- * Examples of Pentium Results
- *
- * Dhrystone Benchmark Version 2.1 (Language: C)
- *
- * Month run 4/1996
- * PC model Escom
- * CPU Pentium
- * Clock MHz 100
- * Cache 256K
- * Options Neptune chipset
- * OS/DOS Windows 95
- * Compiler Watcom C/ C++ 10.5 Win386
- * OptLevel -otexan -zp8 -fp5 -5r
- * Run by Roy Longbottom
- * From UK
- * Mail 101323.2...@compuserve.com
- *
- * Final values (* implementation-dependent):
- *
- * Int_Glob: O.K. 5
- * Bool_Glob: O.K. 1
- * Ch_1_Glob: O.K. A
- * Ch_2_Glob: O.K. B
- * Arr_1_Glob[8]: O.K. 7
- * Arr_2_Glob8/7: O.K. 1600010
- * Ptr_Glob->
- * Ptr_Comp: * 98008
- * Discr: O.K. 0
- * Enum_Comp: O.K. 2
- * Int_Comp: O.K. 17
- * Str_Comp: O.K. DHRYSTONE PROGRAM, SOME STRING
- * Next_Ptr_Glob->
- * Ptr_Comp: * 98008 same as above
- * Discr: O.K. 0
- * Enum_Comp: O.K. 1
- * Int_Comp: O.K. 18
- * Str_Comp: O.K. DHRYSTONE PROGRAM, SOME STRING
- * Int_1_Loc: O.K. 5
- * Int_2_Loc: O.K. 13
- * Int_3_Loc: O.K. 7
- * Enum_Loc: O.K. 1
- * Str_1_Loc: O.K. DHRYSTONE PROGRAM, 1'ST STRING
- * Str_2_Loc: O.K. DHRYSTONE PROGRAM, 2'ND STRING
- *
- * Register option Selected.
- *
- * Microseconds 1 loop: 4.53
- * Dhrystones / second: 220690
- * VAX MIPS rating: 125.61
- *
- *
- * Dhrystone Benchmark Version 2.1 (Language: C)
- *
- * Month run 4/1996
- * PC model Escom
- * CPU Pentium
- * Clock MHz 100
- * Cache 256K
- * Options Neptune chipset
- * OS/DOS Windows 95
- * Compiler Watcom C/ C++ 10.5 Win386
- * OptLevel No optimisation
- * Run by Roy Longbottom
- * From UK
- * Mail 101323.2...@compuserve.com
- *
- * Final values (* implementation-dependent):
- *
- * Int_Glob: O.K. 5
- * Bool_Glob: O.K. 1
- * Ch_1_Glob: O.K. A
- * Ch_2_Glob: O.K. B
- * Arr_1_Glob[8]: O.K. 7
- * Arr_2_Glob8/7: O.K. 320010
- * Ptr_Glob->
- * Ptr_Comp: * 98004
- * Discr: O.K. 0
- * Enum_Comp: O.K. 2
- * Int_Comp: O.K. 17
- * Str_Comp: O.K. DHRYSTONE PROGRAM, SOME STRING
- * Next_Ptr_Glob->
- * Ptr_Comp: * 98004 same as above
- * Discr: O.K. 0
- * Enum_Comp: O.K. 1
- * Int_Comp: O.K. 18
- * Str_Comp: O.K. DHRYSTONE PROGRAM, SOME STRING
- * Int_1_Loc: O.K. 5
- * Int_2_Loc: O.K. 13
- * Int_3_Loc: O.K. 7
- * Enum_Loc: O.K. 1
- * Str_1_Loc: O.K. DHRYSTONE PROGRAM, 1'ST STRING
- * Str_2_Loc: O.K. DHRYSTONE PROGRAM, 2'ND STRING
- *
- * Register option Not selected.
- *
- * Microseconds 1 loop: 20.06
- * Dhrystones / second: 49844
- * VAX MIPS rating: 28.37
- *
- **************************************************************************
- */
-
-/* Compiler and system dependent definitions: */
-
-#ifndef TIME
-#define TIMES
-#endif
- /* Use times(2) time function unless */
- /* explicitly defined otherwise */
-
-#ifdef TIMES
-/* #include <sys/types.h>
- #include <sys/times.h> */
- /* for "times" */
-#endif
-
-#define Mic_secs_Per_Second 1000000.0
- /* Berkeley UNIX C returns process times in seconds/HZ */
-
-#ifdef NOSTRUCTASSIGN
-#define structassign(d, s) memcpy(&(d), &(s), sizeof(d))
-#else
-#define structassign(d, s) d = s
-#endif
-
-#ifdef NOENUM
-#define Ident_1 0
-#define Ident_2 1
-#define Ident_3 2
-#define Ident_4 3
-#define Ident_5 4
- typedef int Enumeration;
-#else
- typedef enum {Ident_1, Ident_2, Ident_3, Ident_4, Ident_5}
- Enumeration;
-#endif
- /* for boolean and enumeration types in Ada, Pascal */
-
-/* General definitions: */
-
-#include <stdio.h>
-#include <string.h>
-
- /* for strcpy, strcmp */
-
-#define Null 0
- /* Value of a Null pointer */
-#define true 1
-#define false 0
-
-typedef int One_Thirty;
-typedef int One_Fifty;
-typedef char Capital_Letter;
-typedef int Boolean;
-typedef char Str_30 [31];
-typedef int Arr_1_Dim [50];
-typedef int Arr_2_Dim [50] [50];
-
-typedef struct record
- {
- struct record *Ptr_Comp;
- Enumeration Discr;
- union {
- struct {
- Enumeration Enum_Comp;
- int Int_Comp;
- char Str_Comp [31];
- } var_1;
- struct {
- Enumeration E_Comp_2;
- char Str_2_Comp [31];
- } var_2;
- struct {
- char Ch_1_Comp;
- char Ch_2_Comp;
- } var_3;
- } variant;
- } Rec_Type, *Rec_Pointer;
-
-
-
diff --git a/contrib/cortex-strings/benchmarks/dhry/dhry_1.c
b/contrib/cortex-strings/benchmarks/dhry/dhry_1.c
deleted file mode 100644
index da272e4c4234..000000000000
--- a/contrib/cortex-strings/benchmarks/dhry/dhry_1.c
+++ /dev/null
@@ -1,778 +0,0 @@
-/*
- *************************************************************************
- *
- * "DHRYSTONE" Benchmark Program
- * -----------------------------
- *
- * Version: C, Version 2.1
- *
- * File: dhry_1.c (part 2 of 3)
- *
- * Date: May 25, 1988
- *
- * Author: Reinhold P. Weicker
- *
- *************************************************************************
- */
-
- #include <time.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include "dhry.h"
- /*COMPILER COMPILER COMPILER COMPILER COMPILER COMPILER COMPILER*/
-
- #ifdef COW
- #define compiler "Watcom C/C++ 10.5 Win386"
- #define options " -otexan -zp8 -5r -ms"
- #endif
- #ifdef CNW
- #define compiler "Watcom C/C++ 10.5 Win386"
- #define options " No optimisation"
- #endif
- #ifdef COD
- #define compiler "Watcom C/C++ 10.5 Dos4GW"
- #define options " -otexan -zp8 -5r -ms"
- #endif
- #ifdef CND
- #define compiler "Watcom C/C++ 10.5 Dos4GW"
- #define options " No optimisation"
- #endif
- #ifdef CONT
- #define compiler "Watcom C/C++ 10.5 Win32NT"
- #define options " -otexan -zp8 -5r -ms"
- #endif
- #ifdef CNNT
- #define compiler "Watcom C/C++ 10.5 Win32NT"
- #define options " No optimisation"
- #endif
- #ifdef COO2
- #define compiler "Watcom C/C++ 10.5 OS/2-32"
- #define options " -otexan -zp8 -5r -ms"
- #endif
- #ifdef CNO2
- #define compiler "Watcom C/C++ 10.5 OS/2-32"
- #define options " No optimisation"
- #endif
-
-
-/* Global Variables: */
-
-Rec_Pointer Ptr_Glob,
- Next_Ptr_Glob;
*** 6984 LINES SKIPPED ***
