head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.6
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.4
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.2
	pkgsrc-2011Q4-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2011.09.12.11.15.33;	author dholland;	state dead;
branches;
next	1.1;

1.1
date	2011.08.01.03.54.53;	author dholland;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Add a distfile patch from yours truly, which may become, or may become
part of, a new upstream version, but I need to talk to some people first.
(I'm keeping this separate from the previous update in case it breaks stuff.)

Changes:
	roll in parts of patch-aa and patch-aq;
	roll in all of patch-ar and patch-src_memsize_c;
	make the ARM-only adjustment from patch-ar universal;
	add enough volatile to make 'mhz' work more or less properly again;
	fix the loop calibration to bail out instead of spinning forever
	  if things go too fast (e.g. because the compiler's optimized out
	  the benchmark loop);
	various hacking and modernization to get sort of a clean compile;
	fix some non-stdc stringifying macros;
	hopefully advance the clang build a bit further.
@
text
@$NetBSD: patch-src_memsize_c,v 1.1 2011/08/01 03:54:53 dholland Exp $

Use c89. Fixes broken clang build.

--- src/memsize.c~	1997-06-27 00:35:25.000000000 +0000
+++ src/memsize.c
@@@@ -44,6 +44,7 @@@@ char	*id = "$Id: memsize.c,v 1.8 1997/06
 #define	TOO_LONG	10	/* usecs */
 #endif
 
+int
 main(ac, av)
 	char **av;
 {
@@@@ -91,6 +92,7 @@@@ main(ac, av)
 	exit(0);
 }
 
+void
 timeit(where, size)
 	char	*where;
 {
@@@@ -122,6 +124,7 @@@@ timeit(where, size)
 	printf("%d\n", (size>>20));
 }
 
+void
 touch(char *p, char *end, int range)
 {
 	char	*tmp = p;
@


1.1
log
@Fix broken clang build.
@
text
@d1 1
a1 1
$NetBSD$
@