search for: fixed_asm

...gin Custom Build InputPath=.\ia32\cpu_asm.nasm "ia32/cpu_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasmw -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o\ ia32/cpu_asm.obj # End Custom Build !ENDIF # End Source File # Begin Source File SOURCE=.\ia32\fixed_asm.nasm !IF "$(CFG)" == "libFLAC - Win32 Release" # Begin Custom Build InputPath=.\ia32\fixed_asm.nasm "ia32/fixed_asm.obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" nasmw -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o\ ia32/fixed_asm.obj...

...mode=compile \ +%.lo: %.s + $(LIBTOOL) --mode=compile \ $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< #@@@OLD RULE: $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@ noinst_LTLIBRARIES = libFLAC-asm.la libFLAC_asm_la_SOURCES = \ - cpu_asm.nasm \ - fixed_asm.nasm \ - lpc_asm.nasm + cpu_asm.s \ + fixed_asm.s \ + lpc_asm.s

They are not needed since the section is defined in nasm.h. --- src/libFLAC/ia32/bitreader_asm.nasm | 4 ---- src/libFLAC/ia32/cpu_asm.nasm | 4 ---- src/libFLAC/ia32/fixed_asm.nasm | 4 ---- src/libFLAC/ia32/lpc_asm.nasm | 4 ---- src/libFLAC/ia32/stream_encoder_asm.nasm | 4 ---- 5 files changed, 20 deletions(-) diff --git a/src/libFLAC/ia32/bitreader_asm.nasm b/src/libFLAC/ia32/bitreader_asm.nasm index 4cd0ea2..b0f5ed6 100644 --- a/src/libFLAC/ia32...

...utype (7) does not match previous archive members cputype (16777223) (all members must match) /usr/bin/ranlib: archive member: .libs/libFLAC.a(cpu_asm.o) cputype (7) does not match previous archive members cputype (16777223) (all members must match) /usr/bin/ranlib: archive member: .libs/libFLAC.a(fixed_asm.o) cputype (7) does not match previous archive members cputype (16777223) (all members must match) /usr/bin/ranlib: archive member: .libs/libFLAC.a(lpc_asm.o) cputype (7) does not match previous archive members cputype (16777223) (all members must match) /usr/bin/ranlib: archive member: .libs/lib...

...-15,40 +11,11 @@ if FLaC__CPU_IA32 if FLaC__HAS_NASM -libFLAC_la_SOURCES = \ - bitbuffer.c \ - bitmath.c \ - crc.c \ - cpu.c \ - encoder.c \ - encoder_framing.c \ - file_decoder.c \ - fixed.c \ - format.c \ - lpc.c \ - md5.c \ - seek_table.c \ - stream_decoder.c \ - i386/cpu_asm.nasm \ - i386/fixed_asm.nasm \ - i386/lpc_asm.nasm -else -libFLAC_la_SOURCES = \ - bitbuffer.c \ - bitmath.c \ - crc.c \ - cpu.c \ - encoder.c \ - encoder_framing.c \ - file_decoder.c \ - fixed.c \ - format.c \ - lpc.c \ - md5.c \ - seek_table.c \ - stream_decoder.c +SUBDIRS = i386 . +libFLAC_la_LIBADD = i386/libFLAC-asm....

So here is quick patch solving the problem, now it should be PIC. -- Miroslav Lichvar lichvarm@phoenix.inf.upol.cz -------------- next part -------------- --- lpc_asm.nasm.orig Wed Jul 18 02:23:40 2001 +++ lpc_asm.nasm Sat Nov 17 21:09:46 2001 @@ -59,10 +59,10 @@ ; ALIGN 16 cident FLAC__lpc_compute_autocorrelation_asm_ia32 - ;[esp + 24] == autoc[] - ;[esp + 20] == lag - ;[esp + 16] ==

Christian Weisgerber <naddy@mips.inka.de> wrote: > | # nasm build rule: > | %.lo: %.s Even with gmake, this really works only by accident. Automake generates a competing suffix rule, and gmake apparently gives the rule above a higher priority than the suffix rule (or that just happens to be the evaluation order). Matt, since you seem to understand automake, can you come up with

