Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
databases/db6/DESCR Normal file
View File

@@ -0,0 +1,25 @@
Berkeley DB is an embeddable database system that supports keyed access to
data. The software is distributed in source code form, and developers can
compile and link the source code into a single library for inclusion
directly in their applications.
Developers may choose to store data in any of several different storage
structures to satisfy the requirements of a particular application. In
database terminology, these storage structures and the code that operates on
them are called access methods. The library includes support for the
following access methods:
* B+tree: Stores keys in sorted order, using either a programmer-supplied
ordering function or a default function that does lexicographical
ordering of keys. Applications may perform equality or range searches.
* Hashing: Stores records in a hash table for fast searches based on
strict equality. Extended Linear Hashing modifies the hash function
used by the table as new records are inserted, in order to keep buckets
underfull in the steady state.
* Fixed and Variable-Length Records: Stores fixed- or variable-length
records in sequential order. Record numbers may be immutable or
mutable, i.e., permitting new records to be inserted between existing
records or requiring that new records be added only at the end of the
database.
This package privides Berkeley DB 6 released under GNU AGPL3.

53
databases/db6/Makefile Normal file
View File

@@ -0,0 +1,53 @@
# $NetBSD: Makefile,v 1.1 2015/01/01 18:52:52 ryoon Exp $
#
# NOTE:
# When updating this package, a change in the minor (6.n -> 6.(n+1))
# usually incurs a shlib name change. Please make sure to update the
# ABI depends in buildlink3.mk and bump PKGREVISIONs for all dependencies.
# In particular, take care to include BDB_ACCEPTED=db6 packages.
DISTNAME= db-6.1.19
PKGNAME= ${DISTNAME:S/db/db6/}
CATEGORIES= databases
MASTER_SITES= http://download.oracle.com/berkeley-db/
MAINTAINER= ryoon@NetBSD.org
HOMEPAGE= http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
COMMENT= Berkeley DB version 6 from Oracle
LICENSE= gnu-agpl-v3
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= pax
GNU_CONFIGURE= yes
CONFIGURE_DIRS= build_unix
CONFIGURE_SCRIPT= ../dist/configure
CONFIGURE_ARGS+= --enable-compat185
CONFIGURE_ARGS+= --enable-cxx
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db6
CONFIGURE_ARGS+= --program-transform-name=s,db_,db6_,
OPSYSVARS+= LIBSO_LIBS
LIBSO_LIBS.SunOS+= -lnsl -lrt
CONFIGURE_ENV+= LIBSO_LIBS=${LIBSO_LIBS:Q}
CHECK_PORTABILITY_SKIP= test/xa/*/*.sh
# DB5 only want pthreads because it's really after POSIX 1003.1
# inter-process mutexes. In this case, we only care to use the native
# threads.
PTHREAD_OPTS+= native
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.prefs.mk"
PLIST_VARS+= shlib
.if ${OPSYS} != "MirBSD"
PLIST.shlib= yes
.endif
post-install:
chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/db6
.include "../../mk/bsd.pkg.mk"

5463
databases/db6/PLIST Normal file
View File

File diff suppressed because it is too large Load Diff

27
databases/db6/buildlink3.mk Normal file
View File

@@ -0,0 +1,27 @@
# $NetBSD: buildlink3.mk,v 1.1 2015/01/01 18:52:52 ryoon Exp $
BUILDLINK_TREE+= db6
.if !defined(DB6_BUILDLINK3_MK)
DB6_BUILDLINK3_MK:=
.include "../../mk/bsd.fast.prefs.mk"
BUILDLINK_API_DEPENDS.db6+= db6>=6.1.19
BUILDLINK_ABI_DEPENDS.db6+= db6>=6.1.19
BUILDLINK_PKGSRCDIR.db6?= ../../databases/db6
BUILDLINK_INCDIRS.db6?= include/db6
BUILDLINK_LDADD.db6= -ldb6
BUILDLINK_TRANSFORM+= l:db-6:db6
.include "../../mk/bsd.fast.prefs.mk"
.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
#BUILDLINK_LIBS.db6= ${BUILDLINK_LDADD.db6}
BUILDLINK_TRANSFORM+= l:db:db6
.endif
PTHREAD_OPTS+= native
.include "../../mk/pthread.buildlink3.mk"
.endif # DB6_BUILDLINK3_MK
BUILDLINK_TREE+= -db6

10
databases/db6/distinfo Normal file
View File

@@ -0,0 +1,10 @@
$NetBSD: distinfo,v 1.1 2015/01/01 18:52:52 ryoon Exp $
SHA1 (db-6.1.19.tar.gz) = e266f8ab73f4f1ea276d203ce85426e5a6831501
RMD160 (db-6.1.19.tar.gz) = fcb5fbe20e18339e18a244afbcfa13819aecad36
Size (db-6.1.19.tar.gz) = 37492835 bytes
SHA1 (patch-dist_Makefile.in) = dbc5f8fd26e715f6dff8ff261a08b2856ea3c46e
SHA1 (patch-dist_aclocal_libtool.m4) = 37367e10d9d856cf233b7a0efd3680f35728039e
SHA1 (patch-dist_configure) = 2fb4c6cdd29ac5a9ad520af411517660b24e8768
SHA1 (patch-src_dbinc_atomic.h) = da39a3ee5e6b4b0d3255bfef95601890afd80709
SHA1 (patch-src_hmac_sha1.c) = 0e98e6383c214adbb939839bb345e55efe8d89da

96
databases/db6/patches/patch-dist_Makefile.in Normal file
View File

@@ -0,0 +1,96 @@
$NetBSD: patch-dist_Makefile.in,v 1.1 2015/01/01 18:52:52 ryoon Exp $
* For pkgsrc installation.
* Use db6 instead of db.
--- dist/Makefile.in.orig 2014-06-10 15:32:54.000000000 +0000
+++ dist/Makefile.in
@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
bindir= @bindir@
includedir=@includedir@
libdir= @libdir@
-docdir= $(prefix)/docs
+docdir= $(prefix)/share/doc/db6
dmode= 755
emode= 555
@@ -54,7 +54,7 @@ INSTALLER= @INSTALLER@
LIBTOOL= @LIBTOOL@
POSTLINK= @POSTLINK@
-SOLINK= @MAKEFILE_SOLINK@ @CFLAGS@
+SOLINK= @MAKEFILE_SOLINK@ -version-info @DB_VERSION_MINOR@:@DB_VERSION_PATCH@ @CFLAGS@
SOFLAGS= @SOFLAGS@
LIBMAJOR= @DB_VERSION_MAJOR@
LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
@@ -73,7 +73,7 @@ LIBS= @LIBSO_LIBS@
TEST_LIBS= @TEST_LIBS@
LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@
-libdb_base= libdb
+libdb_base= libdb6
libdb= $(libdb_base).a
libdb_version= $(libdb_base)-$(LIBVERSION).a
libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
@@ -92,7 +92,7 @@ CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@
XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@
LIBXSO_LIBS= @LIBXSO_LIBS@ @LIBSO_LIBS@
-libcxx_base= libdb_cxx
+libcxx_base= libdb6_cxx
libcxx= $(libcxx_base).a
libcxx_version= $(libcxx_base)-$(LIBVERSION).a
libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
@@ -158,9 +158,9 @@ JAVA_EXDIR= $(exampledir)/java/src
JAVA_SLEEPYCAT= $(langdir)/java/src/com/sleepycat
JAVA_MANIFEST= $(langdir)/java/jarManifestEntries
-libj_jarfile= db.jar
+libj_jarfile= db6.jar
libj_exjarfile= dbexamples.jar
-libjso_base= libdb_java
+libjso_base= libdb6_java
libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
libjso_static= $(libjso_base)-$(LIBVERSION).a
libjso_target= $(libjso_base)-$(LIBVERSION).la
@@ -176,7 +176,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g
TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@
LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@
TCL_SRCDIR= $(langdir)/tcl
-libtcl_base= libdb_tcl
+libtcl_base= libdb6_tcl
libtcl= $(libtcl_base).a
libtcl_version= $(libtcl_base)-$(LIBVERSION).a
libtso= $(libtcl_base)-$(LIBVERSION)@LIBTSO_MODSUFFIX@
@@ -1103,8 +1103,7 @@ install_include: $(INCDOT)
@for f in $(INCDOT); do \
basef=`echo $$f | $(SED) 's,.*/,,'` ; \
$(RM) $(DESTDIR)$(includedir)/$$basef ; \
- $(CP) -p $$f $(DESTDIR)$(includedir) ; \
- $(CHMOD) $(fmode) $(DESTDIR)$(includedir)/$$basef ; \
+ $(BSD_INSTALL_DATA) $$f $(DESTDIR)$(includedir)/$$basef ; \
done
uninstall_include:
@@ -1150,10 +1149,8 @@ install_utilities:
@for i in $(UTIL_PROGS); do \
test -f $$i.exe && i=$$i.exe; \
e=`echo $$i | $(SED) '$(transform)'`; \
- $(RM) $(DESTDIR)$(bindir)/$$e; \
- $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$e; \
- $(STRIP) $(DESTDIR)$(bindir)/$$e; \
- $(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$e; \
+ target="${DESTDIR}${bindir}/$$e"; \
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) $$i $$target; \
done
uninstall_utilities:
@@ -1175,7 +1172,7 @@ install_docs:
($(MKDIR) -p $(DESTDIR)$(docdir) && \
$(CHMOD) $(dmode) $(DESTDIR)$(docdir))
@cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST)
- @cd $(topdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/
+ @cd $(topdir)/docs && pax -rwpp $(DOCLIST) $(DESTDIR)$(docdir)/
uninstall_docs:
@cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST)

