Date: Mon, 12 Apr 2004 22:05:36 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50969 for review Message-ID: <200404130505.i3D55aLt069991@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50969 Change 50969 by marcel@marcel_nfs on 2004/04/12 22:05:10 Me fickle? Noooo... Keep the MI makefile clean from exceptions. I have sparc64 coming in in a moment and that's weird in a different way. It just gets ugly... Build nm.h in the MD makefiles and only build xm.h on i386. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#12 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/alpha/Makefile#2 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/i386/Makefile#5 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/ia64/Makefile#5 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#12 (text+ko) ==== @@ -5,14 +5,8 @@ .PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \ ${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR} -# Alpha can be considered broken. -.if ${TARGET_ARCH} != "alpha" -fbsd_proc= fbsd-proc.c -gcore= gcore.c -.endif - PROG= gdb -GENSRCS=version.c nm.h tm.h xm.h +GENSRCS=version.c nm.h tm.h SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c bcache.c \ bfd-target.c block.c blockframe.c breakpoint.c buildsym.c \ c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c \ @@ -24,31 +18,31 @@ dummy-frame.c dwarf2-frame.c dwarf2expr.c dwarf2loc.c \ dwarf2read.c dwarfread.c elfread.c environ.c eval.c \ event-loop.c event-top.c exec.c expprint.c f-exp.y f-lang.c \ - f-typeprint.c f-valprint.c ${fbsd_proc} findvar.c fork-child.c \ - frame-base.c frame-unwind.c frame.c ${gcore} gdb-events.c gdb.c \ - gdbarch.c gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c hpacc-abi.c \ - inf-loop.c infcall.c infcmd.c inflow.c infptrace.c infrun.c \ - inftarg.c init.c interps.c jv-exp.y jv-lang.c jv-typeprint.c \ - jv-valprint.c kod-cisco.c kod.c language.c linespec.c m2-exp.y \ - m2-lang.c m2-typeprint.c m2-valprint.c macrocmd.c macroexp.c \ - macroscope.c macrotab.c main.c maint.c mdebugread.c mem-break.c \ - memattr.c mi-cmd-break.c mi-cmd-disas.c mi-cmd-env.c \ - mi-cmd-file.c mi-cmd-stack.c mi-cmd-var.c mi-cmds.c \ - mi-console.c mi-getopt.c mi-interp.c mi-main.c mi-out.c \ - mi-parse.c mi-symbol-cmds.c minsyms.c mipsread.c nlmread.c \ - objc-exp.y objc-lang.c objfiles.c observer.c osabi.c p-exp.y \ - p-lang.c p-typeprint.c p-valprint.c parse.c printcmd.c \ - regcache.c reggroups.c remote.c remote-fileio.c remote-utils.c \ - scm-exp.c scm-lang.c scm-valprint.c sentinel-frame.c ser-pipe.c \ - ser-tcp.c ser-unix.c serial.c signals.c solib.c \ - solib-svr4.c source.c stabsread.c stack.c std-regs.c symfile.c \ - symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ - trad-frame.c tui.c tui-command.c tui-data.c tui-disasm.c \ - tui-file.c tui-hooks.c tui-interp.c tui-io.c tui-layout.c \ - tui-out.c tui-regs.c tui-source.c tui-stack.c tui-win.c \ - tui-windata.c tui-wingeneral.c tui-winsource.c typeprint.c \ - ui-file.c ui-out.c user-regs.c utils.c valarith.c valops.c \ - valprint.c values.c varobj.c wrapper.c ${GENSRCS} + f-typeprint.c f-valprint.c findvar.c fork-child.c frame-base.c \ + frame-unwind.c frame.c gdb-events.c gdb.c gdbarch.c gdbtypes.c \ + gnu-v2-abi.c gnu-v3-abi.c hpacc-abi.c inf-loop.c infcall.c \ + infcmd.c inflow.c infptrace.c infrun.c inftarg.c init.c \ + interps.c jv-exp.y jv-lang.c jv-typeprint.c jv-valprint.c \ + kod-cisco.c kod.c language.c linespec.c m2-exp.y m2-lang.c \ + m2-typeprint.c m2-valprint.c macrocmd.c macroexp.c macroscope.c \ + macrotab.c main.c maint.c mdebugread.c mem-break.c memattr.c \ + mi-cmd-break.c mi-cmd-disas.c mi-cmd-env.c mi-cmd-file.c \ + mi-cmd-stack.c mi-cmd-var.c mi-cmds.c mi-console.c mi-getopt.c \ + mi-interp.c mi-main.c mi-out.c mi-parse.c mi-symbol-cmds.c \ + minsyms.c mipsread.c nlmread.c objc-exp.y objc-lang.c \ + objfiles.c observer.c osabi.c p-exp.y p-lang.c p-typeprint.c \ + p-valprint.c parse.c printcmd.c regcache.c reggroups.c remote.c \ + remote-fileio.c remote-utils.c scm-exp.c scm-lang.c \ + scm-valprint.c sentinel-frame.c ser-pipe.c ser-tcp.c ser-unix.c \ + serial.c signals.c solib.c solib-svr4.c source.c stabsread.c \ + stack.c std-regs.c symfile.c symmisc.c symtab.c target.c \ + thread.c top.c tracepoint.c trad-frame.c tui.c tui-command.c \ + tui-data.c tui-disasm.c tui-file.c tui-hooks.c tui-interp.c \ + tui-io.c tui-layout.c tui-out.c tui-regs.c tui-source.c \ + tui-stack.c tui-win.c tui-windata.c tui-wingeneral.c \ + tui-winsource.c typeprint.c ui-file.c ui-out.c user-regs.c \ + utils.c valarith.c valops.c valprint.c values.c varobj.c \ + wrapper.c ${GENSRCS} .include "${TARGET_SUBDIR}/Makefile" @@ -69,12 +63,6 @@ DPADD= ${GDB_LIBS} ${LIBREADLINE} ${LIBM} LDADD= ${GDB_LIBS} -lreadline -lm -nm.h: - echo '#include "${TARGET_ARCH}/nm-fbsd.h"' > ${.TARGET} - -xm.h: - echo '#include "${TARGET_ARCH}/xm-${TARGET_ARCH}.h"' > ${.TARGET} - version.c: echo '#include "version.h"' > ${.TARGET} echo 'const char version[] = ${VERSION};' >> ${.TARGET} ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/alpha/Makefile#2 (text+ko) ==== @@ -4,5 +4,8 @@ SRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-nat.c alphabsd-tdep.c \ alphafbsd-tdep.c +nm.h: + echo '#include "alpha/nm-fbsd.h"' > ${.TARGET} + tm.h: echo '#include "alpha/tm-alpha.h"' > ${.TARGET} ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/i386/Makefile#5 (text+ko) ==== @@ -1,7 +1,15 @@ # $FreeBSD$ +GENSRCS+= xm.h +SRCS+= fbsd-proc.c gcore.c SRCS+= i386-nat.c i386-tdep.c i386bsd-nat.c i386bsd-tdep.c \ i386fbsd-nat.c i386fbsd-tdep.c i387-tdep.c +nm.h: + echo '#include "i386/nm-fbsd.h"' > ${.TARGET} + tm.h: echo '#include "i386/tm-fbsd.h"' > ${.TARGET} + +xm.h: + echo '#include "i386/xm-i386.h"' > ${.TARGET} ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/ia64/Makefile#5 (text+ko) ==== @@ -1,6 +1,10 @@ # $FreeBSD$ +SRCS+= fbsd-proc.c gcore.c SRCS+= ia64-fbsd-nat.c ia64-fbsd-tdep.c ia64-tdep.c +nm.h: + echo '#include "ia64/nm-fbsd.h"' > ${.TARGET} + tm.h: echo '#include "ia64/tm-fbsd.h"' > ${.TARGET}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404130505.i3D55aLt069991>