...d rule: -%.lo: %.s - $(NASM) -f elf -d ELF $< -o $@ + +STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh + +SUFFIXES = .asm + +.asm.lo: + $(LIBTOOL) --tag=CC --mode=compile \ + $(STRIP_FPIC) $(NASM) -f elf -d ELF $< noinst_LTLIBRARIES = libFLAC-asm.la libFLAC_asm_la_SOURCES = \ - cpu_asm.s \ - fixed_asm.s \ - lpc_asm.s + cpu_asm.asm \ + fixed_asm.asm \ + lpc_asm.asm --- strip_fPIC.sh.orig Sun Jul 8 22:06:23 2001 +++ strip_fPIC.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# +# libtool assumes that the compiler can handle the -fPIC flag +# This isn't always true (for example, nasm can't handle it) +co...

--- Christian Weisgerber <naddy@mips.inka.de> wrote: > Josh Coalson <xflac@yahoo.com> wrote: > > > Basically what I want is configure.in determination of > > basic machine type (intel/compatible, alpha, ppc), then within > > that (say intel) the code will detect variants like MMX, SSE, > > and use the right routines. > > Please include a way to

...best_predictor_asm_ia32_mmx_cmov function and fixed bug when data_len == 0. Now the function is about 50% faster and flac -5 is about 5% faster on my box. I have tested it thoroughly, I think it can go to flac 1.0.4. -- Miroslav Lichvar -------------- next part -------------- --- src/libFLAC/ia32/fixed_asm.nasm.orig 2002-01-26 19:05:12.000000000 +0100 +++ src/libFLAC/ia32/fixed_asm.nasm 2002-09-17 16:19:08.000000000 +0200 @@ -76,107 +76,73 @@ push edi sub esp, byte 16 ; qword [esp] == temp space for loading FLAC__uint64s to FPU regs - ; dword [esp] == last_error_0 - ; dword [esp + 4] == last_er...

...ack stuff aren't needed for win32 and should possibly be disabled just as they are for aout. There are also warnings like: bitreader_asm.nasm:593: warning: label alone on a line without a colon might be in error cpu_asm.nasm:118: warning: label alone on a line without a colon might be in error fixed_asm.nasm:309: warning: label alone on a line without a colon might be in error lpc_asm.nasm:1508: warning: label alone on a line without a colon might be in error stream_encoder_asm.nasm:156: warning: label alone on a line without a colon might be in error ... all of which are for "end" and...

On Fri, Jul 20, 2001 at 03:01:54PM -0700, Josh Coalson wrote: > --- Matt Zimmerman <mdz@debian.org> wrote: > > > > automake will include ltmain.sh in the source distribution, so it > > should be > > used even if it isn't installed on the build system. In fact, it > > seems to > > always use the distributed version, and not the installed one

...+.nasm.o: + $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< #@@@OLD RULE: $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@ -noinst_LTLIBRARIES = libFLAC-asm.la -libFLAC_asm_la_SOURCES = \ +noinst_LIBRARIES = libFLAC-asm.a +libFLAC_asm_a_SOURCES = \ cpu_asm.nasm \ fixed_asm.nasm \ lpc_asm.nasm

...er.o .libs/stream_encoder.o .libs/ stream_encoder_framing.o .libs/window.o .libs/ ogg_decoder_aspect.o .libs/ogg_encoder_aspect.o .libs/ ogg_helper.o .libs/ogg_mapping.o .libs/libFLAC.lax/libFLAC-asm.a/ bitreader_asm.o .libs/libFLAC.lax/libFLAC-asm.a/cpu_asm.o .libs/ libFLAC.lax/libFLAC-asm.a/fixed_asm.o .libs/libFLAC.lax/libFLAC-asm.a/ lpc_asm.o .libs/libFLAC.lax/libFLAC-asm.a/stream_encoder_asm.o -lm / usr/local/lib/libogg.dylib -install_name /usr/local/lib/libFLAC. 8.dylib -Wl,-compatibility_version -Wl,11 -Wl,-current_version -Wl,11.0 ld: .libs/libFLAC.lax/libFLAC-asm.a/bitreader_asm.o...