40
databases/db6/patches/patch-dist_aclocal_libtool.m4 Normal file
View File

@@ -0,0 +1,40 @@
$NetBSD: patch-dist_aclocal_libtool.m4,v 1.1 2015/01/01 18:52:52 ryoon Exp $
--- dist/aclocal/libtool.m4.orig 2014-06-10 15:32:54.000000000 +0000
+++ dist/aclocal/libtool.m4
@@ -2406,7 +2406,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -2417,7 +2417,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[123]]|freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -5110,7 +5110,7 @@ _LT_EOF
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
+ freebsd1|freebsd1.*)
_LT_TAGVAR(ld_shlibs, $1)=no
;;
@@ -6137,7 +6137,7 @@ if test "$_lt_caught_CXX_error" != yes;
esac
;;
- freebsd[[12]]*)
+ freebsd[[12]]|freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
_LT_TAGVAR(ld_shlibs, $1)=no

103
databases/db6/patches/patch-dist_configure Normal file
View File

@@ -0,0 +1,103 @@
$NetBSD: patch-dist_configure,v 1.1 2015/01/01 18:52:52 ryoon Exp $
--- dist/configure.orig 2014-06-10 15:32:54.000000000 +0000
+++ dist/configure
@@ -5235,7 +5235,7 @@ bsdi3*) CC=${CC-"shlicc2"}
LIBSO_LIBS="$LIBSO_LIBS -lipc";;
cygwin*)
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
-freebsd*)
+freebsd*|dragonfly*)
CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
LDFLAGS="$LDFLAGS -pthread";;
gnu*|k*bsd*-gnu|linux*)
@@ -7031,7 +7031,7 @@ fi
# we're using.
case "$host_os" in
sysv5UnixWare*|sysv5OpenUNIX8*)
- if test "$GCC" == "yes"; then
+ if test "$GCC" = "yes"; then
CPPFLAGS="$CPPFLAGS -pthread"
LDFLAGS="$LDFLAGS -pthread"
else
@@ -12353,7 +12353,7 @@ fi
hardcode_shlibpath_var=no
;;
- freebsd1*)
+ freebsd1*|freebsd1.*)
ld_shlibs=no
;;
@@ -13347,7 +13347,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1*|freebsd1.*)
dynamic_linker=no
;;
@@ -13358,7 +13358,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123]*|freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -15316,7 +15316,7 @@ fi
esac
;;
- freebsd[12]*)
+ freebsd[12]*|freebsd[12].*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -17180,7 +17180,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1*|freebsd1.*)
dynamic_linker=no
;;
@@ -17191,7 +17191,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123]*|freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -17838,7 +17838,7 @@ LIBTOOL="./libtool"
INSTALLER="\$(LIBTOOL) --mode=install cp -p"
MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
@@ -18571,7 +18571,7 @@ if test "$_JTOPDIR" != "/usr"; then
aix*) _JNI_INC_SUBDIRS="aix";;
bsdi*) _JNI_INC_SUBDIRS="bsdos";;
cygwin*) _JNI_INC_SUBDIRS="win32";;
- freebsd*) _JNI_INC_SUBDIRS="freebsd";;
+ freebsd*|dragonfly*) _JNI_INC_SUBDIRS="freebsd";;
hp*) _JNI_INC_SUBDIRS="hp-ux";;
linux*) _JNI_INC_SUBDIRS="linux genunix";;
osf*) _JNI_INC_SUBDIRS="alpha";;
@@ -20755,7 +20755,7 @@ if test "$db_cv_mutex" = no; then
# avoid these probes for multiprocess pthreads.
;;
*)
- if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
+ if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
LIBS="$LIBS -lpthread"
if test "$cross_compiling" = yes; then :

