Skip to content

Commit

Permalink
drop md4 i?86 specific asm implementations
Browse files Browse the repository at this point in the history
  • Loading branch information
@ygrek
ygrek committed Aug 28, 2024
1 parent dc92b0f commit cb0da53
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 4,251 deletions.
4 changes: 0 additions & 4 deletions config/Makefile.config.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ LABLGL_CMXA=@LABLGL_CMXA@
MORE_TARGETS=@MORE_TARGETS@
MORE_SUBDIRS=@MORE_SUBDIRS@

MD4ARCH=@MD4ARCH@
MD4COMP=@MD4COMP@

OPENNAP=@OPEN_NAPSTER@
DIRECT_CONNECT=@DIRECT_CONNECT@
GNUTELLA=@GNUTELLA@
Expand All @@ -51,7 +48,6 @@ FILETP=@FILETP@

GUI=@GUI@

ARCH=@ARCH@
SYSTEM=@SYSTEM@
REQUIRED_OCAML=@REQUIRED_OCAML@
REQUIRED_LABLGTK=@REQUIRED_LABLGTK@
Expand Down
97 changes: 25 additions & 72 deletions config/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,19 +1433,12 @@ ocamldoc_html: $(CORE_DOC) $(libclient_DOC)
mkdir -p ocamldoc
$(OCAMLDOC) -sort -dump ocamldoc/ocamldocdump -html -d ocamldoc $(INCLUDES) $(libclient_DOC) $(CORE_DOC)

$(LIB)/md4_cc.o: $(LIB)/md4.c
$(OCAMLC) -ccopt "$(CFLAGS) -o $(LIB)/md4_cc.o" -ccopt "" -c $(LIB)/md4.c
$(LIB)/md4_comp.o: $(LIB)/md4_comp.c
$(OCAMLC) -ccopt "$(CFLAGS) -o $(LIB)/md4_comp.o" -ccopt "" -c $(LIB)/md4_comp.c

$(CDK)/heap_c.o: $(CDK)/heap_c.c
$(OCAMLC) -ccopt "$(CFLAGS) $(MORECFLAGS) -o $(CDK)/heap_c.o" -ccopt "" -c $(CDK)/heap_c.c

$(LIB)/md4_as.o: $(LIB)/md4_$(MD4ARCH).s
as -o $(LIB)/md4_as.o $(LIB)/md4_$(MD4ARCH).s

$(LIB)/md4_comp.o: $(LIB)/md4_$(MD4COMP).o
cp -f $(LIB)/md4_$(MD4COMP).o $(LIB)/md4_comp.o