On Thu, Jul 19, 2001 at 05:05:46PM -0700, Josh Coalson wrote: > --- collver@linuxfreemail.com wrote: > > On Thu, Jul 19, 2001 at 04:58:44PM -0400, Matt Zimmerman wrote: > > > On Thu, Jul 19, 2001 at 10:38:14AM -0700, Josh Coalson wrote: > > > > > > > So, last chance to checkout from CVS and break it! > > > > > > Also, my libtool

...flac/flac/flac/src' Making all in libFLAC gmake[2]: Entering directory `/home/ben/flac/flac/flac/src/libFLAC' Making all in ia32 gmake[3]: Entering directory `/home/ben/flac/flac/flac/src/libFLAC/ia32' nasm -f elf -d OBJ_FORMAT_elf cpu_asm.nasm -o cpu_asm.o nasm -f elf -d OBJ_FORMAT_elf fixed_asm.nasm -o fixed_asm.o nasm -f elf -d OBJ_FORMAT_elf lpc_asm.nasm -o lpc_asm.o rm -f libFLAC-asm.a ar cru libFLAC-asm.a cpu_asm.o fixed_asm.o lpc_asm.o ranlib libFLAC-asm.a gmake[3]: Leaving directory `/home/ben/flac/flac/flac/src/libFLAC/ia32' Making all in . gmake[3]: Entering directory `/home/...

...- $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@ + $(NASM) -f $(OBJ_FORMAT) -I $(srcdir)/ -d OBJ_FORMAT_$(OBJ_FORMAT) $< -o $@ # patch from Ben for the above rule that may be needed with new libtool: #.nasm.lo: @@ -32,4 +32,5 @@ libFLAC_asm_a_SOURCES = \ cpu_asm.nasm \ fixed_asm.nasm \ - lpc_asm.nasm + lpc_asm.nasm \ + nasm.h Index: src/test_unit/main.c =================================================================== RCS file: /cvsroot/flac/flac/src/test_unit/main.c,v retrieving revision 1.2 diff -u -r1.2 main.c --- src/test_unit/main.c 2001/01/16 20:17:53 1.2 +++ src/t...

I rethought it and it seemed like a bad idea to post a big file, so you can get it here: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/flac/junk/flac-1.0-src-candidate.tar.bz2 Josh __________________________________________________ Do You Yahoo!? Get personalized email addresses from Yahoo! Mail http://personal.mail.yahoo.com/

...9:01 flac-0.10/src/libFLAC/i386/Makefile.in -rw-rw-r-- 1000/1000 188 2001-05-31 04:31:38 flac-0.10/src/libFLAC/i386/Makefile.am -rw-rw-r-- 1000/1000 1247 2001-05-31 03:56:38 flac-0.10/src/libFLAC/i386/cpu_asm.s -rw-rw-r-- 1000/1000 13341 2001-05-31 03:56:38 flac-0.10/src/libFLAC/i386/fixed_asm.s -rw-rw-r-- 1000/1000 21829 2001-05-31 03:56:38 flac-0.10/src/libFLAC/i386/lpc_asm.s -rw-rw-r-- 1000/1000 1676 2001-05-31 03:56:38 flac-0.10/src/libFLAC/i386/nasm.h drwxrwxrwx 1000/1000 0 2001-05-31 04:39:02 flac-0.10/src/flac/ -rw-rw-r-- 1000/1000 8860 2001-05-31 04:39:02 fl...

--- Christian Weisgerber <naddy@mips.inka.de> wrote: > Josh Coalson <xflac@yahoo.com> wrote: > > > I have checked in all the latest into CVS and am going to start the > > test suite again. if all goes well I will probably release this as > > beta 10. > > What's the sequence of steps required to turn this into a buildable > distribution? >