recent CVS snapshots of SID are broken

recent CVS snapshots of SID are broken

[Michael Torbett]

[-- Attachment #1: Type: text/plain, Size: 3944 bytes --]

The last three CVS snapshots of SID are broken in the area of building 
of bochs. I get multiple definitions of three methods at link time. See 
below.

Is there a place where I can get either clean sources or even better a 
recent pre-built set of SID software (i.e. either tar ball or an rpm for 
Linux)?

Thanks.

  --Michael

====================================================================
make[6]: Entering directory 
`/home/mtorbett/sid_simulator/sid/component/bochs'
/bin/sh ./libtool --tag=CXX --mode=link c++  -g -O2   -o libx86.la 
-rpath /usr/local/lib/sidcomp -module -no-undefined components.lo 
vga/libvga.la gui/libgui.la keyboard/libkeyboard.la pic/libpic.la 
pit/libpit.la cmos/libcmos.la dma/libdma.la floppy/libfloppy.la 
unmapped/libunmapped.la harddrv/libharddrv.la cpu/libcpu.la
c++ -shared -nostdlib 
/usr/lib/gcc/i386-redhat-linux/3.4.3/../../../crti.o 
/usr/lib/gcc/i386-redhat-linux/3.4.3/crtbeginS.o  .libs/components.o 
-Wl,--whole-archive vga/.libs/libvga.a gui/.libs/libgui.a 
keyboard/.libs/libkeyboard.a pic/.libs/libpic.a pit/.libs/libpit.a 
cmos/.libs/libcmos.a dma/.libs/libdma.a floppy/.libs/libfloppy.a 
unmapped/.libs/libunmapped.a harddrv/.libs/libharddrv.a 
cpu/.libs/libcpu.a -Wl,--no-whole-archive  
-L/usr/lib/gcc/i386-redhat-linux/3.4.3 
-L/usr/lib/gcc/i386-redhat-linux/3.4.3/../../.. -lstdc++ -lm -lc -lgcc_s 
/usr/lib/gcc/i386-redhat-linux/3.4.3/crtendS.o 
/usr/lib/gcc/i386-redhat-linux/3.4.3/../../../crtn.o  -Wl,-soname 
-Wl,libx86.so.0 -o .libs/libx86.so.0.0.0
cpu/.libs/libcpu.a(sid-bochs-memory.o)(.text+0x0): In function 
`sid::any_int<unsigned char, true> 
sidutil::basic_cpu::write_data_memory<sid::any_int<unsigned char, true> 
 >(unsigned int, unsigned int, sid::any_int<unsigned char, true>)':
/home/mtorbett/sid_simulator/sid/component/bochs/cpu/memory/sid-bochs-memory.cc:25: 
multiple definition of `sid_bx_mem_c::init(x86_cpu*)'
cpu/.libs/libcpu.a(lt1-sid-bochs-memory.o)(.text+0x0):/home/mtorbett/sid_simulator/sid/component/bochs/cpu/memory/sid-bochs-memory.cc:25: 
first defined here
cpu/.libs/libcpu.a(sid-bochs-memory.o)(.text+0x10): In function 
`sid::any_int<unsigned char, true> 
sidutil::basic_cpu::write_data_memory<sid::any_int<unsigned char, true> 
 >(unsigned int, unsigned int, sid::any_int<unsigned char, true>)':
/home/mtorbett/sid_simulator/sid/component/bochs/cpu/memory/sid-bochs-memory.cc:99: 
multiple definition of `sid_bx_mem_c::read_physical(bx_cpu_c*, unsigned 
int, unsigned int, void*)'
cpu/.libs/libcpu.a(lt1-sid-bochs-memory.o)(.text+0x10):/home/mtorbett/sid_simulator/sid/component/bochs/cpu/memory/sid-bochs-memory.cc:99: 
first defined here
cpu/.libs/libcpu.a(sid-bochs-memory.o)(.text+0x420): In function 
`sid_bx_mem_c::write_physical(bx_cpu_c*, unsigned int, unsigned int, 
void*)':
/home/mtorbett/sid_simulator/sid/component/bochs/cpu/memory/sid-bochs-memory.cc:31: 
multiple definition of `sid_bx_mem_c::write_physical(bx_cpu_c*, unsigned 
int, unsigned int, void*)'
cpu/.libs/libcpu.a(lt1-sid-bochs-memory.o)(.text+0x420):/home/mtorbett/sid_simulator/sid/component/bochs/cpu/memory/sid-bochs-memory.cc:31: 
first defined here
collect2: ld returned 1 exit status
make[6]: *** [libx86.la] Error 1
make[6]: Leaving directory 
`/home/mtorbett/sid_simulator/sid/component/bochs'
make[5]: *** [all-recursive] Error 1
make[5]: Leaving directory 
`/home/mtorbett/sid_simulator/sid/component/bochs'
make[4]: *** [all] Error 2
make[4]: Leaving directory 
`/home/mtorbett/sid_simulator/sid/component/bochs'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/home/mtorbett/sid_simulator/sid/component'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/home/mtorbett/sid_simulator/sid/component'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/mtorbett/sid_simulator/sid'
make: *** [all-sid] Error 2
[mtorbett@Michael sid_simulator]$ pwd
/home/mtorbett/sid_simulator


-- 

Regards,

  -- Michael Torbett



[-- Attachment #2: mtorbett.vcf --]
[-- Type: text/x-vcard, Size: 270 bytes --]

begin:vcard
fn:Michael Torbett
n:Torbett;Michael
org:SavaJe Technologies
adr;dom:;;100 Apollo Drive;Chelmsford;MA;01824
email;internet:mtorbett@savaje.com
title:Member Technical Staff
tel;work:978-856-4805
tel;fax:978-256-8386
x-mozilla-html:TRUE
version:2.1
end:vcard

Re: recent CVS snapshots of SID are broken

[Dave Brolley]

In each case, the original definition and the (supposed) multiple 
definition are on the same line and source file.

The problem appears to be that sid-bochs-memory.cc is listed twice in 
libmemory_la_SOURCES in sid/component/bochs/cpu/memory/Makefile.am. I've 
commited thet following patch.

Dave

2005-06-30  Dave Brolley  <brolley@redhat.com>
 
        * cpu/memory/Makefile.am (libmemory_la_SOURCES): Remove duplicate
        sid-bochs-memory.cc
        * cpu/memory/Makefile.in: Regenerate.

Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/bochs/cpu/memory/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -p -r1.1 -r1.2
*** Makefile.am 15 Feb 2002 01:18:46 -0000      1.1
--- Makefile.am 30 Jun 2005 16:00:03 -0000      1.2
*************** INCLUDES = -I$(top_builddir)/../../inclu
*** 6,11 ****
  
  noinst_LTLIBRARIES = libmemory.la
  
! libmemory_la_SOURCES = sid-bochs-memory.cc sid-bochs-memory.cc
  
  libmemory_la_LDFLAGS = -no-undefined
--- 6,11 ----
  
  noinst_LTLIBRARIES = libmemory.la
  
! libmemory_la_SOURCES = sid-bochs-memory.cc
  
  libmemory_la_LDFLAGS = -no-undefined
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/sid/component/bochs/cpu/memory/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -p -r1.3 -r1.4
*** Makefile.in 4 Jun 2005 03:22:58 -0000       1.3
--- Makefile.in 30 Jun 2005 16:00:03 -0000      1.4
*************** CONFIG_HEADER = $(top_builddir)/config.h
*** 49,55 ****
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  libmemory_la_LIBADD =
! am_libmemory_la_OBJECTS = sid-bochs-memory.lo sid-bochs-memory.lo
  libmemory_la_OBJECTS = $(am_libmemory_la_OBJECTS)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/../../config/depcomp
--- 49,55 ----
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  libmemory_la_LIBADD =
! am_libmemory_la_OBJECTS = sid-bochs-memory.lo
  libmemory_la_OBJECTS = $(am_libmemory_la_OBJECTS)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/../../config/depcomp
*************** target_alias = @target_alias@
*** 240,246 ****
  AUTOMAKE_OPTIONS = foreign
  INCLUDES = -I$(top_builddir)/../../include -I$(srcdir) -I$(srcdir)/.. 
-I$(srcdir)/../.. -I$(srcdir)/../../../../include
  noinst_LTLIBRARIES = libmemory.la
! libmemory_la_SOURCES = sid-bochs-memory.cc sid-bochs-memory.cc
  libmemory_la_LDFLAGS = -no-undefined
  all: all-am
  
--- 240,246 ----
  AUTOMAKE_OPTIONS = foreign
  INCLUDES = -I$(top_builddir)/../../include -I$(srcdir) -I$(srcdir)/.. 
-I$(srcdir)/../.. -I$(srcdir)/../../../../include
  noinst_LTLIBRARIES = libmemory.la
! libmemory_la_SOURCES = sid-bochs-memory.cc
  libmemory_la_LDFLAGS = -no-undefined
  all: all-am