From f6c4e32be26987a5dbf907c0b379aed4f555f65a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Mon, 15 Dec 2025 15:10:29 +0100 Subject: [PATCH] Add Rodinia OpenCL benchmark suite --- overlay.nix | 1 + pkgs/rodinia/default.nix | 58 + pkgs/rodinia/rodinia-fixes.patch | 1540 ++++++++++++++++++++++++ pkgs/rodinia/rodinia-rm.patch | 1880 ++++++++++++++++++++++++++++++ 4 files changed, 3479 insertions(+) create mode 100644 pkgs/rodinia/default.nix create mode 100644 pkgs/rodinia/rodinia-fixes.patch create mode 100644 pkgs/rodinia/rodinia-rm.patch diff --git a/overlay.nix b/overlay.nix index 50bad77..3ae8676 100644 --- a/overlay.nix +++ b/overlay.nix @@ -61,6 +61,7 @@ let prometheus-slurm-exporter = prev.callPackage ./pkgs/slurm-exporter/default.nix { }; #pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned #psmpi = callPackage ./pkgs/parastation/psmpi.nix { }; # Unmaintaned + rodinia = callPackage ./pkgs/rodinia/default.nix { }; slurm = import ./pkgs/slurm/default.nix { slurm = prev.slurm; }; sonar = callPackage ./pkgs/sonar/default.nix { }; stdenvClangOmpss2 = final.stdenv.override { cc = final.clangOmpss2; allowedRequisites = null; }; diff --git a/pkgs/rodinia/default.nix b/pkgs/rodinia/default.nix new file mode 100644 index 0000000..ae7d3d4 --- /dev/null +++ b/pkgs/rodinia/default.nix @@ -0,0 +1,58 @@ +{ + stdenv, + lib, + fetchurl, + ocl-icd, + opencl-headers, +}: + +stdenv.mkDerivation { + pname = "rodinia-opencl"; + version = "3.1"; + src = fetchurl { + url = "http://www.cs.virginia.edu/~skadron/lava/Rodinia/Packages/rodinia_3.1.tar.bz2"; + hash = "sha256-+uusfBHtj4/Pa/LX6FwwhvwtEfciBNbfwo3FsujyrP0="; + }; + + patches = [ + ./rodinia-fixes.patch + ./rodinia-rm.patch + ]; + buildInputs = [ + opencl-headers + ocl-icd + ]; + buildFlags = [ + "OPENCL" + "--always-make" + ]; + + preBuild = '' + mkdir -p bin/linux/{cuda,omp,opencl} + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + cp -r bin data opencl $out + cp LICENSE README $out/share + + runHook postInstall + ''; + + meta = { + homepage = "https://rodinia.cs.virginia.edu/"; + description = "Test Suite of Compute-Intensive Applications with Accelerators"; + maintainers = with lib.maintainers.bsc; [ abonerib ]; + platforms = lib.platforms.linux; + license = { + deprecated = false; + free = false; + fullName = "Rodinia License"; + redistributable = true; + shortName = "rodinia"; + url = "https://www.cs.virginia.edu/~skadron/lava/rodinia/license.htm"; + }; + }; +} diff --git a/pkgs/rodinia/rodinia-fixes.patch b/pkgs/rodinia/rodinia-fixes.patch new file mode 100644 index 0000000..ea1fb2d --- /dev/null +++ b/pkgs/rodinia/rodinia-fixes.patch @@ -0,0 +1,1540 @@ +diff --git a/common/make.config b/common/make.config +index 9d56b88ff5..04b14ed694 100755 +--- a/common/make.config ++++ b/common/make.config +@@ -23,11 +23,11 @@ + # OPENCL_LIB = $(OPENCL_DIR)/OpenCL/common/lib -lOpenCL + + # AMD_DIR +-OPENCL_DIR = /if10/kw5na/Packages/AMD-APP-SDK-v2.8-RC-lnx64 +-OPENCL_INC = $(OPENCL_DIR)/include/ +-OPENCL_LIB = $(OPENCL_DIR)/lib/x86_64/ -lOpenCL ++OPENCL_DIR ?= /usr/share/lib ++OPENCL_INC = $(OPENCL_DIR)/include ++OPENCL_LIB = $(OPENCL_DIR)/lib/CL -lOpenCL + #ifeq ($(shell uname -m), x86_64) + # ifeq ($(shell if test -d $(OPENCL_DIR)/lib/x86_64/; then echo T; else echo F; fi), T) + # OPENCL_LIB = $(OPENCL_DIR)/lib/x86_64/ + # endif +-#endif +\ No newline at end of file ++#endif +diff --git a/opencl/b+tree/util/timer/timer.c b/opencl/b+tree/util/timer/timer.c +index c7cc252b4e..59ce114f19 100755 +--- a/opencl/b+tree/util/timer/timer.c ++++ b/opencl/b+tree/util/timer/timer.c +@@ -11,6 +11,7 @@ + //======================================================================================================================================================150 + + #include ++#include + + //======================================================================================================================================================150 + // FUNCTIONS +diff --git a/opencl/backprop/Makefile b/opencl/backprop/Makefile +index 2c8a9f4f05..828bb3ebb6 100755 +--- a/opencl/backprop/Makefile ++++ b/opencl/backprop/Makefile +@@ -2,7 +2,7 @@ + + # C compiler + CC = g++ +-CC_FLAGS = -g -O2 ++CC_FLAGS = -g -O2 -std=c++98 + + backprop: backprop.o imagenet.o facetrain.o + $(CC) $(CC_FLAGS) backprop_ocl.cpp backprop.o imagenet.o facetrain.o -o backprop -I$(OPENCL_INC) -L$(OPENCL_LIB) -lOpenCL +diff --git a/opencl/backprop/backprop_ocl.cpp b/opencl/backprop/backprop_ocl.cpp +index 09822bc91d..4be1828144 100755 +--- a/opencl/backprop/backprop_ocl.cpp ++++ b/opencl/backprop/backprop_ocl.cpp +@@ -112,7 +112,7 @@ + fread(source + strlen(source), sourcesize, 1, fp); + fclose(fp); + +- int use_gpu = 1; ++ int use_gpu = 0; + if(initialize(use_gpu)) return -1; + + // compile kernel +@@ -252,4 +252,5 @@ + free(partial_sum); + free(input_weights_one_dim); + ++ return 0; + } +diff --git a/opencl/bfs/CLHelper.h b/opencl/bfs/CLHelper.h +index b9a873e43f..8910016f34 100644 +--- a/opencl/bfs/CLHelper.h ++++ b/opencl/bfs/CLHelper.h +@@ -183,7 +183,7 @@ + //--cambine-2: create an OpenCL context + cl_context_properties cprops[3] = { CL_CONTEXT_PLATFORM, (cl_context_properties)targetPlatform, 0 }; + oclHandles.context = clCreateContextFromType(cprops, +- CL_DEVICE_TYPE_GPU, ++ CL_DEVICE_TYPE_ALL, + NULL, + NULL, + &resultCL); +@@ -193,7 +193,7 @@ + //----------------------------------------------- + //--cambine-3: detect OpenCL devices + /* First, get the size of device list */ +- oclHandles.cl_status = clGetDeviceIDs(targetPlatform, CL_DEVICE_TYPE_GPU, 0, NULL, &deviceListSize); ++ oclHandles.cl_status = clGetDeviceIDs(targetPlatform, CL_DEVICE_TYPE_ALL, 0, NULL, &deviceListSize); + if(oclHandles.cl_status!=CL_SUCCESS){ + throw(string("exception in _clInit -> clGetDeviceIDs")); + } +@@ -209,7 +209,7 @@ + throw(string("InitCL()::Error: Could not allocate memory.")); + + /* Next, get the device list data */ +- oclHandles.cl_status = clGetDeviceIDs(targetPlatform, CL_DEVICE_TYPE_GPU, deviceListSize, \ ++ oclHandles.cl_status = clGetDeviceIDs(targetPlatform, CL_DEVICE_TYPE_ALL, deviceListSize, \ + oclHandles.devices, NULL); + if(oclHandles.cl_status!=CL_SUCCESS){ + throw(string("exception in _clInit -> clGetDeviceIDs-2")); +diff --git a/opencl/bfs/Makefile b/opencl/bfs/Makefile +index 24d2a7c04a..238d46bfdd 100755 +--- a/opencl/bfs/Makefile ++++ b/opencl/bfs/Makefile +@@ -5,7 +5,7 @@ + + SRC = bfs.cpp timer.cc + +-CC_FLAGS = -g -O3 ++CC_FLAGS = -g -O3 -std=c++98 + + EXE = bfs + +diff --git a/opencl/cfd/Makefile b/opencl/cfd/Makefile +index f35a83ddd9..7fa50a2030 100755 +--- a/opencl/cfd/Makefile ++++ b/opencl/cfd/Makefile +@@ -6,7 +6,7 @@ + #INC = $(OPENCL_DIR)/include/ + #LIB = $(OPENCL_DIR)/lib/x86_64/ + +-FLAGS = -O3 ++FLAGS = -O3 -std=c++98 + SRC = euler3d.cpp + + EXE = euler3d +diff --git a/opencl/cfd/run b/opencl/cfd/run +index c789e597f6..42655f4065 100755 +--- a/opencl/cfd/run ++++ b/opencl/cfd/run +@@ -1,3 +1,5 @@ ++#!/usr/bin/env bash ++ + #There are three datasets: + + #./euler3d ../../data/cfd/fvcorr.domn.097K 0 +@@ -7,8 +9,8 @@ + #replace euler3d with other CFD programs + + +-for (( i=1; i<=1; i++)) +-do +- ./euler3d ../../data/cfd/fvcorr.domn.097K -t gpu -d 0 ++# for (( i=1; i<=1; i++ )) ++# do ++./euler3d ../../data/cfd/fvcorr.domn.097K -t cpu -d 0 + # ./euler3d ../../data/cfd/fvcorr.domn.097K 1 +-done ++# done +diff --git a/opencl/dwt2d/Makefile b/opencl/dwt2d/Makefile +index 0b6adb8b71..aa38105035 100755 +--- a/opencl/dwt2d/Makefile ++++ b/opencl/dwt2d/Makefile +@@ -13,8 +13,8 @@ + OUTPUT = -DOUTPUT + + C_C = g++ +-OCL_LIB = -lOpenCL +-OCL_INC = -I/usr/local/cuda-5.5/include ++OCL_LIB = -L$(OPENCL_LIB) ++OCL_INC = -I$(OPENCL_INC) + + default: dwt2d + +diff --git a/opencl/gaussian/run b/opencl/gaussian/run +index cbe0e4e698..02c719be1c 100755 +--- a/opencl/gaussian/run ++++ b/opencl/gaussian/run +@@ -1,2 +1,2 @@ + #./gaussian -f ../../data/gaussian/matrix4.txt +-./gaussian -s 256 +\ No newline at end of file ++echo 0 0 | ./gaussian -s 256 +diff --git a/opencl/heartwall/main.c b/opencl/heartwall/main.c +index 9e6fb4335b..3574db43c6 100755 +--- a/opencl/heartwall/main.c ++++ b/opencl/heartwall/main.c +@@ -20,6 +20,8 @@ + //======================================================================================================================================================150 + + #include "./main.h" // (in the main program folder) needed to recognized input parameters ++#include "./util/file/file.h" ++#include "./util/timer/timer.h" + + //======================================================================================================================================================150 + // UTILITIES +diff --git a/opencl/heartwall/util/timer/timer.c b/opencl/heartwall/util/timer/timer.c +index 61037769e5..1c91997911 100755 +--- a/opencl/heartwall/util/timer/timer.c ++++ b/opencl/heartwall/util/timer/timer.c +@@ -7,6 +7,7 @@ + //===============================================================================================================================================================================================================200 + + #include ++#include + + //===============================================================================================================================================================================================================200 + // INCLUDE HEADER +diff --git a/opencl/hotspot/hotspot.c b/opencl/hotspot/hotspot.c +index 3e6dcdd166..142ba68bb8 100755 +--- a/opencl/hotspot/hotspot.c ++++ b/opencl/hotspot/hotspot.c +@@ -166,7 +166,7 @@ + + // Create a GPU context + cl_context_properties context_properties[3] = { CL_CONTEXT_PLATFORM, (cl_context_properties) platform, 0}; +- context = clCreateContextFromType(context_properties, CL_DEVICE_TYPE_GPU, NULL, NULL, &error); ++ context = clCreateContextFromType(context_properties, CL_DEVICE_TYPE_ALL, NULL, NULL, &error); + if (error != CL_SUCCESS) fatal_CL(error, __LINE__); + + // Get and print the chosen device (if there are multiple devices, choose the first one) +diff --git a/opencl/hybridsort/Makefile b/opencl/hybridsort/Makefile +index 0e00eb74b4..8fb8c5bb4d 100644 +--- a/opencl/hybridsort/Makefile ++++ b/opencl/hybridsort/Makefile +@@ -15,8 +15,7 @@ + endif + + hybridsort: hybridsort.c bucketsort.h mergesort.h bucketsort.c mergesort.c +- $(CC) $(CC_FLAGS) -o hybridsort $(VERIFY) $(OUTPUT) $(TIMER) -I$(OPENCL_INC) $(HISTO_WG_SIZE_0) $(BUCKET_WG_SIZE_0) $(BUCKET_WG_SIZE_1) $(MERGE_WG_SIZE_0) $(MERGE_WG_SIZE_1) hybridsort.c bucketsort.c mergesort.c -L$(OPENCL_LIB) -lOpenCL -lm +- ++ $(CC) $(CC_FLAGS) -o hybridsort $(VERIFY) $(OUTPUT) $(TIMER) -I$(OPENCL_INC) $(HISTO_WG_SIZE_0) $(BUCKET_WG_SIZE_0) $(BUCKET_WG_SIZE_1) $(MERGE_WG_SIZE_0) $(MERGE_WG_SIZE_1) hybridsort.c bucketsort.c mergesort.c -L$(OPENCL_LIB) -lOpenCL -lm -Xlinker --allow-multiple-definition + + clean: + rm -f hybridsort +diff --git a/opencl/hybridsort/bucketsort.c b/opencl/hybridsort/bucketsort.c +index 4c91e7ca25..ae1e93a0bd 100644 +--- a/opencl/hybridsort/bucketsort.c ++++ b/opencl/hybridsort/bucketsort.c +@@ -148,7 +148,7 @@ + source_size = fread(source_str, 1, MAX_SOURCE_SIZE, fp); + fclose(fp); + +- bucketProgram = clCreateProgramWithSource(bucketContext, 1, (const char **) &source_str, (const size_t)&source_size, &err); ++ bucketProgram = clCreateProgramWithSource(bucketContext, 1, (const char **) &source_str, (const size_t*)&source_size, &err); + if (!bucketProgram) + { + printf("Error: Failed to create bucket compute program!\n"); +@@ -249,7 +249,7 @@ + source_size = fread(source_str, 1, MAX_SOURCE_SIZE, fp); + fclose(fp); + +- histoProgram = clCreateProgramWithSource(histoContext, 1, (const char **) &source_str, (const size_t)&source_size, &err); ++ histoProgram = clCreateProgramWithSource(histoContext, 1, (const char **) &source_str, (const size_t*)&source_size, &err); + if (!histoProgram) + { + printf("Error: Failed to create compute program!\n"); +diff --git a/opencl/hybridsort/mergesort.c b/opencl/hybridsort/mergesort.c +index e9fdf019e8..decd09e789 100644 +--- a/opencl/hybridsort/mergesort.c ++++ b/opencl/hybridsort/mergesort.c +@@ -94,7 +94,7 @@ + source_size = fread(source_str, 1, MAX_SOURCE_SIZE, fp); + + fclose(fp); +- mergeProgram = clCreateProgramWithSource(mergeContext, 1, (const char **) &source_str, (const size_t)&source_size, &err); ++ mergeProgram = clCreateProgramWithSource(mergeContext, 1, (const char **) &source_str, (const size_t*)&source_size, &err); + if (!mergeProgram) + { + printf("Error: Failed to create merge compute program!\n"); +diff --git a/opencl/kmeans/kmeans.cpp b/opencl/kmeans/kmeans.cpp +index ecac8d1f07..0b4048c5e0 100755 +--- a/opencl/kmeans/kmeans.cpp ++++ b/opencl/kmeans/kmeans.cpp +@@ -191,6 +191,8 @@ + if(err != CL_SUCCESS) { printf("ERROR: clEnqueueNDRangeKernel()=>%d failed\n", err); return -1; } + + membership_OCL = (int*) malloc(n_points * sizeof(int)); ++ ++ return 0; + } + + void deallocateMemory() +diff --git a/opencl/kmeans/unistd.h b/opencl/kmeans/unistd.h +deleted file mode 100755 +index 2cfc9832db..0000000000 +--- a/opencl/kmeans/unistd.h ++++ /dev/null +@@ -1,945 +0,0 @@ +-/* IBM_PROLOG_BEGIN_TAG */ +-/* This is an automatically generated prolog. */ +-/* */ +-/* bos53H src/bos/usr/include/unistd.h 1.38.4.46 */ +-/* */ +-/* Licensed Materials - Property of IBM */ +-/* */ +-/* (C) COPYRIGHT International Business Machines Corp. 1985,1995 */ +-/* All Rights Reserved */ +-/* */ +-/* US Government Users Restricted Rights - Use, duplication or */ +-/* disclosure restricted by GSA ADP Schedule Contract with IBM Corp. */ +-/* */ +-/* IBM_PROLOG_END_TAG */ +-/* @(#)82 1.38.4.46 src/bos/usr/include/unistd.h, incstd, bos53H, h2006_17B8 4/25/06 11:53:09 */ +-/* +- * COMPONENT_NAME: (INCSTD) Standard Include Files +- * +- * FUNCTIONS: +- * +- * ORIGINS: 3 27 +- * +- * (C) COPYRIGHT International Business Machines Corp. 1985, 2006 +- * All Rights Reserved +- * Licensed Materials - Property of IBM +- * +- * US Government Users Restricted Rights - Use, duplication or +- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp. +- * +- * Copyright (c) 1984 AT&T +- * All Rights Reserved +- * +- * THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF AT&T +- * The copyright notice above does not evidence any +- * actual or intended publication of such source code. +- */ +- +-#ifndef _H_UNISTD +-#define _H_UNISTD +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-#ifndef _H_STANDARDS +-#include +-#endif +- +-#include +- +-#ifndef _H_TYPES +-#include +-#endif +- +-#include +- +-#ifndef _H_ACCESS +-#include /* for the "access" function */ +-#endif +- +-/* +- * POSIX requires that certain values be included in unistd.h. It also +- * requires that when _POSIX_SOURCE is defined only those standard +- * specific values are present. This header includes all the POSIX +- * required entries. +- */ +- +-#ifdef _POSIX_SOURCE +-#ifdef _LARGE_FILES +-#define lseek lseek64 +-#endif +- +- +-/* Symbolic constants for the "lseek" function: */ +-#ifndef SEEK_SET +-#define SEEK_SET 0 /* Set file pointer to "offset" */ +-#define SEEK_CUR 1 /* Set file pointer to current plus "offset" */ +-#define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ +-#endif /* SEEK_SET */ +- +-#ifdef _NO_PROTO +- +-#ifndef _KERNEL +-extern int access(); +-extern unsigned int alarm(); +-extern int chdir(); +-extern int chown(); +-extern int close(); +-extern char *ctermid(); +-extern int dup(); +-extern int dup2(); +-extern int execl(); +-extern int execv(); +-extern int execle(); +-extern int execve(); +-extern int execlp(); +-extern int execvp(); +-extern void _exit(); +-extern pid_t fork(); +-extern long fpathconf(); +-extern char *getcwd(); +-extern gid_t getegid(); +-extern uid_t geteuid(); +-extern gid_t getgid(); +-extern int getgroups(); +-extern char *getlogin(); +-extern pid_t getpgrp(); +-extern pid_t getpid(); +-extern pid_t getppid(); +-extern uid_t getuid(); +-extern int isatty(); +-extern int link(); +-extern off_t lseek(); +-extern long pathconf(); +-extern int pause(); +-extern int pipe(); +-#if defined(_XOPEN_SOURCE) && ( _XOPEN_SOURCE >= 500 ) +-extern int pthread_atfork(); +-#endif +-extern int read(); +-extern int rmdir(); +-extern int setgid(); +-extern int setpgid(); +-extern int setsid(); +-extern int setuid(); +-extern unsigned int sleep(); +-extern long sysconf(); +-extern pid_t tcgetpgrp(); +-extern int tcsetpgrp(); +-extern char *ttyname(); +-extern int unlink(); +-extern int write(); +-#endif /* !_KERNEL */ +- +-#else /* POSIX required prototypes */ +- +-#ifndef _KERNEL +-extern int access(const char *, int); +-extern unsigned int alarm(unsigned int); +-extern int chdir(const char *); +-extern int chown(const char *, uid_t, gid_t); +-extern int close(int); +-extern char *ctermid(char *); +-extern int dup(int); +-extern int dup2(int, int); +-extern int execl(const char *, const char *, ...); +-extern int execv(const char *, char *const []); +-extern int execle(const char *, const char *, ...); +-extern int execve(const char *, char *const [], char *const []); +-extern int execlp(const char *, const char *, ...); +-extern int execvp(const char *, char *const []); +-extern void _exit(int); +-extern pid_t fork(void); +-extern long fpathconf(int, int); +-extern char *getcwd(char *, size_t); +-extern gid_t getegid(void); +-extern uid_t geteuid(void); +-extern gid_t getgid(void); +-extern int getgroups(int, gid_t []); +-extern char *getlogin(void); +-#ifndef _BSD +-extern pid_t getpgrp(void); +-#endif /* _BSD */ +-extern pid_t getpid(void); +-extern pid_t getppid(void); +-extern uid_t getuid(void); +-extern int isatty(int); +-extern int link(const char *, const char *); +-extern off_t lseek(int, off_t, int); +-#ifdef _LARGE_FILE_API +-extern off64_t lseek64(int, off64_t, int); +-#endif +-extern long pathconf(const char *, int); +-extern int pause(void); +-extern int pipe(int []); +-#if defined(_XOPEN_SOURCE) && ( _XOPEN_SOURCE >= 500 ) +-extern int pthread_atfork(void (*)(void), void (*)(void), void (*)(void)); +-#endif +-extern ssize_t read(int, void *, size_t); +-extern int rmdir(const char *); +-extern int setgid(gid_t); +-extern int setpgid(pid_t, pid_t); +-extern pid_t setsid(void); +-extern int setuid(uid_t); +-extern unsigned int sleep(unsigned int); +-extern long sysconf(int); +-extern pid_t tcgetpgrp(int); +-extern int tcsetpgrp(int, pid_t); +-extern char *ttyname(int); +-extern int unlink(const char *); +-extern ssize_t write(int, const void *, size_t); +-#endif /* !_KERNEL */ +-#endif /* !_NO_PROTO */ +- +-#define STDIN_FILENO 0 +-#define STDOUT_FILENO 1 +-#define STDERR_FILENO 2 +- +-#define _POSIX_JOB_CONTROL 1 +-#define _POSIX_SAVED_IDS 1 +- +-#define _POSIX_VERSION 200112L +-#define _POSIX2_VERSION 200112L +-#define _POSIX2_C_VERSION 200112L +- +- +-#ifdef _XOPEN_SOURCE +- +-#define _XOPEN_VERSION 600 +-#define _XOPEN_XCU_VERSION 4 +-#define _XOPEN_XPG3 1 +-#define _XOPEN_XPG4 1 +-#define _XOPEN_UNIX 1 +- +-#define _XOPEN_REALTIME (-1) +-#define _XOPEN_REALTIME_THREADS (-1) +- +-#if (_XOPEN_SOURCE >= 600) +-#define _XOPEN_STREAMS 1 +-#endif +- +-#define _XBS5_ILP32_OFF32 1 +-#define _XBS5_ILP32_OFFBIG 1 +-#define _XBS5_LP64_OFF64 1 +-#define _XBS5_LPBIG_OFFBIG 1 +- +-#define _POSIX2_C_BIND 200112L +-#define _POSIX2_C_DEV 200112L +-#define _POSIX2_CHAR_TERM 1 +-#define _POSIX2_LOCALEDEF 200112L +-#define _POSIX2_UPE 200112L +-#define _POSIX2_FORT_DEV (-1) +-#define _POSIX2_FORT_RUN (-1) +-#define _POSIX2_SW_DEV (-1) +- +-#if (_POSIX_C_SOURCE >= 200112L) +-#define _POSIX_REGEXP 1 +-#define _POSIX_SHELL 1 +-#define _POSIX2_PBS (-1) +-#define _POSIX2_PBS_ACCOUNTING (-1) +-#define _POSIX2_PBS_CHECKPOINT (-1) +-#define _POSIX2_PBS_LOCATE (-1) +-#define _POSIX2_PBS_MESSAGE (-1) +-#define _POSIX2_PBS_TRACK (-1) +-#define _V6_ILP32_OFF32 1 +-#define _V6_ILP32_OFFBIG 1 +-#define _V6_LP64_OFF64 1 +-#define _V6_LPBIG_OFFBIG 1 +- +-#define _POSIX_ADVISORY_INFO 200112L +-#define _POSIX_BARRIERS 200112L +-#define _POSIX_CLOCK_SELECTION 200112L +-#define _POSIX_CPUTIME 200112L +-#define _POSIX_MONOTONIC_CLOCK 200112L +- +-#ifdef _POSIX_RAW_SOCKETS +-#undef _POSIX_RAW_SOCKETS +-#endif +- +-#define _POSIX_SPAWN 200112L +-#define _POSIX_SPIN_LOCKS 200112L +-#define _POSIX_SPORADIC_SERVER (-1) +-#define _POSIX_THREAD_CPUTIME 200112L +-#define _POSIX_THREAD_SPORADIC_SERVER (-1) +-#define _POSIX_TIMEOUTS 200112L +-#define _POSIX_TRACE (-1) +-#define _POSIX_TRACE_EVENT_FILTER (-1) +-#define _POSIX_TRACE_INHERIT (-1) +-#define _POSIX_TRACE_LOG (-1) +-#define _POSIX_TYPED_MEMORY_OBJECTS (-1) +- +-#endif /* _POSIX_C_SOURCE >= 200112L */ +- +-#define _XOPEN_CRYPT 1 +-#define _XOPEN_SHM 1 +-#define _XOPEN_ENH_I18N 1 +-#define _XOPEN_LEGACY (-1) +-#ifndef __64BIT__ +-#define _UNIX_ABI (-1) +-#define _UNIX_ABI_IA64 (-1) +-#define _UNIX_ABI_BIG_ENDIAN (-1) +-#define _UNIX_ABI_LITTLE_ENDIAN (-1) +-#endif /* __64BIT__ */ +- +-extern char *optarg; +-extern int optind, opterr, optopt; +- +-#ifdef _NO_PROTO +- extern size_t confstr(); +- extern char *crypt(); +- extern void encrypt(); +- extern int fsync(); +- extern int getopt(); +- extern int nice(); +- extern void swab(); +-#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE<200112L) || defined(_ALL_SOURCE) +- extern char *getpass(); +- extern int chroot(); +-#endif +-#else +- extern size_t confstr(int, char*, size_t); +- extern char *crypt(const char *, const char *); +- extern void encrypt(char *, int); +- extern int fsync(int); +- extern int getopt(int, char* const*, const char*); +- extern int nice(int); +- extern void swab(const void *, void *, ssize_t); +- extern int fdatasync(int); +-#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE<200112L) || defined(_ALL_SOURCE) +- extern char *getpass(const char *); +- extern int chroot(const char *); +-#endif +-#endif +- +-#endif /* _XOPEN _SOURCE */ +- +-/* Threads options for 1003.1c and XPG UNIX98 */ +-#define _POSIX_THREADS 200112L +-#define _POSIX_THREAD_ATTR_STACKADDR 200112L +-#define _POSIX_THREAD_ATTR_STACKSIZE 200112L +-#define _POSIX_THREAD_PROCESS_SHARED 200112L +-#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L +-#ifdef _ALL_SOURCE +-#define _POSIX_REENTRANT_FUNCTIONS _POSIX_THREAD_SAFE_FUNCTIONS +-#endif +- +-/* Realtime threads options for 1003.1c and XPG UNIX98 */ +-#define _POSIX_THREAD_PRIORITY_SCHEDULING (-1) +-#define _POSIX_THREAD_PRIO_INHERIT (-1) +-#define _POSIX_THREAD_PRIO_PROTECT (-1) +- +-#undef _POSIX_THREAD_FORKALL +- +-/* Realtime options for 1003.1c and XPG UNIX98 */ +-#define _POSIX_ASYNCHRONOUS_IO 200112L +-#define _POSIX_FSYNC 200112L +-#define _POSIX_MAPPED_FILES 200112L +-#define _POSIX_MEMLOCK 200112L +-#define _POSIX_MEMLOCK_RANGE 200112L +-#define _POSIX_MEMORY_PROTECTION 200112L +-#define _POSIX_MESSAGE_PASSING 200112L +-#define _POSIX_PRIORITIZED_IO 200112L +-#define _POSIX_PRIORITY_SCHEDULING 200112L +-#define _POSIX_REALTIME_SIGNALS 200112L +-#define _POSIX_SEMAPHORES 200112L +-#define _POSIX_SHARED_MEMORY_OBJECTS 200112L +-#define _POSIX_SYNCHRONIZED_IO 200112L +-#define _POSIX_TIMERS 200112L +- +-#define _POSIX_ASYNC_IO (-1) +-#undef _POSIX_SYNC_IO +-#define _POSIX_PRIO_IO (-1) +- +-#define _POSIX_CHOWN_RESTRICTED 0 +-#define _POSIX_VDISABLE 0xFF +-#define _POSIX_NO_TRUNC 0 +- +- /* UNIX03 and POSIX01 */ +- /* Always enabled */ +-#define _POSIX_IPV6 200112L +-#define _POSIX_RAW_SOCKETS 200112L +- +- +-#ifndef NULL +-#define NULL 0 +-#endif +- +-#if (_POSIX_C_SOURCE >= 200112L) +-#define _POSIX_READER_WRITER_LOCKS 200112L +-#endif +- +-/* arguments for the confstr() function */ +- +-#define _CS_PATH 1 +- +- /* compile,link,lib,lint flags for 32bit, no_LARGE_FILES system */ +-#define _CS_XBS5_ILP32_OFF32_CFLAGS 2 +-#define _CS_XBS5_ILP32_OFF32_LDFLAGS 3 +-#define _CS_XBS5_ILP32_OFF32_LIBS 4 +-#define _CS_XBS5_ILP32_OFF32_LINTFLAGS 5 +- +- /* compile,link,lib,lint flags for 32bit, _LARGE_FILES system */ +-#define _CS_XBS5_ILP32_OFFBIG_CFLAGS 6 +-#define _CS_XBS5_ILP32_OFFBIG_LDFLAGS 7 +-#define _CS_XBS5_ILP32_OFFBIG_LIBS 8 +-#define _CS_XBS5_ILP32_OFFBIG_LINTFLAGS 9 +- +- /* compile,link,lib,lint flags for LP64 64bit system */ +-#define _CS_XBS5_LP64_OFF64_CFLAGS 10 +-#define _CS_XBS5_LP64_OFF64_LDFLAGS 11 +-#define _CS_XBS5_LP64_OFF64_LIBS 12 +-#define _CS_XBS5_LP64_OFF64_LINTFLAGS 13 +- +- /* compile,link,lib,lint flags for ILP64 64bit system */ +- /* AIX does not currently support this */ +-#define _CS_XBS5_LPBIG_OFFBIG_CFLAGS 14 +-#define _CS_XBS5_LPBIG_OFFBIG_LDFLAGS 15 +-#define _CS_XBS5_LPBIG_OFFBIG_LIBS 16 +-#define _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS 17 +- +-#define _CS_AIX_BOOTDEV 24 +-#define _CS_AIX_MODEL_CODE 25 +-#define _CS_AIX_ARCHITECTURE 26 +-#define _CS_AIX_MODEL_CLASS 40 +- +-#if (_POSIX_C_SOURCE >= 200112L) +-#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS 27 +-#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS 28 +-#define _CS_POSIX_V6_ILP32_OFF32_LIBS 29 +-#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS 30 +-#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS 31 +-#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS 32 +-#define _CS_POSIX_V6_LP64_OFF64_CFLAGS 33 +-#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS 34 +-#define _CS_POSIX_V6_LP64_OFF64_LIBS 35 +-#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS 36 +-#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS 37 +-#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS 38 +-#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS 39 +-#endif +- +- /* Values for the above */ +-#define _CSPATH "/usr/bin:/usr/vac/bin" +- +- /* ILP32_OFF32 */ +-#define _CSPOSIX_V6_ILP32_OFF32_CFLAGS "-q32" +-#define _CSXBS5_ILP32_OFF32_CFLAGS _CSPOSIX_V6_ILP32_OFF32_CFLAGS +- +-#ifdef __ia64 +-#define _CSXBS5_ILP32_OFF32_LDFLAGS "" +-#else /* POWER */ +-#define _CSPOSIX_V6_ILP32_OFF32_LDFLAGS "-b32" +-#define _CSXBS5_ILP32_OFF32_LDFLAGS _CSPOSIX_V6_ILP32_OFF32_LDFLAGS +-#endif +- +-#define _CSPOSIX_V6_ILP32_OFF32_LIBS "-lc -lpthread -lm" +-#define _CSXBS5_ILP32_OFF32_LIBS _CSPOSIX_V6_ILP32_OFF32_LIBS +- +-#define _CSXBS5_ILP32_OFF32_LINTFLAGS "" +- +- /* ILP32_OFFOFFBIG */ +-#define _CSPOSIX_V6_ILP32_OFFBIG_CFLAGS "-q32 -D_LARGE_FILES -qlonglong" +-#define _CSXBS5_ILP32_OFFBIG_CFLAGS _CSPOSIX_V6_ILP32_OFFBIG_CFLAGS +- +-#ifdef __ia64 +-#define _CSXBS5_ILP32_OFFBIG_LDFLAGS "" +-#else /* POWER */ +-#define _CSPOSIX_V6_ILP32_OFFBIG_LDFLAGS "-b32" +-#define _CSXBS5_ILP32_OFFBIG_LDFLAGS _CSPOSIX_V6_ILP32_OFFBIG_LDFLAGS +-#endif +- +-#define _CSPOSIX_V6_ILP32_OFFBIG_LIBS "-lc -lpthread -lm" +-#define _CSXBS5_ILP32_OFFBIG_LIBS _CSPOSIX_V6_ILP32_OFFBIG_LIBS +- +-#define _CSXBS5_ILP32_OFFBIG_LINTFLAGS "-D_LARGE_FILES -qlonglong" +- +- /* LP64_OFF64 */ +-#define _CSPOSIX_V6_LP64_OFF64_CFLAGS "-q64" +-#define _CSXBS5_LP64_OFF64_CFLAGS _CSPOSIX_V6_LP64_OFF64_CFLAGS +- +-#ifdef __ia64 +-#define _CSXBS5_LP64_OFF64_LDFLAGS "" +-#else /* POWER */ +-#define _CSPOSIX_V6_LP64_OFF64_LDFLAGS "-b64" +-#define _CSXBS5_LP64_OFF64_LDFLAGS _CSPOSIX_V6_LP64_OFF64_LDFLAGS +-#endif +- +-#define _CSPOSIX_V6_LP64_OFF64_LIBS "-lc -lpthread -lm" +-#define _CSXBS5_LP64_OFF64_LIBS _CSPOSIX_V6_LP64_OFF64_LIBS +- +-#define _CSXBS5_LP64_OFF64_LINTFLAGS "-D__64BIT__" +- +- /* LPBIG_OFFBIG */ +-#define _CSPOSIX_V6_LPBIG_OFFBIG_CFLAGS "-q64" +-#define _CSXBS5_LPBIG_OFFBIG_CFLAGS _CSPOSIX_V6_LPBIG_OFFBIG_CFLAGS +- +-#ifdef __ia64 +-#define _CSXBS5_LPBIG_OFFBIG_LDFLAGS "" +-#else /* POWER */ +-#define _CSPOSIX_V6_LPBIG_OFFBIG_LDFLAGS "-b64" +-#define _CSXBS5_LPBIG_OFFBIG_LDFLAGS _CSPOSIX_V6_LPBIG_OFFBIG_LDFLAGS +-#endif +- +-#define _CSPOSIX_V6_LPBIG_OFFBIG_LIBS "-lc -lpthread -lm" +-#define _CSXBS5_LPBIG_OFFBIG_LIBS _CSPOSIX_V6_LPBIG_OFFBIG_LIBS +- +-#define _CSXBS5_LPBIG_OFFBIG_LINTFLAGS "-D__64BIT__" +- +-#if (_POSIX_C_SOURCE >= 200112L) +-#define _CSPOSIX_V6_WIDTH_RESTRICTED_ENVS \ +- "POSIX_V6_ILP32_OFF32\n" \ +- "POSIX_V6_ILP32_OFFBIG\n" \ +- "POSIX_V6_LP64_OFF64\n" \ +- "POSIX_V6_LPBIG_OFFBIG" +-#endif +- +-/* arguments for the pathconf() function */ +- +-#define _PC_CHOWN_RESTRICTED 10 +-#define _PC_LINK_MAX 11 +-#define _PC_MAX_CANON 12 +-#define _PC_MAX_INPUT 13 +-#define _PC_NAME_MAX 14 +-#define _PC_NO_TRUNC 15 +-#define _PC_PATH_MAX 16 +-#define _PC_PIPE_BUF 17 +-#define _PC_VDISABLE 18 +-#define _PC_ASYNC_IO 19 +-#define _PC_SYNC_IO 20 +-#define _PC_PRIO_IO 21 +-#define _PC_FILESIZEBITS 22 /* # bits needed to hold offset */ +-#define _PC_AIX_DISK_PARTITION 23 +-#define _PC_AIX_DISK_SIZE 24 +-#if (_POSIX_C_SOURCE >= 200112L) +-#define _PC_SYMLINK_MAX 25 +-#define _PC_ALLOC_SIZE_MIN 26 +-#define _PC_REC_INCR_XFER_SIZE 27 +-#define _PC_REC_MAX_XFER_SIZE 28 +-#define _PC_REC_MIN_XFER_SIZE 29 +-#define _PC_REC_XFER_ALIGN 30 +-#define _PC_2_SYMLINKS 31 +-#endif +- +-/* arguments for the sysconf() function, the defined numbers are used as +- * array index in sysconf(). +- * +- * POSIX.1(1990), Table 4-2 +- */ +-#define _SC_ARG_MAX 0 +-#define _SC_CHILD_MAX 1 +-#define _SC_CLK_TCK 2 +-#define _SC_NGROUPS_MAX 3 +-#define _SC_OPEN_MAX 4 +-#define _SC_STREAM_MAX 5 +-#define _SC_TZNAME_MAX 6 +-#define _SC_JOB_CONTROL 7 +-#define _SC_SAVED_IDS 8 +-#define _SC_VERSION 9 +- +-/* POSIX.1(1990), Table 2-3, required by command getconf */ +- +-#define _SC_POSIX_ARG_MAX 10 +-#define _SC_POSIX_CHILD_MAX 11 +-#define _SC_POSIX_LINK_MAX 12 +-#define _SC_POSIX_MAX_CANON 13 +-#define _SC_POSIX_MAX_INPUT 14 +-#define _SC_POSIX_NAME_MAX 15 +-#define _SC_POSIX_NGROUPS_MAX 16 +-#define _SC_POSIX_OPEN_MAX 17 +-#define _SC_POSIX_PATH_MAX 18 +-#define _SC_POSIX_PIPE_BUF 19 +-#define _SC_POSIX_SSIZE_MAX 20 +-#define _SC_POSIX_STREAM_MAX 21 +-#define _SC_POSIX_TZNAME_MAX 22 +- +-/* POSIX.2 (Draft 10), Table 41) */ +- +-#define _SC_BC_BASE_MAX 23 +-#define _SC_BC_DIM_MAX 24 +-#define _SC_BC_SCALE_MAX 25 +-#define _SC_BC_STRING_MAX 26 +-#define _SC_EQUIV_CLASS_MAX 27 +-#define _SC_EXPR_NEST_MAX 28 +-#define _SC_LINE_MAX 29 +-#define _SC_RE_DUP_MAX 30 +-#define _SC_2_VERSION 31 +-#define _SC_2_C_DEV 32 +-#define _SC_2_FORT_DEV 33 +-#define _SC_2_FORT_RUN 34 +-#define _SC_2_LOCALEDEF 35 +-#define _SC_2_SW_DEV 36 +- +-/* POSIX.2 (Draft 10), Table 13) */ +- +-#define _SC_POSIX2_BC_BASE_MAX 37 +-#define _SC_POSIX2_BC_DIM_MAX 38 +-#define _SC_POSIX2_BC_SCALE_MAX 39 +-#define _SC_POSIX2_BC_STRING_MAX 40 +-#define _SC_POSIX2_EQUIV_CLASS_MAX 41 +-#define _SC_POSIX2_EXPR_NEST_MAX 42 +-#define _SC_POSIX2_LINE_MAX 43 +-#define _SC_POSIX2_RE_DUP_MAX 44 +-#define _SC_PASS_MAX 45 +-#define _SC_XOPEN_VERSION 46 +-#define _SC_ATEXIT_MAX 47 +-#if _XOPEN_SOURCE_EXTENDED==1 +-#define _SC_PAGE_SIZE 48 +-#endif /* _XOPEN_SOURCE_EXTENDED */ +-#define _SC_AES_OS_VERSION 49 +-#define _SC_COLL_WEIGHTS_MAX 50 +-#define _SC_2_C_BIND 51 +-#define _SC_2_C_VERSION 52 +-#define _SC_2_UPE 53 +-#define _SC_2_CHAR_TERM 54 +-#define _SC_XOPEN_SHM 55 +-#define _SC_XOPEN_CRYPT 56 +-#define _SC_XOPEN_ENH_I18N 57 +-#if _XOPEN_SOURCE_EXTENDED==1 +-#define _SC_PAGESIZE _SC_PAGE_SIZE +-#define _SC_IOV_MAX 58 +-#endif /* _XOPEN_SOURCE_EXTENDED */ +-#define _SC_THREAD_SAFE_FUNCTIONS 59 +-#define _SC_THREADS 60 +-#define _SC_THREAD_ATTR_STACKADDR 61 +-#define _SC_THREAD_ATTR_STACKSIZE 62 +-#define _SC_THREAD_FORKALL 63 +-#define _SC_THREAD_PRIORITY_SCHEDULING 64 +-#define _SC_THREAD_PRIO_INHERIT 65 +-#define _SC_THREAD_PRIO_PROTECT 66 +-#define _SC_THREAD_PROCESS_SHARED 67 +-#define _SC_THREAD_KEYS_MAX 68 +-#define _SC_THREAD_DATAKEYS_MAX _SC_THREAD_KEYS_MAX +-#define _SC_THREAD_STACK_MIN 69 +-#define _SC_THREAD_THREADS_MAX 70 +-#ifdef _ALL_SOURCE +-#define _SC_NPROCESSORS_CONF 71 +-#define _SC_NPROCESSORS_ONLN 72 +-#endif /* _ALL_SOURCE */ +-#define _SC_XOPEN_UNIX 73 +- +-#if (_XOPEN_SOURCE >= 500) +- +-/* POSIX 1003.1c and XPG UNIX98 */ +-/* look to defines above for meanings */ +-#define _SC_AIO_LISTIO_MAX 75 +-#define _SC_AIO_MAX 76 +-#define _SC_AIO_PRIO_DELTA_MAX 77 +-#define _SC_ASYNCHRONOUS_IO 78 +-#define _SC_DELAYTIMER_MAX 79 +-#define _SC_FSYNC 80 +-#define _SC_GETGR_R_SIZE_MAX 81 +-#define _SC_GETPW_R_SIZE_MAX 82 +-#define _SC_LOGIN_NAME_MAX 83 +-#define _SC_MAPPED_FILES 84 +-#define _SC_MEMLOCK 85 +-#define _SC_MEMLOCK_RANGE 86 +-#define _SC_MEMORY_PROTECTION 87 +-#define _SC_MESSAGE_PASSING 88 +-#define _SC_MQ_OPEN_MAX 89 +-#define _SC_MQ_PRIO_MAX 90 +-#define _SC_PRIORITIZED_IO 91 +-#define _SC_PRIORITY_SCHEDULING 92 +-#define _SC_REALTIME_SIGNALS 93 +-#define _SC_RTSIG_MAX 94 +-#define _SC_SEMAPHORES 95 +-#define _SC_SEM_NSEMS_MAX 96 +-#define _SC_SEM_VALUE_MAX 97 +-#define _SC_SHARED_MEMORY_OBJECTS 98 +-#define _SC_SIGQUEUE_MAX 99 +-#define _SC_SYNCHRONIZED_IO 100 +-#define _SC_THREAD_DESTRUCTOR_ITERATIONS 101 +-#define _SC_TIMERS 102 +-#define _SC_TIMER_MAX 103 +-#define _SC_TTY_NAME_MAX 104 +-#define _SC_XBS5_ILP32_OFF32 105 +-#define _SC_XBS5_ILP32_OFFBIG 106 +-#define _SC_XBS5_LP64_OFF64 107 +-#define _SC_XBS5_LPBIG_OFFBIG 108 +-#define _SC_XOPEN_XCU_VERSION 109 +-#define _SC_XOPEN_REALTIME 110 +-#define _SC_XOPEN_REALTIME_THREADS 111 +-#define _SC_XOPEN_LEGACY 112 +-#endif /* _XOPEN_SOURCE >= 500 */ +- +-#ifdef _ALL_SOURCE +-#define _SC_REENTRANT_FUNCTIONS _SC_THREAD_SAFE_FUNCTIONS +-#define _SC_PHYS_PAGES 113 +-#define _SC_AVPHYS_PAGES 114 +-#define _SC_LPAR_ENABLED 115 +-#define _SC_LARGE_PAGESIZE 116 +-#endif /* _ALL_SOURCE */ +- +-#define _SC_AIX_KERNEL_BITMODE 117 +-#define _SC_AIX_REALMEM 118 +-#define _SC_AIX_HARDWARE_BITMODE 119 +-#define _SC_AIX_MP_CAPABLE 120 +- +-#define _SC_V6_ILP32_OFF32 121 +-#define _SC_V6_ILP32_OFFBIG 122 +-#define _SC_V6_LP64_OFF64 123 +-#define _SC_V6_LPBIG_OFFBIG 124 +- +-#define _SC_XOPEN_STREAMS 125 +- +-#if (_POSIX_C_SOURCE >= 200112L) +-#define _SC_HOST_NAME_MAX 126 +-#define _SC_REGEXP 127 +-#define _SC_SHELL 128 +-#define _SC_SYMLOOP_MAX 129 +-#define _SC_ADVISORY_INFO 130 +-#define _SC_FILE_LOCKING 131 +-#define _SC_2_PBS 132 +-#define _SC_2_PBS_ACCOUNTING 133 +-#define _SC_2_PBS_CHECKPOINT 134 +-#define _SC_2_PBS_LOCATE 135 +-#define _SC_2_PBS_MESSAGE 136 +-#define _SC_2_PBS_TRACK 137 +-#define _SC_BARRIERS 138 +-#define _SC_CLOCK_SELECTION 139 +-#define _SC_CPUTIME 140 +-#define _SC_MONOTONIC_CLOCK 141 +-#define _SC_READER_WRITER_LOCKS 142 +-#define _SC_SPAWN 143 +-#define _SC_SPIN_LOCKS 144 +-#define _SC_SPORADIC_SERVER 145 +-#define _SC_THREAD_CPUTIME 146 +-#define _SC_THREAD_SPORADIC_SERVER 147 +-#define _SC_TIMEOUTS 148 +-#define _SC_TRACE 149 +-#define _SC_TRACE_EVENT_FILTER 150 +-#define _SC_TRACE_INHERIT 151 +-#define _SC_TRACE_LOG 152 +-#define _SC_TYPED_MEMORY_OBJECTS 153 +-#define _SC_IPV6 154 +-#define _SC_RAW_SOCKETS 155 +-#define _SC_SS_REPL_MAX 156 +-#define _SC_TRACE_EVENT_NAME_MAX 157 +-#define _SC_TRACE_NAME_MAX 158 +-#define _SC_TRACE_SYS_MAX 159 +-#define _SC_TRACE_USER_EVENT_MAX 160 +-#endif /* _POSIX_C_SOURCE >= 200112L */ +- +-#ifdef _ALL_SOURCE +-#define _SC_AIX_UKEYS 161 +-#endif /* _ALL_SOURCE */ +- +-#endif /* _POSIX_SOURCE */ +- +- +-#if _XOPEN_SOURCE_EXTENDED==1 +-#ifdef _LARGE_FILES +-#define ftruncate ftruncate64 +-#define truncate truncate64 +-#endif +- +-#ifndef _H_LOCKF +-#include /* lockf definitions for portability */ +-#endif +- +-#ifdef _NO_PROTO +-#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE<200112L) || defined(_ALL_SOURCE) +- extern int brk(); +- extern int getpagesize(); +-#ifndef _MSGQSUPPORT +- extern int __fd_getdtablesize(); +- static int getdtablesize() +- { +- return __fd_getdtablesize(); +- } +-#else +- extern int getdtablesize(); +-#endif /* _MSGQSUPPORT */ +- +- extern void *sbrk(); +-#endif /* _POSIX_C_SOURCE<200112L */ +- extern int fchdir(); +- extern int fchown(); +- extern int ftruncate(); +- extern long gethostid(); +- extern int gethostname(); +- extern pid_t getpgid(); +- extern pid_t getsid(); +- extern char *getwd(); +- extern int lchown(); +- extern int readlink(); +- extern pid_t setpgrp(); +- extern int setregid(); +- extern int setreuid(); +- extern int symlink(); +- extern void sync(); +- extern int truncate(); +- extern useconds_t ualarm(); +- extern int usleep(); +- extern pid_t vfork(); +-#else /* _NO_PROTO */ +-#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE<200112L) || defined(_ALL_SOURCE) +- extern int brk(void *); +- extern int getpagesize(void); +-#ifndef _MSGQSUPPORT +- extern int __fd_getdtablesize(void); +- static int getdtablesize() +- { +- return __fd_getdtablesize(); +- } +-#else +- extern int getdtablesize(void); +-#endif /* _MSGQSUPPORT */ +-#ifdef _LINUX_SOURCE_COMPAT +- extern void *sbrk(ptrdiff_t); +-#elif (_XOPEN_SOURCE >= 500) || defined(__64BIT__) +- extern void *sbrk(intptr_t); +-#else +- extern void *sbrk(int); +-#endif +-#endif /* _POSIX_C_SOURCE<200112L */ +- extern int fchdir(int); +- extern int fchown(int, uid_t, gid_t); +- extern int ftruncate(int, off_t); +-#ifdef _LARGE_FILE_API +- extern int ftruncate64(int, off64_t); +-#endif +- extern int gethostname(char *, size_t); +- extern long gethostid(void); +- extern pid_t getpgid(pid_t); +- extern pid_t getsid(pid_t); +- extern char *getwd(char *); +- extern int lchown(const char *, uid_t, gid_t); +- +-#if (defined(_SUSV3_READLINK) || \ +- (!defined(_ALL_SOURCE) && (_POSIX_C_SOURCE >= 200112L))) +- /* If SUSV3 readlink specifically requested or if strict SUSv3 +- * environment requested */ +-#ifdef __64BIT__ +-static ssize_t readlink(const char *__restrict__ __path, +- char *__restrict__ __buf, size_t __bufsize) +-{ +- extern ssize_t __readlink64(const char *__restrict__, char *__restrict__, size_t); +- return __readlink64(__path, __buf, __bufsize); +-} +-#else +- extern ssize_t readlink(const char *__restrict__, char *__restrict__, size_t); +-#endif /* __64BIT__ */ +-#else +- extern int readlink(const char *, char *, size_t); +-#endif /* _SUSV3_READLINK || !_ALL_SOURCE && _POSIX_C_SOURCE >= 200112L */ +- +-#ifndef _BSD +- extern pid_t setpgrp(void); +-#endif /* _BSD */ +- extern int setregid(gid_t, gid_t); +- extern int setreuid(uid_t, uid_t); +- extern int symlink(const char *, const char *); +- extern void sync(void); +- extern int truncate(const char *, off_t); +-#ifdef _LARGE_FILE_API +- extern int truncate64(const char *, off64_t); +-#endif +- extern useconds_t ualarm(useconds_t, useconds_t); +- extern int usleep(useconds_t); +- extern pid_t vfork(void); +-#if _XOPEN_SOURCE>=500 +- extern int getlogin_r(char *, size_t); +- extern int ttyname_r(int, char *, size_t); +- +-#ifdef _LARGE_FILES +-#define pread pread64 +-#define pwrite pwrite64 +-#endif /* _LARGE_FILES */ +- +- extern ssize_t pread(int, void *, size_t, off_t); +- extern ssize_t pwrite(int, const void *, size_t, off_t); +-#ifdef _LARGE_FILE_API +- extern ssize_t pread64(int, void *, size_t, off64_t); +- extern ssize_t pwrite64(int, const void *, size_t, off64_t); +-#endif /* _LARGE_FILE_API */ +-#endif /* _XOPEN_SOURCE>=500 */ +- +-#endif /* _NO_PROTO */ +- +-#endif /* _XOPEN_SOURCE_EXTENDED */ +- +-#ifdef _ALL_SOURCE +- +-extern char **environ; +- +-#ifndef _KERNEL +-#ifdef _NO_PROTO +- extern pid_t f_fork(); +-#else /* _NO_PROTO */ +- extern pid_t f_fork(void); +-#endif /* _NO_PROTO */ +-#endif /* _KERNEL */ +- +-#ifdef _NO_PROTO +- extern char * cuserid(); +- extern int ioctl(); +-#ifdef __64BIT__ +- extern int ioctlx(); +- extern int ioctl32(); +- extern int ioctl32x(); +-#endif /* __64BIT__ */ +- extern int readx(); +- extern int setgroups(); +- extern int writex(); +- extern int setegid(); +- extern int seteuid(); +- extern int setrgid(); +- extern int setruid(); +- extern offset_t llseek(); +- extern char * getusershell(); +- extern void setusershell(); +- extern void endusershell(); +- extern char * get_current_dir_name(); +- extern int sysfs(); +-#else +- extern char * cuserid(char *); +- extern int setegid(gid_t); +- extern int seteuid(uid_t); +- extern int setrgid(gid_t); +- extern int setruid(uid_t); +-#ifndef _BSD +- extern int ioctl(int, int, ...); +-#endif /* _BSD */ +-#ifdef __64BIT__ +- extern int ioctlx(int, int, void *, long); +- extern int ioctl32(int, int, ...); +- extern int ioctl32x(int, int, unsigned int, unsigned int); +-#endif /* __64BIT__ */ +- extern int setgroups(int, gid_t []); +-#ifndef _KERNEL +- extern int readx(int, char*, unsigned, long); +- extern int writex(int, char*, unsigned, long); +- +-#ifdef _LARGE_FILES +-#define fclear fclear64 +-#define fsync_range fsync_range64 +-#endif +- extern off_t fclear(int, off_t); +- extern int fsync_range(int, int, off_t, off_t); +-#ifdef _LARGE_FILE_API +- extern off64_t fclear64(int, off64_t); +- extern int fsync_range64(int, int, off64_t, off64_t); +-#endif +- extern offset_t llseek(int, offset_t, int); +- extern char * getusershell(void); +- extern void setusershell(void); +- extern void endusershell(void); +- extern char * get_current_dir_name(void); +- extern int sysfs(int, ...); +- extern int finfo(const char *, int, void *, int32long64_t); +- extern int ffinfo(int, int, void *, int32long64_t); +- +-#endif /* ndef _KERNEL */ +- +-#endif /* _NO_PROTO */ +- +-#define _AES_OS_VERSION 1 /* OSF, AES version */ +- +-#endif /* _ALL_SOURCE */ +- +-#ifdef __cplusplus +-} +-#endif +- +-#endif /* _H_UNISTD */ +diff --git a/opencl/lavaMD/kernel/kernel_gpu_opencl.cl b/opencl/lavaMD/kernel/kernel_gpu_opencl.cl +index 9e48e01329..9a678e636e 100755 +--- a/opencl/lavaMD/kernel/kernel_gpu_opencl.cl ++++ b/opencl/lavaMD/kernel/kernel_gpu_opencl.cl +@@ -105,6 +105,11 @@ + // DO FOR THE NUMBER OF BOXES + //--------------------------------------------------------------------------------------------------------------------------------------------------------------------------180 + ++ // (enable the three lines below only if wanting to use shared memory) ++ __local FOUR_VECTOR rA_shared[100]; ++ __local FOUR_VECTOR rB_shared[100]; ++ __local fp qB_shared[100]; ++ + if(bx // (in path known to compiler) needed by printf + #include // (in path known to compiler) needed by malloc + #include // (in path known to compiler) needed by true/false ++#include ++#include + + //======================================================================================================================================================150 + // UTILITIES +diff --git a/opencl/lavaMD/util/timer/timer.c b/opencl/lavaMD/util/timer/timer.c +index c7cc252b4e..59ce114f19 100755 +--- a/opencl/lavaMD/util/timer/timer.c ++++ b/opencl/lavaMD/util/timer/timer.c +@@ -11,6 +11,7 @@ + //======================================================================================================================================================150 + + #include ++#include + + //======================================================================================================================================================150 + // FUNCTIONS +diff --git a/opencl/leukocyte/OpenCL/find_ellipse_opencl.c b/opencl/leukocyte/OpenCL/find_ellipse_opencl.c +index 0708074396..a1f57a2d49 100755 +--- a/opencl/leukocyte/OpenCL/find_ellipse_opencl.c ++++ b/opencl/leukocyte/OpenCL/find_ellipse_opencl.c +@@ -239,7 +239,7 @@ + + // Create an OpenCL context + cl_context_properties ctxprop[] = { CL_CONTEXT_PLATFORM, (cl_context_properties) platform_ids[i], 0}; +- context = clCreateContextFromType(ctxprop, CL_DEVICE_TYPE_GPU, NULL, NULL, &error); ++ context = clCreateContextFromType(ctxprop, CL_DEVICE_TYPE_ALL, NULL, NULL, &error); + // If this platform has no GPU, try the next one + if (error == CL_DEVICE_NOT_FOUND) continue; + check_error(error, __FILE__, __LINE__); +diff --git a/opencl/leukocyte/meschach_lib/err.c b/opencl/leukocyte/meschach_lib/err.c +index c4f697f521..ee7708a7aa 100755 +--- a/opencl/leukocyte/meschach_lib/err.c ++++ b/opencl/leukocyte/meschach_lib/err.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include "err.h" + + +diff --git a/opencl/leukocyte/meschach_lib/matrix.h b/opencl/leukocyte/meschach_lib/matrix.h +index 651fb7fb5b..1cb0664a99 100755 +--- a/opencl/leukocyte/meschach_lib/matrix.h ++++ b/opencl/leukocyte/meschach_lib/matrix.h +@@ -34,6 +34,7 @@ + + #define MATRIXH + ++#include + #include "machine.h" + #include "err.h" + #include "meminfo.h" +diff --git a/opencl/leukocyte/meschach_lib/sparseio.c b/opencl/leukocyte/meschach_lib/sparseio.c +index c4003b189d..d654973267 100755 +--- a/opencl/leukocyte/meschach_lib/sparseio.c ++++ b/opencl/leukocyte/meschach_lib/sparseio.c +@@ -30,6 +30,7 @@ + */ + + #include ++#include + #include "sparse.h" + + static char rcsid[] = "$Id: sparseio.c,v 1.4 1994/01/13 05:34:25 des Exp $"; +diff --git a/opencl/lud/common/common.c b/opencl/lud/common/common.c +index c7c95996c5..c70f07ec7a 100644 +--- a/opencl/lud/common/common.c ++++ b/opencl/lud/common/common.c +@@ -177,13 +177,20 @@ + /* printf("\n"); */ + /* } */ + ++ func_ret_t ret_val = RET_SUCCESS; ++ + for (i=0; i 0.0001) ++ if ( fabs(m[i*matrix_dim+j]-tmp[i*matrix_dim+j]) > 0.0001) { ++ + printf("dismatch at (%d, %d): (o)%f (n)%f\n", i, j, m[i*matrix_dim+j], tmp[i*matrix_dim+j]); ++ ret_val = RET_FAILURE; ++ } + } + } + free(tmp); ++ ++ return ret_val; + } + + void +diff --git a/opencl/lud/ocl/lud.cpp b/opencl/lud/ocl/lud.cpp +index d491ba7f8b..1bdea1b013 100755 +--- a/opencl/lud/ocl/lud.cpp ++++ b/opencl/lud/ocl/lud.cpp +@@ -197,7 +197,7 @@ + fclose(fp); + + // Use 1: GPU 0: CPU +- int use_gpu = 1; ++ int use_gpu = 0; + // OpenCL initialization + if(initialize(use_gpu)) return -1; + // compile kernel +diff --git a/opencl/nn/run b/opencl/nn/run +index e4d2f27e96..b95faa78ac 100755 +--- a/opencl/nn/run ++++ b/opencl/nn/run +@@ -1,1 +1,1 @@ +-./nn filelist.txt -r 5 -lat 30 -lng 90 +\ No newline at end of file ++echo "0 0" | ./nn filelist.txt -r 5 -lat 30 -lng 90 +diff --git a/opencl/nw/nw.c b/opencl/nw/nw.c +index cb7471c526..c713ccd605 100755 +--- a/opencl/nw/nw.c ++++ b/opencl/nw/nw.c +@@ -223,7 +223,7 @@ + size_t local_work[3] = { (workgroupsize>0)?workgroupsize:1, 1, 1 }; + size_t global_work[3] = { nworkitems, 1, 1 }; //nworkitems = no. of GPU threads + +- int use_gpu = 1; ++ int use_gpu = 0; + // OpenCL initialization + if(initialize(use_gpu)) return -1; + +diff --git a/opencl/particlefilter/ex_particle_OCL_double_seq.cpp b/opencl/particlefilter/ex_particle_OCL_double_seq.cpp +index c3e57aa110..d9d2bb20f8 100644 +--- a/opencl/particlefilter/ex_particle_OCL_double_seq.cpp ++++ b/opencl/particlefilter/ex_particle_OCL_double_seq.cpp +@@ -510,7 +510,7 @@ + fclose(fp); + + // OpenCL initialization +- int use_gpu = 1; ++ int use_gpu = 0; + if (initialize(use_gpu)) return -1; + + // compile kernel +@@ -958,6 +958,8 @@ + free(CDF); + free(ind); + free(u); ++ ++ return 0; + } + + int main(int argc, char * argv[]) { +diff --git a/opencl/particlefilter/ex_particle_OCL_naive_seq.cpp b/opencl/particlefilter/ex_particle_OCL_naive_seq.cpp +index fcd801397e..cf0aa0e42c 100644 +--- a/opencl/particlefilter/ex_particle_OCL_naive_seq.cpp ++++ b/opencl/particlefilter/ex_particle_OCL_naive_seq.cpp +@@ -453,7 +453,7 @@ + fclose(fp); + + // OpenCL initialization +- int use_gpu = 1; ++ int use_gpu = 0; + if (initialize(use_gpu)) return -1; + + // compile kernel +@@ -768,6 +768,8 @@ + free(CDF); + free(u); + free(ind); ++ ++ return 0; + } + + int main(int argc, char * argv[]) { +diff --git a/opencl/particlefilter/ex_particle_OCL_single_seq.cpp b/opencl/particlefilter/ex_particle_OCL_single_seq.cpp +index 57eb15e83b..185fff7959 100644 +--- a/opencl/particlefilter/ex_particle_OCL_single_seq.cpp ++++ b/opencl/particlefilter/ex_particle_OCL_single_seq.cpp +@@ -510,7 +510,7 @@ + fclose(fp); + + // OpenCL initialization +- int use_gpu = 1; ++ int use_gpu = 0; + if (initialize(use_gpu)) return -1; + + // compile kernel +@@ -958,6 +958,8 @@ + free(CDF); + free(ind); + free(u); ++ ++ return 0; + } + + int main(int argc, char * argv[]) { +diff --git a/opencl/pathfinder/main.cpp b/opencl/pathfinder/main.cpp +index 5f79ba08df..a0af9b06a0 100755 +--- a/opencl/pathfinder/main.cpp ++++ b/opencl/pathfinder/main.cpp +@@ -103,7 +103,7 @@ + + // Create and initialize the OpenCL object. + OpenCL cl(1); // 1 means to display output (debugging mode). +- cl.init(1); // 1 means to use GPU. 0 means use CPU. ++ cl.init(0); // 1 means to use GPU. 0 means use CPU. + cl.gwSize(rows * cols); + + // Create and build the kernel. +diff --git a/opencl/pathfinder/makefile b/opencl/pathfinder/makefile +index 32bd8eff07..e046da7065 100755 +--- a/opencl/pathfinder/makefile ++++ b/opencl/pathfinder/makefile +@@ -4,7 +4,7 @@ + # You will need to modify the following 2 lines + # by inserting the correct path to the OpenCL + # lib and inc directories. +-CXXFLAGS = -I$(OPENCL_INC) -c $(DEBUGFLAGS) ++CXXFLAGS = -I$(OPENCL_INC) -c $(DEBUGFLAGS) -std=c++98 + LINKFLAGS = -L$(OPENCL_LIB) + + # link objects(binaries) together +diff --git a/opencl/srad/util/timer/timer.c b/opencl/srad/util/timer/timer.c +index 61037769e5..1c91997911 100755 +--- a/opencl/srad/util/timer/timer.c ++++ b/opencl/srad/util/timer/timer.c +@@ -7,6 +7,7 @@ + //===============================================================================================================================================================================================================200 + + #include ++#include + + //===============================================================================================================================================================================================================200 + // INCLUDE HEADER +diff --git a/opencl/streamcluster/Makefile b/opencl/streamcluster/Makefile +index e1bf1f23f7..6a607458bf 100755 +--- a/opencl/streamcluster/Makefile ++++ b/opencl/streamcluster/Makefile +@@ -4,7 +4,7 @@ + CC = g++ + + +-FLAGS = -O3 ++FLAGS = -O3 -std=c++98 + SRC = streamcluster.cpp + EXE = streamcluster + +diff --git a/opencl/streamcluster/run b/opencl/streamcluster/run +index 5200af0039..64600f2a24 100755 +--- a/opencl/streamcluster/run ++++ b/opencl/streamcluster/run +@@ -1,8 +1,9 @@ ++#!/usr/bin/env bash + #./streamcluster 10 20 16 2048000 204800 1000 none output.txt 1 + + for (( i = 1, j=1; i <= 1; i++, j=j*2 )) + do + #echo `expr $j \* 10240` `expr $j \* 1024` + #./sc_gpu 10 20 16 `expr $j \* 10240` `expr $j \* 1024` 1000 none output.txt 1 +- ./streamcluster 10 20 256 65536 65536 1000 none output.txt 1 -t gpu -d 0 ++ ./streamcluster 10 20 256 65536 65536 1000 none output.txt 1 -t cpu -d 0 + done diff --git a/pkgs/rodinia/rodinia-rm.patch b/pkgs/rodinia/rodinia-rm.patch new file mode 100644 index 0000000..0d31cbd --- /dev/null +++ b/pkgs/rodinia/rodinia-rm.patch @@ -0,0 +1,1880 @@ +From 1d468e5cf63ac7dd378cf5fa7d37ed22fbdce5f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Aleix=20Bon=C3=A9?= +Date: Wed, 17 Jul 2024 10:00:22 +0200 +Subject: [PATCH] fix: /bin/rm -> rm + +--- + .../meschach_lib/MACHINES/Cray/makefile | 20 +++++++++---------- + .../meschach_lib/MACHINES/GCC/makefile | 12 +++++------ + .../meschach_lib/MACHINES/Linux/makefile | 14 ++++++------- + .../meschach_lib/MACHINES/MicroSoft/makefile | 20 +++++++++---------- + .../meschach_lib/MACHINES/OS2/makefile | 8 ++++---- + .../meschach_lib/MACHINES/RS6000/makefile | 14 ++++++------- + .../meschach_lib/MACHINES/SGI/makefile | 20 +++++++++---------- + .../meschach_lib/MACHINES/SPARC/makefile | 12 +++++------ + cuda/leukocyte/meschach_lib/makefile | 14 ++++++------- + cuda/leukocyte/meschach_lib/makefile.in | 20 +++++++++---------- + .../meschach_lib/MACHINES/Cray/makefile | 20 +++++++++---------- + .../meschach_lib/MACHINES/GCC/makefile | 12 +++++------ + .../meschach_lib/MACHINES/Linux/makefile | 14 ++++++------- + .../meschach_lib/MACHINES/MicroSoft/makefile | 20 +++++++++---------- + .../meschach_lib/MACHINES/OS2/makefile | 8 ++++---- + .../meschach_lib/MACHINES/RS6000/makefile | 14 ++++++------- + .../meschach_lib/MACHINES/SGI/makefile | 20 +++++++++---------- + .../meschach_lib/MACHINES/SPARC/makefile | 12 +++++------ + opencl/leukocyte/meschach_lib/makefile | 14 ++++++------- + opencl/leukocyte/meschach_lib/makefile.in | 20 +++++++++---------- + .../meschach_lib/MACHINES/Cray/makefile | 20 +++++++++---------- + .../meschach_lib/MACHINES/GCC/makefile | 12 +++++------ + .../meschach_lib/MACHINES/Linux/makefile | 14 ++++++------- + .../meschach_lib/MACHINES/MicroSoft/makefile | 20 +++++++++---------- + .../meschach_lib/MACHINES/OS2/makefile | 8 ++++---- + .../meschach_lib/MACHINES/RS6000/makefile | 14 ++++++------- + .../meschach_lib/MACHINES/SGI/makefile | 20 +++++++++---------- + .../meschach_lib/MACHINES/SPARC/makefile | 12 +++++------ + openmp/leukocyte/meschach_lib/makefile | 14 ++++++------- + openmp/leukocyte/meschach_lib/makefile.in | 20 +++++++++---------- + 30 files changed, 231 insertions(+), 231 deletions(-) + +diff --git a/cuda/leukocyte/meschach_lib/MACHINES/Cray/makefile b/cuda/leukocyte/meschach_lib/MACHINES/Cray/makefile +index d12d7f2..4364fe0 100755 +--- a/cuda/leukocyte/meschach_lib/MACHINES/Cray/makefile ++++ b/cuda/leukocyte/meschach_lib/MACHINES/Cray/makefile +@@ -110,7 +110,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -145,7 +145,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -161,7 +161,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -172,15 +172,15 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a +- /bin/rm -f torture sptort ztorture memtort itertort mfuntort iotort +- /bin/rm -f makefile machine.h config.status maxint macheps ++ rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f torture sptort ztorture memtort itertort mfuntort iotort ++ rm -f makefile machine.h config.status maxint macheps + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/cuda/leukocyte/meschach_lib/MACHINES/GCC/makefile b/cuda/leukocyte/meschach_lib/MACHINES/GCC/makefile +index b8860f0..f30bf64 100755 +--- a/cuda/leukocyte/meschach_lib/MACHINES/GCC/makefile ++++ b/cuda/leukocyte/meschach_lib/MACHINES/GCC/makefile +@@ -101,7 +101,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -113,7 +113,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -124,7 +124,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -133,7 +133,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -149,10 +149,10 @@ shar: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/cuda/leukocyte/meschach_lib/MACHINES/Linux/makefile b/cuda/leukocyte/meschach_lib/MACHINES/Linux/makefile +index 6e8de4e..7e680e1 100755 +--- a/cuda/leukocyte/meschach_lib/MACHINES/Linux/makefile ++++ b/cuda/leukocyte/meschach_lib/MACHINES/Linux/makefile +@@ -100,7 +100,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -113,7 +113,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -125,7 +125,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -151,7 +151,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -162,10 +162,10 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/cuda/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile b/cuda/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile +index 6be89d4..bc9d516 100755 +--- a/cuda/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile ++++ b/cuda/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile +@@ -110,7 +110,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -145,7 +145,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -161,7 +161,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -172,16 +172,16 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def ++ rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def +- /bin/rm -f torture.exe sptort.exe ztorture.exe memtort.exe \ ++ rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def ++ rm -f torture.exe sptort.exe ztorture.exe memtort.exe \ + itertort.exe mfuntort.exe iotort.exe +- /bin/rm -f maxint.exe macheps.exe ++ rm -f maxint.exe macheps.exe + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + + torture:torture.o libmeschach.a +diff --git a/cuda/leukocyte/meschach_lib/MACHINES/OS2/makefile b/cuda/leukocyte/meschach_lib/MACHINES/OS2/makefile +index 09498e8..d503acc 100755 +--- a/cuda/leukocyte/meschach_lib/MACHINES/OS2/makefile ++++ b/cuda/leukocyte/meschach_lib/MACHINES/OS2/makefile +@@ -111,7 +111,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -134,7 +134,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -143,7 +143,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +diff --git a/cuda/leukocyte/meschach_lib/MACHINES/RS6000/makefile b/cuda/leukocyte/meschach_lib/MACHINES/RS6000/makefile +index 1398df9..6723d2c 100755 +--- a/cuda/leukocyte/meschach_lib/MACHINES/RS6000/makefile ++++ b/cuda/leukocyte/meschach_lib/MACHINES/RS6000/makefile +@@ -102,7 +102,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -115,7 +115,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -127,7 +127,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -137,7 +137,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -153,7 +153,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -164,10 +164,10 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/cuda/leukocyte/meschach_lib/MACHINES/SGI/makefile b/cuda/leukocyte/meschach_lib/MACHINES/SGI/makefile +index f0a3b16..034f8a4 100755 +--- a/cuda/leukocyte/meschach_lib/MACHINES/SGI/makefile ++++ b/cuda/leukocyte/meschach_lib/MACHINES/SGI/makefile +@@ -110,7 +110,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -145,7 +145,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -161,7 +161,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -172,15 +172,15 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a +- /bin/rm -f torture sptort ztorture memtort itertort mfuntort iotort +- /bin/rm -f makefile machine.h config.status maxint macheps ++ rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f torture sptort ztorture memtort itertort mfuntort iotort ++ rm -f makefile machine.h config.status maxint macheps + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/cuda/leukocyte/meschach_lib/MACHINES/SPARC/makefile b/cuda/leukocyte/meschach_lib/MACHINES/SPARC/makefile +index 71b0c9c..62160b4 100755 +--- a/cuda/leukocyte/meschach_lib/MACHINES/SPARC/makefile ++++ b/cuda/leukocyte/meschach_lib/MACHINES/SPARC/makefile +@@ -100,7 +100,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -112,7 +112,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -132,7 +132,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -148,10 +148,10 @@ shar: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/cuda/leukocyte/meschach_lib/makefile b/cuda/leukocyte/meschach_lib/makefile +index 08bf06e..efb8913 100755 +--- a/cuda/leukocyte/meschach_lib/makefile ++++ b/cuda/leukocyte/meschach_lib/makefile +@@ -102,7 +102,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -115,7 +115,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -127,7 +127,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -137,7 +137,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -153,7 +153,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -164,10 +164,10 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/cuda/leukocyte/meschach_lib/makefile.in b/cuda/leukocyte/meschach_lib/makefile.in +index 0c1e496..93ea6ef 100755 +--- a/cuda/leukocyte/meschach_lib/makefile.in ++++ b/cuda/leukocyte/meschach_lib/makefile.in +@@ -109,7 +109,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -122,7 +122,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -134,7 +134,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -144,7 +144,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -160,7 +160,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -171,15 +171,15 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a +- /bin/rm -f torture sptort ztorture memtort itertort mfuntort iotort +- /bin/rm -f makefile machine.h config.status maxint macheps ++ rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f torture sptort ztorture memtort itertort mfuntort iotort ++ rm -f makefile machine.h config.status maxint macheps + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/opencl/leukocyte/meschach_lib/MACHINES/Cray/makefile b/opencl/leukocyte/meschach_lib/MACHINES/Cray/makefile +index d12d7f2..4364fe0 100755 +--- a/opencl/leukocyte/meschach_lib/MACHINES/Cray/makefile ++++ b/opencl/leukocyte/meschach_lib/MACHINES/Cray/makefile +@@ -110,7 +110,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -145,7 +145,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -161,7 +161,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -172,15 +172,15 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a +- /bin/rm -f torture sptort ztorture memtort itertort mfuntort iotort +- /bin/rm -f makefile machine.h config.status maxint macheps ++ rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f torture sptort ztorture memtort itertort mfuntort iotort ++ rm -f makefile machine.h config.status maxint macheps + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/opencl/leukocyte/meschach_lib/MACHINES/GCC/makefile b/opencl/leukocyte/meschach_lib/MACHINES/GCC/makefile +index b8860f0..f30bf64 100755 +--- a/opencl/leukocyte/meschach_lib/MACHINES/GCC/makefile ++++ b/opencl/leukocyte/meschach_lib/MACHINES/GCC/makefile +@@ -101,7 +101,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -113,7 +113,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -124,7 +124,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -133,7 +133,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -149,10 +149,10 @@ shar: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/opencl/leukocyte/meschach_lib/MACHINES/Linux/makefile b/opencl/leukocyte/meschach_lib/MACHINES/Linux/makefile +index 6e8de4e..7e680e1 100755 +--- a/opencl/leukocyte/meschach_lib/MACHINES/Linux/makefile ++++ b/opencl/leukocyte/meschach_lib/MACHINES/Linux/makefile +@@ -100,7 +100,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -113,7 +113,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -125,7 +125,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -151,7 +151,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -162,10 +162,10 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/opencl/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile b/opencl/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile +index 6be89d4..bc9d516 100755 +--- a/opencl/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile ++++ b/opencl/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile +@@ -110,7 +110,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -145,7 +145,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -161,7 +161,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -172,16 +172,16 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def ++ rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def +- /bin/rm -f torture.exe sptort.exe ztorture.exe memtort.exe \ ++ rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def ++ rm -f torture.exe sptort.exe ztorture.exe memtort.exe \ + itertort.exe mfuntort.exe iotort.exe +- /bin/rm -f maxint.exe macheps.exe ++ rm -f maxint.exe macheps.exe + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + + torture:torture.o libmeschach.a +diff --git a/opencl/leukocyte/meschach_lib/MACHINES/OS2/makefile b/opencl/leukocyte/meschach_lib/MACHINES/OS2/makefile +index 09498e8..d503acc 100755 +--- a/opencl/leukocyte/meschach_lib/MACHINES/OS2/makefile ++++ b/opencl/leukocyte/meschach_lib/MACHINES/OS2/makefile +@@ -111,7 +111,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -134,7 +134,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -143,7 +143,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +diff --git a/opencl/leukocyte/meschach_lib/MACHINES/RS6000/makefile b/opencl/leukocyte/meschach_lib/MACHINES/RS6000/makefile +index 1398df9..6723d2c 100755 +--- a/opencl/leukocyte/meschach_lib/MACHINES/RS6000/makefile ++++ b/opencl/leukocyte/meschach_lib/MACHINES/RS6000/makefile +@@ -102,7 +102,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -115,7 +115,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -127,7 +127,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -137,7 +137,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -153,7 +153,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -164,10 +164,10 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/opencl/leukocyte/meschach_lib/MACHINES/SGI/makefile b/opencl/leukocyte/meschach_lib/MACHINES/SGI/makefile +index f0a3b16..034f8a4 100755 +--- a/opencl/leukocyte/meschach_lib/MACHINES/SGI/makefile ++++ b/opencl/leukocyte/meschach_lib/MACHINES/SGI/makefile +@@ -110,7 +110,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -145,7 +145,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -161,7 +161,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -172,15 +172,15 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a +- /bin/rm -f torture sptort ztorture memtort itertort mfuntort iotort +- /bin/rm -f makefile machine.h config.status maxint macheps ++ rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f torture sptort ztorture memtort itertort mfuntort iotort ++ rm -f makefile machine.h config.status maxint macheps + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/opencl/leukocyte/meschach_lib/MACHINES/SPARC/makefile b/opencl/leukocyte/meschach_lib/MACHINES/SPARC/makefile +index 71b0c9c..62160b4 100755 +--- a/opencl/leukocyte/meschach_lib/MACHINES/SPARC/makefile ++++ b/opencl/leukocyte/meschach_lib/MACHINES/SPARC/makefile +@@ -100,7 +100,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -112,7 +112,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -132,7 +132,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -148,10 +148,10 @@ shar: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/opencl/leukocyte/meschach_lib/makefile b/opencl/leukocyte/meschach_lib/makefile +index 08bf06e..efb8913 100755 +--- a/opencl/leukocyte/meschach_lib/makefile ++++ b/opencl/leukocyte/meschach_lib/makefile +@@ -102,7 +102,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -115,7 +115,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -127,7 +127,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -137,7 +137,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -153,7 +153,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -164,10 +164,10 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/opencl/leukocyte/meschach_lib/makefile.in b/opencl/leukocyte/meschach_lib/makefile.in +index 0c1e496..93ea6ef 100755 +--- a/opencl/leukocyte/meschach_lib/makefile.in ++++ b/opencl/leukocyte/meschach_lib/makefile.in +@@ -109,7 +109,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -122,7 +122,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -134,7 +134,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -144,7 +144,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -160,7 +160,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -171,15 +171,15 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a +- /bin/rm -f torture sptort ztorture memtort itertort mfuntort iotort +- /bin/rm -f makefile machine.h config.status maxint macheps ++ rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f torture sptort ztorture memtort itertort mfuntort iotort ++ rm -f makefile machine.h config.status maxint macheps + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/openmp/leukocyte/meschach_lib/MACHINES/Cray/makefile b/openmp/leukocyte/meschach_lib/MACHINES/Cray/makefile +index d12d7f2..4364fe0 100755 +--- a/openmp/leukocyte/meschach_lib/MACHINES/Cray/makefile ++++ b/openmp/leukocyte/meschach_lib/MACHINES/Cray/makefile +@@ -110,7 +110,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -145,7 +145,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -161,7 +161,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -172,15 +172,15 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a +- /bin/rm -f torture sptort ztorture memtort itertort mfuntort iotort +- /bin/rm -f makefile machine.h config.status maxint macheps ++ rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f torture sptort ztorture memtort itertort mfuntort iotort ++ rm -f makefile machine.h config.status maxint macheps + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/openmp/leukocyte/meschach_lib/MACHINES/GCC/makefile b/openmp/leukocyte/meschach_lib/MACHINES/GCC/makefile +index b8860f0..f30bf64 100755 +--- a/openmp/leukocyte/meschach_lib/MACHINES/GCC/makefile ++++ b/openmp/leukocyte/meschach_lib/MACHINES/GCC/makefile +@@ -101,7 +101,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -113,7 +113,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -124,7 +124,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -133,7 +133,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -149,10 +149,10 @@ shar: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/openmp/leukocyte/meschach_lib/MACHINES/Linux/makefile b/openmp/leukocyte/meschach_lib/MACHINES/Linux/makefile +index 6e8de4e..7e680e1 100755 +--- a/openmp/leukocyte/meschach_lib/MACHINES/Linux/makefile ++++ b/openmp/leukocyte/meschach_lib/MACHINES/Linux/makefile +@@ -100,7 +100,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -113,7 +113,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -125,7 +125,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -151,7 +151,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -162,10 +162,10 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/openmp/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile b/openmp/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile +index 6be89d4..bc9d516 100755 +--- a/openmp/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile ++++ b/openmp/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile +@@ -110,7 +110,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -145,7 +145,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -161,7 +161,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -172,16 +172,16 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def ++ rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def +- /bin/rm -f torture.exe sptort.exe ztorture.exe memtort.exe \ ++ rm -f *.o core asx5213a.mat iotort.dat *.a *.dll *.def ++ rm -f torture.exe sptort.exe ztorture.exe memtort.exe \ + itertort.exe mfuntort.exe iotort.exe +- /bin/rm -f maxint.exe macheps.exe ++ rm -f maxint.exe macheps.exe + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + + torture:torture.o libmeschach.a +diff --git a/openmp/leukocyte/meschach_lib/MACHINES/OS2/makefile b/openmp/leukocyte/meschach_lib/MACHINES/OS2/makefile +index 09498e8..d503acc 100755 +--- a/openmp/leukocyte/meschach_lib/MACHINES/OS2/makefile ++++ b/openmp/leukocyte/meschach_lib/MACHINES/OS2/makefile +@@ -111,7 +111,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -134,7 +134,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -143,7 +143,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +diff --git a/openmp/leukocyte/meschach_lib/MACHINES/RS6000/makefile b/openmp/leukocyte/meschach_lib/MACHINES/RS6000/makefile +index 1398df9..6723d2c 100755 +--- a/openmp/leukocyte/meschach_lib/MACHINES/RS6000/makefile ++++ b/openmp/leukocyte/meschach_lib/MACHINES/RS6000/makefile +@@ -102,7 +102,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -115,7 +115,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -127,7 +127,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -137,7 +137,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -153,7 +153,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -164,10 +164,10 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/openmp/leukocyte/meschach_lib/MACHINES/SGI/makefile b/openmp/leukocyte/meschach_lib/MACHINES/SGI/makefile +index f0a3b16..034f8a4 100755 +--- a/openmp/leukocyte/meschach_lib/MACHINES/SGI/makefile ++++ b/openmp/leukocyte/meschach_lib/MACHINES/SGI/makefile +@@ -110,7 +110,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -135,7 +135,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -145,7 +145,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -161,7 +161,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -172,15 +172,15 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a +- /bin/rm -f torture sptort ztorture memtort itertort mfuntort iotort +- /bin/rm -f makefile machine.h config.status maxint macheps ++ rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f torture sptort ztorture memtort itertort mfuntort iotort ++ rm -f makefile machine.h config.status maxint macheps + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/openmp/leukocyte/meschach_lib/MACHINES/SPARC/makefile b/openmp/leukocyte/meschach_lib/MACHINES/SPARC/makefile +index 71b0c9c..62160b4 100755 +--- a/openmp/leukocyte/meschach_lib/MACHINES/SPARC/makefile ++++ b/openmp/leukocyte/meschach_lib/MACHINES/SPARC/makefile +@@ -100,7 +100,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -112,7 +112,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -123,7 +123,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -132,7 +132,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -148,10 +148,10 @@ shar: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/openmp/leukocyte/meschach_lib/makefile b/openmp/leukocyte/meschach_lib/makefile +index 08bf06e..efb8913 100755 +--- a/openmp/leukocyte/meschach_lib/makefile ++++ b/openmp/leukocyte/meschach_lib/makefile +@@ -102,7 +102,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -115,7 +115,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -127,7 +127,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -137,7 +137,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -153,7 +153,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -164,10 +164,10 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +diff --git a/openmp/leukocyte/meschach_lib/makefile.in b/openmp/leukocyte/meschach_lib/makefile.in +index 0c1e496..93ea6ef 100755 +--- a/openmp/leukocyte/meschach_lib/makefile.in ++++ b/openmp/leukocyte/meschach_lib/makefile.in +@@ -109,7 +109,7 @@ oldpart: $(OLDLIST) + ####################################### + + tar: +- - /bin/rm -f $(MES_PAK).tar ++ - rm -f $(MES_PAK).tar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -122,7 +122,7 @@ tar: + + # use this only for PC machines + msdos-zip: +- - /bin/rm -f $(MES_PAK).zip ++ - rm -f $(MES_PAK).zip + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -134,7 +134,7 @@ msdos-zip: + + + fullshar: +- - /bin/rm -f $(MES_PAK).shar; ++ - rm -f $(MES_PAK).shar; + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` + chmod 755 configure +@@ -144,7 +144,7 @@ fullshar: + MACHINES DOC > $(MES_PAK).shar + + shar: +- - /bin/rm -f meschach1.shar meschach2.shar meschach3.shar \ ++ - rm -f meschach1.shar meschach2.shar meschach3.shar \ + meschach4.shar oldmeschach.shar meschach0.shar + chmod 644 `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + $(OTHERS) $(HLIST) `echo $(TORTURE) | sed -e 's/\.o/.c/g'` +@@ -160,7 +160,7 @@ shar: + $(HLIST) DOC MACHINES > meschach0.shar + + list: +- /bin/rm -f $(FLIST) ++ rm -f $(FLIST) + ls -lR `echo $(ALL_LISTS) | sed -e 's/\.o/.c/g'` \ + `echo $(TORTURE) | sed -e 's/\.o/.c/g'` \ + $(HLIST) $(OTHERS) MACHINES DOC \ +@@ -171,15 +171,15 @@ list: + + + clean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat ++ rm -f *.o core asx5213a.mat iotort.dat + + cleanup: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f *.o core asx5213a.mat iotort.dat *.a + + realclean: +- /bin/rm -f *.o core asx5213a.mat iotort.dat *.a +- /bin/rm -f torture sptort ztorture memtort itertort mfuntort iotort +- /bin/rm -f makefile machine.h config.status maxint macheps ++ rm -f *.o core asx5213a.mat iotort.dat *.a ++ rm -f torture sptort ztorture memtort itertort mfuntort iotort ++ rm -f makefile machine.h config.status maxint macheps + + alltorture: torture sptort ztorture memtort itertort mfuntort iotort + +-- +2.45.1 +