Revision: 3729 Author: eliot Date: 2016-05-24 17:19:57 -0700 (Tue, 24 May 2016) Log Message: ----------- Fix the configuration of the gdb-7.x support for for the GdbARMPlugin (COG=1). Put #if COG around a couple of changes to the gdb-7.10 code. Allow assert to be used in the plugin on MacOS X (-undefined dynamic_lookup)
Modified Paths: -------------- branches/Cog/build.linux32x86/gdbarm32/conf.COG branches/Cog/build.macos32x86/gdbarm32/conf.COG branches/Cog/build.macos64x64/gdbarm32/conf.COG branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile branches/Cog/processors/ARM/gdb-7.10/include/bfdlink.h branches/Cog/processors/ARM/gdb-7.10/sim/arm/armemu.c
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.linux32x86/gdbarm32/conf.COG =================================================================== --- branches/Cog/build.linux32x86/gdbarm32/conf.COG 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/build.linux32x86/gdbarm32/conf.COG 2016-05-25 00:19:57 UTC (rev 3729) @@ -2,18 +2,18 @@ CFLAGS="-g -O2 -m32" mkdir -p zlib bfd libiberty opcodes sim/common sim/arm for d in zlib; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS") + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS") done for d in bfd; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux --with-system-zlib=no) done for d in libiberty opcodes; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done for d in sim/common sim/arm; do (cd $d; - ../../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + ../../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done
Modified: branches/Cog/build.macos32x86/gdbarm32/conf.COG =================================================================== --- branches/Cog/build.macos32x86/gdbarm32/conf.COG 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/build.macos32x86/gdbarm32/conf.COG 2016-05-25 00:19:57 UTC (rev 3729) @@ -2,18 +2,18 @@ CFLAGS="-g -O2 -m32" mkdir -p zlib bfd libiberty opcodes sim/common sim/arm for d in zlib; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS") + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS") done for d in bfd; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux --with-system-zlib=no) done for d in libiberty opcodes; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done for d in sim/common sim/arm; do (cd $d; - ../../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + ../../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done
Modified: branches/Cog/build.macos64x64/gdbarm32/conf.COG =================================================================== --- branches/Cog/build.macos64x64/gdbarm32/conf.COG 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/build.macos64x64/gdbarm32/conf.COG 2016-05-25 00:19:57 UTC (rev 3729) @@ -1,19 +1,19 @@ #!/bin/sh -CFLAGS="-g -O2" +CFLAGS="-g -O2 -m64" mkdir -p zlib bfd libiberty opcodes sim/common sim/arm for d in zlib; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS") + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS") done for d in bfd; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux --with-system-zlib=no) done for d in libiberty opcodes; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done for d in sim/common sim/arm; do (cd $d; - ../../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + ../../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon May 23 18:03:45 PDT 2016 + Tue May 24 17:17:47 PDT 2016
Modified: branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile 2016-05-25 00:19:57 UTC (rev 3729) @@ -12,9 +12,20 @@ ../../processors/ARM/gdb-7.10/sim/arm \ ../../processors/ARM/gdb-7.10/bfd \ ../gdbarm32/bfd + +# assert uses warning, which is in the VM, so -undefined dynamic_lookup needed +ifeq ($(CONFIGURATION),assert) + EXTRA_FOR_ASSERT:=-undefined dynamic_lookup +else ifeq ($(CONFIGURATION),debug) + EXTRA_FOR_ASSERT:=-undefined dynamic_lookup + BUILD:=builddbg +else # default CONFIGURATION=product + EXTRA_FOR_ASSERT:= +endif EXTRALIBS:=-L../gdbarm32/bfd -L../gdbarm32/libiberty -L../gdbarm32/opcodes \ -L../gdbarm32/sim/arm -L../gdbarm32/zlib \ - -lbfd -liberty -lopcodes -lopcodes -lsim -lz + -lbfd -liberty -lopcodes -lopcodes -lsim -lz \ + $(EXTRA_FOR_ASSERT)
include ../common/Makefile.plugin
Modified: branches/Cog/processors/ARM/gdb-7.10/include/bfdlink.h =================================================================== --- branches/Cog/processors/ARM/gdb-7.10/include/bfdlink.h 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/processors/ARM/gdb-7.10/include/bfdlink.h 2016-05-25 00:19:57 UTC (rev 3729) @@ -432,8 +432,7 @@ char path_separator;
/* TAO -- removed for Cog */ -#if 0 -#else +#if !COG /* Compress DWARF debug sections. */ enum compressed_debug_section_type compress_debug; #endif
Modified: branches/Cog/processors/ARM/gdb-7.10/sim/arm/armemu.c =================================================================== --- branches/Cog/processors/ARM/gdb-7.10/sim/arm/armemu.c 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/processors/ARM/gdb-7.10/sim/arm/armemu.c 2016-05-25 00:19:57 UTC (rev 3729) @@ -6008,7 +6008,11 @@ state->Reg[nRdHi] = RdHi; } else +#if COG fprintf (stderr, "sim: MULTIPLY64 - INVALID ARGUMENTS instr=%08x\n", instr); +#else + fprintf (stderr, "sim: MULTIPLY64 - INVALID ARGUMENTS\n"); +#endif
if (scc) /* Ensure that both RdHi and RdLo are used to compute Z,
vm-dev@lists.squeakfoundation.org