zogml:
(for i in $(GUI_CODE)/gui*_base.zog ; do \
$(CAMLP4) pa_o.cmo pa_zog.cma pr_o.cmo -impl $$i -o $(GUI_CODE)/`basename $$i zog`ml ;\
Expand Down Expand Up @@ -1474,7 +1467,7 @@ clean:
rm -f svg_converter.exe mld_hash.exe make_torrent.exe bt_dht_node.exe copysources.exe get_range.exe subconv.exe testrss.exe
rm -f tests tests.exe
(for i in $(SUBDIRS); do \
rm -f $$i/*.cm? $$i/*.o $$i/*.annot ; \
rm -f $$i/*.cm? $$i/*.cmti $$i/*.o $$i/*.annot ; \
done)

tmpclean:
Expand Down Expand Up @@ -1636,8 +1629,8 @@ release.shared: opt
done
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s`$(GLIBC_VERSION_ARCH).tar
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s`$(GLIBC_VERSION_ARCH).tar

release.static: static opt
rm -rf mldonkey-*
Expand All @@ -1647,26 +1640,26 @@ release.static: static opt
done
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar

release.mlnet.static: mlnet.static
rm -rf mldonkey-*
cp -R distrib $(DISDIR)
cp mlnet.static $(DISDIR)/mlnet && strip $(DISDIR)/mlnet
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar

release.mlnet.byte.static: mlnet.byte.static
rm -rf mldonkey-*
cp -R distrib $(DISDIR)
cp mlnet.byte.static $(DISDIR)/mlnet
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).byte.static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).byte.static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).byte.static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).byte.static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar

release.mlnet.distri: mlnet mlnet.static
rm -rf mldonkey-*
Expand All @@ -1679,8 +1672,8 @@ release.mlnet.distri: mlnet mlnet.static
done
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar

release.utils.shared: mld_hash $(BT_UTILS)
rm -rf mldonkey-*
Expand All @@ -1693,8 +1686,8 @@ release.utils.shared: mld_hash $(BT_UTILS)
done
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
mv $(DISDIR).tar mldonkey-tools-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar

release.utils.static: mld_hash.static $(BT_UTILS_STATIC)
rm -rf mldonkey-*
Expand All @@ -1705,8 +1698,8 @@ ifeq ("$(BITTORRENT)", "yes")
endif
mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
mv $(DISDIR).tar mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
mv $(DISDIR).tar mldonkey-tools-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar
$(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`$(GLIBC_VERSION_ARCH).tar

release.sources:
rm -f config/Makefile.config
Expand All @@ -1721,8 +1714,8 @@ $(DISDIR): static distrib/Readme.txt
cp $$i.static $(DISDIR)/$$i && strip $(DISDIR)/$$i; \
done
tar cf $(DISDIR).tar $(DISDIR)
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`.tar
bzip2 mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s | sed "s/\//_/"`.tar
mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`.tar
bzip2 mldonkey-$(CURRENT_VERSION).static.$(uname -m)-`uname -s | sed "s/\//_/"`.tar

SHADIR=mldonkey-shared

Expand All @@ -1735,61 +1728,21 @@ $(SHADIR): static distrib/Readme.txt
cp $$i.static $(SHADIR)/$$i && strip $(SHADIR)/$$i; \
done
tar cf $(SHADIR).tar $(SHADIR)
mv $(SHADIR).tar mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`.tar
bzip2 mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s | sed "s/\//_/"`.tar

auto-release:
## i386
mkdir -p $(HOME)/release-$(CURRENT_VERSION)
./configure --host=i386-pc-linux-gnu
rm -f mlnet mlnet.static mlnet+gui mlnet+gui.static $(LIB)/md4_comp.* $(LIB)/md4_as.*
$(MAKE) opt static
$(MAKE) distrib
cp mldonkey-$(CURRENT_VERSION).static.i386-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
$(MAKE) shared
cp mldonkey-$(CURRENT_VERSION).shared.i386-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
## i686
mkdir -p $(HOME)/release-$(CURRENT_VERSION)
./configure --host=i686-pc-linux-gnu
rm -f mlnet+gui mlnet+gui.static mlnet mlnet.static $(LIB)/md4_comp.* $(LIB)/md4_as.*
$(MAKE) opt static
$(MAKE) distrib
cp mldonkey-$(CURRENT_VERSION).static.i686-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
$(MAKE) shared
cp mldonkey-$(CURRENT_VERSION).shared.i686-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
## i586
mkdir -p $(HOME)/release-$(CURRENT_VERSION)
./configure --host=i586-pc-linux-gnu
rm -f mlnet+gui mlnet+gui.static mlnet mlnet.static $(LIB)/md4_comp.* $(LIB)/md4_as.*
$(MAKE) opt static
$(MAKE) distrib
cp mldonkey-$(CURRENT_VERSION).static.i586-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
$(MAKE) shared
cp mldonkey-$(CURRENT_VERSION).shared.i586-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
## i486
mkdir -p $(HOME)/release-$(CURRENT_VERSION)
./configure --host=i486-pc-linux-gnu
rm -f mlnet+gui mlnet+gui.static mlnet mlnet.static $(LIB)/md4_comp.* $(LIB)/md4_as.*
$(MAKE) opt static
$(MAKE) distrib
cp mldonkey-$(CURRENT_VERSION).static.i486-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/
$(MAKE) shared
cp mldonkey-$(CURRENT_VERSION).shared.i486-Linux.tar.bz2 $(HOME)/release-$(CURRENT_VERSION)/

buildrpm:
./configure --host=i586-pc-linux-gnu
mv $(SHADIR).tar mldonkey-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`.tar
bzip2 mldonkey-$(CURRENT_VERSION).shared.$(uname -m)-`uname -s | sed "s/\//_/"`.tar

buildrpm:
./configure
$(MAKE) clean
$(MAKE) opt
rm -rf ../mldonkey-rpm rpm/mldonkey
rm -f rpm/mldonkey.sources.tar.bz2
cp -dpR . ../mldonkey-rpm
mv ../mldonkey-rpm rpm/mldonkey
cd rpm/mldonkey; rm -rf **/*.cm? **/*.o
cd rpm/mldonkey; rm -rf **/*.cm? **/*.o
cd rpm; tar jcf mldonkey.sources.tar.bz2 mldonkey
rm -rf rpm/mldonkey



sourcedist: copysources
./copysources
cp packages/rpm/mldonkey.spec /tmp/mldonkey/
Expand Down
21 changes: 0 additions & 21 deletions config/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,6 @@ SCM_VERSION
MLDONKEY_VERSION
CHECKBOUNDS
COMPRESS_EXT
ARCH
REQUIRED_LABLGTK
GUI
DONKEY_SERVER
Expand All @@ -703,8 +702,6 @@ GNUTELLA
DIRECT_CONNECT
OPEN_NAPSTER
ICONV
MD4COMP
MD4ARCH
LABLGL_CMXA
LABLGL_CMA
MORE_SUBDIRS
Expand Down Expand Up @@ -4470,21 +4467,6 @@ case "$host" in
ia64-*-linux*) arch=ia64; system=linux;;
esac

MD4ARCH=$arch
case $host in
i386-pc-linux*|i386-*-*bsd*) MD4COMP=as; MD4ARCH=i386;;
i486-pc-linux*|i486-*-*bsd*) MD4COMP=as; MD4ARCH=i486;;
i586-pc-linux*|i586-*-*bsd*) MD4COMP=as; MD4ARCH=i586;;
i686-pc-linux*|i686-*-*bsd*) MD4COMP=as; MD4ARCH=i686;;
i386-pc-mingw32*) MD4COMP=cc; MD4ARCH=i386;;
i486-pc-mingw32*) MD4COMP=cc; MD4ARCH=i486;;
i586-pc-mingw32*) MD4COMP=cc; MD4ARCH=i586;;
i686-pc-mingw32*) MD4COMP=cc; MD4ARCH=i686;;
*) MD4COMP=cc;;
esac

ARCH=$arch

# Parse git version if available

if test -d ../.git; then
Expand Down Expand Up @@ -11516,9 +11498,6 @@ fi









Expand Down
49 changes: 0 additions & 49 deletions config/configure.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,52 +172,6 @@ if test "x$SYSTEM" = "xunknown"; then
exit 1
fi

case "$host" in
alpha*-*-osf*) arch=alpha; system=digital;;
alpha*-*-linux*) arch=alpha; system=linux;;
alpha*-*-freebsd*) arch=alpha; system=freebsd;;
alpha*-*-netbsd*) arch=alpha; system=netbsd;;
alpha*-*-openbsd*) arch=alpha; system=openbsd;;
sparc-*-sunos4.*) arch=sparc; system=sunos;;
sparc-*-solaris2.*) arch=sparc; system=solaris;;
sparc-*-*bsd*) arch=sparc; system=bsd;;
sparc-*-linux*) arch=sparc; system=linux;;
i?86-*-linux*) arch=i386; system=linux;;
i386-*-*bsd*) arch=i386; system=bsd;;
i486-*-*bsd*) arch=i486; system=bsd;;
i586-*-*bsd*) arch=i586; system=bsd;;
i686-*-*bsd*) arch=i686; system=bsd;;
i?86-*-nextstep*) arch=i386; system=nextstep;;
i?86-*-solaris*) arch=i386; system=solaris;;
i?86-*-beos*) arch=i386; system=beos;;
i?86-*-cygwin*) arch=i386; system=cygwin;;
mips-*-irix6*) arch=mips; system=irix;;
hppa1.1-*-hpux*) arch=hppa; system=hpux;;
hppa1.1-*-nextstep*) arch=hppa; system=nextstep;;
rs6000-*-aix*) arch=power; model=rs6000; system=aix;;
powerpc-*-aix*) arch=power; model=ppc; system=aix;;
powerpc-*-linux*) arch=power; model=ppc; system=elf;;
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
powerpc-*-darwin*) arch=power; model=ppc; system=rhapsody;;
arm*-*-linux*) arch=arm; system=linux;;
ia64-*-linux*) arch=ia64; system=linux;;
esac

MD4ARCH=$arch
case $host in
i386-pc-linux*|i386-*-*bsd*) MD4COMP=as; MD4ARCH=i386;;
i486-pc-linux*|i486-*-*bsd*) MD4COMP=as; MD4ARCH=i486;;
i586-pc-linux*|i586-*-*bsd*) MD4COMP=as; MD4ARCH=i586;;
i686-pc-linux*|i686-*-*bsd*) MD4COMP=as; MD4ARCH=i686;;
i386-pc-mingw32*) MD4COMP=cc; MD4ARCH=i386;;
i486-pc-mingw32*) MD4COMP=cc; MD4ARCH=i486;;
i586-pc-mingw32*) MD4COMP=cc; MD4ARCH=i586;;
i686-pc-mingw32*) MD4COMP=cc; MD4ARCH=i686;;
*) MD4COMP=cc;;
esac

ARCH=$arch

# Parse git version if available

if test -d ../.git; then
Expand Down Expand Up @@ -1299,8 +1253,6 @@ AC_SUBST(MORE_TARGETS)
AC_SUBST(MORE_SUBDIRS)
AC_SUBST(LABLGL_CMA)
AC_SUBST(LABLGL_CMXA)
AC_SUBST(MD4ARCH)
AC_SUBST(MD4COMP)
AC_SUBST(ICONV)
AC_SUBST(OPEN_NAPSTER)
AC_SUBST(DIRECT_CONNECT)
Expand All @@ -1317,7 +1269,6 @@ AC_SUBST(DONKEY_SUI_FILE)
AC_SUBST(DONKEY_SERVER)
AC_SUBST(GUI)
AC_SUBST(REQUIRED_LABLGTK)
AC_SUBST(ARCH)
AC_SUBST(COMPRESS)
AC_SUBST(COMPRESS_EXT)
AC_SUBST(CHECKBOUNDS)
Expand Down
0 src/utils/lib/md4.c → src/utils/lib/md4_comp.c
View file
File renamed without changes.
Loading

0 comments on commit cb0da53

Please sign in to comment.