0
databases/db6/patches/patch-src_dbinc_atomic.h Normal file
View File

103
databases/db6/patches/patch-src_hmac_sha1.c Normal file
View File

@@ -0,0 +1,103 @@
$NetBSD: patch-src_hmac_sha1.c,v 1.1 2015/01/01 18:52:52 ryoon Exp $
--- src/hmac/sha1.c.orig 2014-06-10 15:32:56.000000000 +0000
+++ src/hmac/sha1.c
@@ -101,6 +101,64 @@ A million repetitions of "a"
w=rol(w,30);
#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+typedef union {
+ unsigned char c[64];
+ u_int32_t l[16];
+} CHAR64LONG16;
+
+#ifdef __sparc_v9__
+void do_R01(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
+void do_R2(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
+void do_R3(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
+void do_R4(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
+
+#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
+#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
+#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i)
+#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i)
+#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i)
+
+void
+do_R01(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
+{
+ nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3);
+ nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7);
+ nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11);
+ nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15);
+ nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19);
+}
+
+void
+do_R2(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
+{
+ nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23);
+ nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27);
+ nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31);
+ nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35);
+ nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39);
+}
+
+void
+do_R3(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
+{
+ nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43);
+ nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47);
+ nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51);
+ nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55);
+ nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59);
+}
+
+void
+do_R4(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
+{
+ nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63);
+ nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67);
+ nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71);
+ nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75);
+ nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
+}
+#endif
+
#ifdef VERBOSE /* SAK */
static void __db_SHAPrintContext __P((SHA1_CTX *, char *));
static void
@@ -132,10 +190,6 @@ __db_SHA1Transform(state, buffer)
unsigned char *buffer;
{
u_int32_t a, b, c, d, e;
-typedef union {
- unsigned char c[64];
- u_int32_t l[16];
-} CHAR64LONG16;
CHAR64LONG16* block;
int is_bigendian;
#ifdef SHA1HANDSOFF
@@ -154,6 +208,13 @@ CHAR64LONG16* block;
c = state[2];
d = state[3];
e = state[4];
+
+#ifdef __sparc_v9__
+ do_R01(&a, &b, &c, &d, &e, block, is_bigendian);
+ do_R2(&a, &b, &c, &d, &e, block, is_bigendian);
+ do_R3(&a, &b, &c, &d, &e, block, is_bigendian);
+ do_R4(&a, &b, &c, &d, &e, block, is_bigendian);
+#else
/* 4 rounds of 20 operations each. Loop unrolled. */
R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
@@ -175,6 +236,8 @@ CHAR64LONG16* block;
R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+#endif
+
/* Add the working vars back into context.state[] */
state[0] += a;
state[1] += b;