* Makefile.am (BFD32_BACKENDS): Add vax1knetbsd.lo.
authorJason Thorpe <thorpej@netbsd.org>
Sat, 8 Jun 2002 23:23:08 +0000 (23:23 +0000)
committerJason Thorpe <thorpej@netbsd.org>
Sat, 8 Jun 2002 23:23:08 +0000 (23:23 +0000)
(BFD32_BACKENDS_CFILES): Add vax1knetbsd.c.
Regenerate dependency lists.
* Makefile.in: Regenerate.
* config.bfd (vax-*-netbsdelf*, vax-*-netbsdaout*): Add
vax1knetbsd_vec to targ_selvecs.
* configure.in: Add vax1knetbsd_vec.
* configure: Regenerate.
* targets.c (_bfd_target_vector): Add vax1knetbsd_vec.
* vax1knetbsd.c: New file.
* vaxnetbsd.c: Update copyright years.
(TARGET_PAGE_SIZE): Set to 0x1000.
(DEFAULT_MID): Set to M_VAX4K_NETBSD.

bfd/ChangeLog
bfd/Makefile.am
bfd/Makefile.in
bfd/config.bfd
bfd/configure
bfd/configure.in
bfd/targets.c
bfd/vax1knetbsd.c [new file with mode: 0644]
bfd/vaxnetbsd.c

index f101f2b841d8d654401a46ec24e9445e7a2adc2a..e9fd3f2fd4fdc8ccb5c7b344b79906ceac79bd16 100644 (file)
@@ -1,3 +1,19 @@
+2002-06-08  Jason Thorpe  <thorpej@wasabisystems.com>
+
+       * Makefile.am (BFD32_BACKENDS): Add vax1knetbsd.lo.
+       (BFD32_BACKENDS_CFILES): Add vax1knetbsd.c.
+       Regenerate dependency lists.
+       * Makefile.in: Regenerate.
+       * config.bfd (vax-*-netbsdelf*, vax-*-netbsdaout*): Add
+       vax1knetbsd_vec to targ_selvecs.
+       * configure.in: Add vax1knetbsd_vec.
+       * configure: Regenerate.
+       * targets.c (_bfd_target_vector): Add vax1knetbsd_vec.
+       * vax1knetbsd.c: New file.
+       * vaxnetbsd.c: Update copyright years.
+       (TARGET_PAGE_SIZE): Set to 0x1000.
+       (DEFAULT_MID): Set to M_VAX4K_NETBSD.
+
 2002-06-08  Matt Thomas  <matt@3am-software.com>
 
        * libaout.h (enum machine_type): Add M_VAX4K_NETBSD.
index 6892189f81ba4af03d67685f421c3e38896bd86b..da399788af5d52a2d0dbf78789bfcd2ab25d7889 100644 (file)
@@ -293,6 +293,7 @@ BFD32_BACKENDS = \
        sparcnetbsd.lo \
        sunos.lo \
        vaxnetbsd.lo \
+       vax1knetbsd.lo \
        versados.lo \
        vms.lo \
        vms-gsd.lo \
@@ -445,6 +446,7 @@ BFD32_BACKENDS_CFILES = \
        sparcnetbsd.c \
        sunos.c \
        vaxnetbsd.c \
+       vax1knetbsd.c \
        versados.c \
        vms.c \
        vms-gsd.c \
@@ -1422,6 +1424,9 @@ sunos.lo: sunos.c $(INCDIR)/bfdlink.h libaout.h aoutf1.h \
 vaxnetbsd.lo: vaxnetbsd.c netbsd.h $(INCDIR)/filenames.h \
   libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
+vax1knetbsd.lo: vax1knetbsd.c netbsd.h $(INCDIR)/filenames.h \
+  libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
 versados.lo: versados.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h
 vms.lo: vms.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   vms.h
index dd71d7e258841863a053e0758979ad7963319720..983ac2f47bc2757f21e3483aaf9c8705e9b4bf4b 100644 (file)
@@ -151,511 +151,45 @@ BFD_H = bfd.h
 # for the debugger, so if you are downloading things as S-records you
 # need two copies of the executable, one to download and one for the
 # debugger).
-BFD32_LIBS = \
-       archive.lo archures.lo bfd.lo cache.lo coffgen.lo corefile.lo \
-       format.lo init.lo libbfd.lo opncls.lo reloc.lo \
-       section.lo syms.lo targets.lo hash.lo linker.lo \
-       srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo \
-       merge.lo dwarf2.lo
+BFD32_LIBS =   archive.lo archures.lo bfd.lo cache.lo coffgen.lo corefile.lo   format.lo init.lo libbfd.lo opncls.lo reloc.lo  section.lo syms.lo targets.lo hash.lo linker.lo         srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo       merge.lo dwarf2.lo
 
 
 BFD64_LIBS = archive64.lo
 
-BFD32_LIBS_CFILES = \
-       archive.c archures.c bfd.c cache.c coffgen.c corefile.c \
-       format.c init.c libbfd.c opncls.c reloc.c \
-       section.c syms.c targets.c hash.c linker.c \
-       srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \
-       merge.c dwarf2.c
+BFD32_LIBS_CFILES =    archive.c archures.c bfd.c cache.c coffgen.c corefile.c         format.c init.c libbfd.c opncls.c reloc.c       section.c syms.c targets.c hash.c linker.c      srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c     merge.c dwarf2.c
 
 
 BFD64_LIBS_CFILES = archive64.c
 
 # This list is alphabetized to make it easier to keep in sync
 # with the decls and initializer in archures.c.
-ALL_MACHINES = \
-       cpu-a29k.lo \
-       cpu-alpha.lo \
-       cpu-arc.lo \
-       cpu-arm.lo \
-       cpu-avr.lo \
-       cpu-cris.lo \
-       cpu-d10v.lo \
-       cpu-d30v.lo \
-       cpu-dlx.lo \
-       cpu-fr30.lo \
-       cpu-h8300.lo \
-       cpu-h8500.lo \
-       cpu-hppa.lo \
-       cpu-ia64.lo \
-       cpu-i370.lo \
-       cpu-i386.lo \
-       cpu-i860.lo \
-       cpu-i960.lo \
-       cpu-m32r.lo \
-       cpu-m68hc11.lo \
-       cpu-m68hc12.lo \
-       cpu-m68k.lo \
-       cpu-m88k.lo \
-       cpu-m10200.lo \
-       cpu-m10300.lo \
-       cpu-mcore.lo \
-       cpu-mips.lo \
-       cpu-mmix.lo \
-       cpu-or32.lo \
-       cpu-ns32k.lo \
-       cpu-openrisc.lo \
-       cpu-pdp11.lo \
-       cpu-pj.lo \
-       cpu-powerpc.lo \
-       cpu-rs6000.lo \
-       cpu-s390.lo \
-       cpu-sh.lo \
-       cpu-sparc.lo \
-       cpu-tic30.lo \
-       cpu-tic54x.lo \
-       cpu-tic80.lo \
-       cpu-v850.lo \
-       cpu-vax.lo \
-       cpu-we32k.lo \
-       cpu-w65.lo \
-       cpu-xstormy16.lo \
-       cpu-z8k.lo
-
-
-ALL_MACHINES_CFILES = \
-       cpu-a29k.c \
-       cpu-alpha.c \
-       cpu-arc.c \
-       cpu-arm.c \
-       cpu-avr.c \
-       cpu-cris.c \
-       cpu-d10v.c \
-       cpu-d30v.c \
-       cpu-dlx.c \
-       cpu-fr30.c \
-       cpu-h8300.c \
-       cpu-h8500.c \
-       cpu-hppa.c \
-       cpu-ia64.c \
-       cpu-i370.c \
-       cpu-i386.c \
-       cpu-i860.c \
-       cpu-i960.c \
-       cpu-m32r.c \
-       cpu-m68hc11.c \
-       cpu-m68hc12.c \
-       cpu-m68k.c \
-       cpu-m88k.c \
-       cpu-m10200.c \
-       cpu-m10300.c \
-       cpu-mcore.c \
-       cpu-mips.c \
-       cpu-mmix.c \
-       cpu-or32.c \
-       cpu-ns32k.c \
-       cpu-openrisc.c \
-       cpu-pdp11.c \
-       cpu-pj.c \
-       cpu-powerpc.c \
-       cpu-rs6000.c \
-       cpu-s390.c \
-       cpu-sh.c \
-       cpu-sparc.c \
-       cpu-tic30.c \
-       cpu-tic54x.c \
-       cpu-tic80.c \
-       cpu-v850.c \
-       cpu-vax.c \
-       cpu-we32k.c \
-       cpu-w65.c \
-       cpu-xstormy16.c \
-       cpu-z8k.c
+ALL_MACHINES =         cpu-a29k.lo     cpu-alpha.lo    cpu-arc.lo      cpu-arm.lo      cpu-avr.lo      cpu-cris.lo     cpu-d10v.lo     cpu-d30v.lo     cpu-dlx.lo      cpu-fr30.lo     cpu-h8300.lo    cpu-h8500.lo    cpu-hppa.lo     cpu-ia64.lo     cpu-i370.lo     cpu-i386.lo     cpu-i860.lo     cpu-i960.lo     cpu-m32r.lo     cpu-m68hc11.lo  cpu-m68hc12.lo  cpu-m68k.lo     cpu-m88k.lo     cpu-m10200.lo   cpu-m10300.lo   cpu-mcore.lo    cpu-mips.lo     cpu-mmix.lo     cpu-or32.lo     cpu-ns32k.lo    cpu-openrisc.lo         cpu-pdp11.lo    cpu-pj.lo       cpu-powerpc.lo  cpu-rs6000.lo   cpu-s390.lo     cpu-sh.lo       cpu-sparc.lo    cpu-tic30.lo    cpu-tic54x.lo   cpu-tic80.lo    cpu-v850.lo     cpu-vax.lo      cpu-we32k.lo    cpu-w65.lo      cpu-xstormy16.lo        cpu-z8k.lo
+
+
+ALL_MACHINES_CFILES =          cpu-a29k.c      cpu-alpha.c     cpu-arc.c       cpu-arm.c       cpu-avr.c       cpu-cris.c      cpu-d10v.c      cpu-d30v.c      cpu-dlx.c       cpu-fr30.c      cpu-h8300.c     cpu-h8500.c     cpu-hppa.c      cpu-ia64.c      cpu-i370.c      cpu-i386.c      cpu-i860.c      cpu-i960.c      cpu-m32r.c      cpu-m68hc11.c   cpu-m68hc12.c   cpu-m68k.c      cpu-m88k.c      cpu-m10200.c    cpu-m10300.c    cpu-mcore.c     cpu-mips.c      cpu-mmix.c      cpu-or32.c      cpu-ns32k.c     cpu-openrisc.c  cpu-pdp11.c     cpu-pj.c        cpu-powerpc.c   cpu-rs6000.c    cpu-s390.c      cpu-sh.c        cpu-sparc.c     cpu-tic30.c     cpu-tic54x.c    cpu-tic80.c     cpu-v850.c      cpu-vax.c       cpu-we32k.c     cpu-w65.c       cpu-xstormy16.c         cpu-z8k.c
 
 
 # The .o files needed by all of the 32 bit vectors that are configured into
 # target_vector in targets.c if configured with --enable-targets=all.
-BFD32_BACKENDS = \
-       aout-adobe.lo \
-       aout-arm.lo \
-       aout-cris.lo \
-       aout-ns32k.lo \
-       aout-sparcle.lo \
-       aout-tic30.lo \
-       aout0.lo \
-       aout32.lo \
-       armnetbsd.lo \
-       bout.lo \
-       cf-i386lynx.lo \
-       cf-m68klynx.lo \
-       cf-sparclynx.lo \
-       coff-a29k.lo \
-       coff-apollo.lo \
-       coff-arm.lo \
-       coff-aux.lo \
-       coff-h8300.lo \
-       coff-h8500.lo \
-       coff-i386.lo \
-       coff-go32.lo \
-       coff-i860.lo \
-       coff-i960.lo \
-       coff-m68k.lo \
-       coff-m88k.lo \
-       coff-mips.lo \
-       coff-or32.lo \
-       coff-rs6000.lo \
-       coff-sh.lo \
-       coff-sparc.lo \
-       coff-stgo32.lo \
-       coff-svm68k.lo \
-       coff-tic30.lo \
-       coff-tic54x.lo \
-       coff-tic80.lo \
-       coff-u68k.lo \
-       coff-we32k.lo \
-       coff-w65.lo \
-       coff-z8k.lo \
-       cofflink.lo \
-       dwarf1.lo \
-       ecoff.lo \
-       ecofflink.lo \
-       efi-app-ia32.lo \
-       elf.lo \
-       elf32-arc.lo \
-       elfarm-oabi.lo \
-       elfarm-nabi.lo \
-       elf32-avr.lo \
-       elf32-cris.lo \
-       elf32-d10v.lo \
-       elf32-d30v.lo \
-       elf32-dlx.lo \
-       elf32-fr30.lo \
-       elf32-gen.lo \
-       elf32-h8300.lo \
-       elf32-hppa.lo \
-       elf32-i370.lo \
-       elf32-i386.lo \
-       elf32-i386qnx.lo \
-       elf32-i860.lo \
-       elf32-i960.lo \
-       elf32-ia64.lo \
-       elf32-m32r.lo \
-       elf32-m68hc11.lo \
-       elf32-m68hc12.lo \
-       elf32-m68k.lo \
-       elf32-m88k.lo \
-       elf-m10200.lo \
-       elf-m10300.lo \
-       elf32-mcore.lo \
-       elfxx-mips.lo \
-       elf32-mips.lo \
-       elf32-openrisc.lo \
-       elf32-or32.lo \
-       elf32-pj.lo \
-       elf32-ppc.lo \
-       elf32-s390.lo \
-       elf32-sh.lo \
-       elf32-sh-lin.lo \
-       elf32-sh64.lo \
-       elf32-sh64-com.lo \
-       elf32-sh-nbsd.lo \
-       elf32-sh64-nbsd.lo \
-       elf32-sparc.lo \
-       elf32-v850.lo \
-       elf32-vax.lo \
-       elf32-xstormy16.lo \
-       elf32.lo \
-       elflink.lo \
-       elf-strtab.lo \
-       elf-eh-frame.lo \
-       epoc-pe-arm.lo \
-       epoc-pei-arm.lo \
-       hp300bsd.lo \
-       hp300hpux.lo \
-       som.lo \
-       i386aout.lo \
-       i386bsd.lo \
-       i386dynix.lo \
-       i386freebsd.lo \
-       i386linux.lo \
-       i386lynx.lo \
-       i386msdos.lo \
-       i386netbsd.lo \
-       i386mach3.lo \
-       i386os9k.lo \
-       ieee.lo \
-       m68k4knetbsd.lo \
-       m68klinux.lo \
-       m68klynx.lo \
-       m68knetbsd.lo \
-       m88kmach3.lo \
-       mipsbsd.lo \
-       newsos3.lo \
-       nlm.lo \
-       nlm32-i386.lo \
-       nlm32-sparc.lo \
-       nlm32-ppc.lo \
-       nlm32.lo \
-       ns32knetbsd.lo \
-       oasys.lo \
-       pc532-mach.lo \
-       pdp11.lo \
-       pe-arm.lo \
-       pei-arm.lo \
-       pe-i386.lo \
-       pei-i386.lo \
-       pe-mcore.lo \
-       pei-mcore.lo \
-       pe-ppc.lo \
-       pei-ppc.lo \
-       pe-sh.lo \
-       pei-sh.lo \
-       pe-mips.lo \
-       pei-mips.lo \
-       peigen.lo \
-       ppcboot.lo \
-       reloc16.lo \
-       riscix.lo \
-       sparclinux.lo \
-       sparclynx.lo \
-       sparcnetbsd.lo \
-       sunos.lo \
-       vaxnetbsd.lo \
-       versados.lo \
-       vms.lo \
-       vms-gsd.lo \
-       vms-hdr.lo \
-       vms-misc.lo \
-       vms-tir.lo \
-       xcofflink.lo
-
-
-BFD32_BACKENDS_CFILES = \
-       aout-adobe.c \
-       aout-arm.c \
-       aout-cris.c \
-       aout-ns32k.c \
-       aout-sparcle.c \
-       aout-tic30.c \
-       aout0.c \
-       aout32.c \
-       armnetbsd.c \
-       bout.c \
-       cf-i386lynx.c \
-       cf-m68klynx.c \
-       cf-sparclynx.c \
-       coff-a29k.c \
-       coff-apollo.c \
-       coff-arm.c \
-       coff-aux.c \
-       coff-h8300.c \
-       coff-h8500.c \
-       coff-i386.c \
-       coff-i860.c \
-       coff-go32.c \
-       coff-i960.c \
-       coff-m68k.c \
-       coff-m88k.c \
-       coff-mips.c \
-       coff-or32.c \
-       coff-rs6000.c \
-       coff-sh.c \
-       coff-sparc.c \
-       coff-stgo32.c \
-       coff-svm68k.c \
-       coff-tic30.c \
-       coff-tic54x.c \
-       coff-tic80.c \
-       coff-u68k.c \
-       coff-we32k.c \
-       coff-w65.c \
-       coff-z8k.c \
-       cofflink.c \
-       dwarf1.c \
-       ecoff.c \
-       ecofflink.c \
-       efi-app-ia32.c \
-       elf.c \
-       elf32-arc.c \
-       elfarm-oabi.c \
-       elfarm-nabi.c \
-       elf32-avr.c \
-       elf32-cris.c \
-       elf32-d10v.c \
-       elf32-d30v.c \
-       elf32-dlx.c \
-       elf32-fr30.c \
-       elf32-gen.c \
-       elf32-h8300.c \
-       elf32-hppa.c \
-       elf32-i370.c \
-       elf32-i386.c \
-       elf32-i386qnx.c \
-       elf32-i860.c \
-       elf32-i960.c \
-       elf32-m32r.c \
-       elf32-m68k.c \
-       elf32-m68hc11.c \
-       elf32-m68hc12.c \
-       elf32-m88k.c \
-       elf-m10200.c \
-       elf-m10300.c \
-       elf32-mcore.c \
-       elfxx-mips.c \
-       elf32-mips.c \
-       elf32-openrisc.c \
-       elf32-or32.c \
-       elf32-pj.c \
-       elf32-ppc.c \
-       elf32-sh64.c \
-       elf32-sh64-com.c \
-       elf32-s390.c \
-       elf32-sh.c \
-       elf32-sh-lin.c \
-       elf32-sh-nbsd.c \
-       elf32-sh64-nbsd.c \
-       elf32-sparc.c \
-       elf32-v850.c \
-       elf32-vax.c \
-       elf32-xstormy16.c \
-       elf32.c \
-       elflink.c \
-       elf-strtab.c \
-       elf-eh-frame.c \
-       epoc-pe-arm.c \
-       epoc-pei-arm.c \
-       hp300bsd.c \
-       hp300hpux.c \
-       som.c \
-       i386aout.c \
-       i386bsd.c \
-       i386dynix.c \
-       i386freebsd.c \
-       i386linux.c \
-       i386lynx.c \
-       i386msdos.c \
-       i386netbsd.c \
-       i386mach3.c \
-       i386os9k.c \
-       ieee.c \
-       m68k4knetbsd.c \
-       m68klinux.c \
-       m68klynx.c \
-       m68knetbsd.c \
-       m88kmach3.c \
-       mipsbsd.c \
-       newsos3.c \
-       nlm.c \
-       nlm32-i386.c \
-       nlm32-sparc.c \
-       nlm32-ppc.c \
-       nlm32.c \
-       ns32knetbsd.c \
-       oasys.c \
-       pc532-mach.c \
-       pdp11.c \
-       pe-arm.c \
-       pei-arm.c \
-       pe-i386.c \
-       pei-i386.c \
-       pe-mcore.c \
-       pei-mcore.c \
-       pe-ppc.c \
-       pei-ppc.c \
-       pe-sh.c \
-       pei-sh.c \
-       pe-mips.c \
-       pei-mips.c \
-       ppcboot.c \
-       reloc16.c \
-       riscix.c \
-       sparclinux.c \
-       sparclynx.c \
-       sparcnetbsd.c \
-       sunos.c \
-       vaxnetbsd.c \
-       versados.c \
-       vms.c \
-       vms-gsd.c \
-       vms-hdr.c \
-       vms-misc.c \
-       vms-tir.c \
-       xcofflink.c
+BFD32_BACKENDS =       aout-adobe.lo   aout-arm.lo     aout-cris.lo    aout-ns32k.lo   aout-sparcle.lo         aout-tic30.lo   aout0.lo        aout32.lo       armnetbsd.lo    bout.lo         cf-i386lynx.lo  cf-m68klynx.lo  cf-sparclynx.lo         coff-a29k.lo    coff-apollo.lo  coff-arm.lo     coff-aux.lo     coff-h8300.lo   coff-h8500.lo   coff-i386.lo    coff-go32.lo    coff-i860.lo    coff-i960.lo    coff-m68k.lo    coff-m88k.lo    coff-mips.lo    coff-or32.lo    coff-rs6000.lo  coff-sh.lo      coff-sparc.lo   coff-stgo32.lo  coff-svm68k.lo  coff-tic30.lo   coff-tic54x.lo  coff-tic80.lo   coff-u68k.lo    coff-we32k.lo   coff-w65.lo     coff-z8k.lo     cofflink.lo     dwarf1.lo       ecoff.lo        ecofflink.lo    efi-app-ia32.lo         elf.lo  elf32-arc.lo    elfarm-oabi.lo  elfarm-nabi.lo  elf32-avr.lo    elf32-cris.lo   elf32-d10v.lo   elf32-d30v.lo   elf32-dlx.lo    elf32-fr30.lo   elf32-gen.lo    elf32-h8300.lo  elf32-hppa.lo   elf32-i370.lo   elf32-i386.lo   elf32-i386qnx.lo        elf32-i860.lo   elf32-i960.lo   elf32-ia64.lo   elf32-m32r.lo   elf32-m68hc11.lo        elf32-m68hc12.lo        elf32-m68k.lo   elf32-m88k.lo   elf-m10200.lo   elf-m10300.lo   elf32-mcore.lo  elfxx-mips.lo   elf32-mips.lo   elf32-openrisc.lo       elf32-or32.lo   elf32-pj.lo     elf32-ppc.lo    elf32-s390.lo   elf32-sh.lo     elf32-sh-lin.lo         elf32-sh64.lo   elf32-sh64-com.lo       elf32-sh-nbsd.lo        elf32-sh64-nbsd.lo      elf32-sparc.lo  elf32-v850.lo   elf32-vax.lo    elf32-xstormy16.lo      elf32.lo        elflink.lo      elf-strtab.lo   elf-eh-frame.lo         epoc-pe-arm.lo  epoc-pei-arm.lo         hp300bsd.lo     hp300hpux.lo    som.lo  i386aout.lo     i386bsd.lo      i386dynix.lo    i386freebsd.lo  i386linux.lo    i386lynx.lo     i386msdos.lo    i386netbsd.lo   i386mach3.lo    i386os9k.lo     ieee.lo         m68k4knetbsd.lo         m68klinux.lo    m68klynx.lo     m68knetbsd.lo   m88kmach3.lo    mipsbsd.lo      newsos3.lo      nlm.lo  nlm32-i386.lo   nlm32-sparc.lo  nlm32-ppc.lo    nlm32.lo        ns32knetbsd.lo  oasys.lo        pc532-mach.lo   pdp11.lo        pe-arm.lo       pei-arm.lo      pe-i386.lo      pei-i386.lo     pe-mcore.lo     pei-mcore.lo    pe-ppc.lo       pei-ppc.lo      pe-sh.lo        pei-sh.lo       pe-mips.lo      pei-mips.lo     peigen.lo       ppcboot.lo      reloc16.lo      riscix.lo       sparclinux.lo   sparclynx.lo    sparcnetbsd.lo  sunos.lo        vaxnetbsd.lo    vax1knetbsd.lo  versados.lo     vms.lo  vms-gsd.lo      vms-hdr.lo      vms-misc.lo     vms-tir.lo      xcofflink.lo
+
+
+BFD32_BACKENDS_CFILES =        aout-adobe.c    aout-arm.c      aout-cris.c     aout-ns32k.c    aout-sparcle.c  aout-tic30.c    aout0.c         aout32.c        armnetbsd.c     bout.c  cf-i386lynx.c   cf-m68klynx.c   cf-sparclynx.c  coff-a29k.c     coff-apollo.c   coff-arm.c      coff-aux.c      coff-h8300.c    coff-h8500.c    coff-i386.c     coff-i860.c     coff-go32.c     coff-i960.c     coff-m68k.c     coff-m88k.c     coff-mips.c     coff-or32.c     coff-rs6000.c   coff-sh.c       coff-sparc.c    coff-stgo32.c   coff-svm68k.c   coff-tic30.c    coff-tic54x.c   coff-tic80.c    coff-u68k.c     coff-we32k.c    coff-w65.c      coff-z8k.c      cofflink.c      dwarf1.c        ecoff.c         ecofflink.c     efi-app-ia32.c  elf.c   elf32-arc.c     elfarm-oabi.c   elfarm-nabi.c   elf32-avr.c     elf32-cris.c    elf32-d10v.c    elf32-d30v.c    elf32-dlx.c     elf32-fr30.c    elf32-gen.c     elf32-h8300.c   elf32-hppa.c    elf32-i370.c    elf32-i386.c    elf32-i386qnx.c         elf32-i860.c    elf32-i960.c    elf32-m32r.c    elf32-m68k.c    elf32-m68hc11.c         elf32-m68hc12.c         elf32-m88k.c    elf-m10200.c    elf-m10300.c    elf32-mcore.c   elfxx-mips.c    elf32-mips.c    elf32-openrisc.c        elf32-or32.c    elf32-pj.c      elf32-ppc.c     elf32-sh64.c    elf32-sh64-com.c        elf32-s390.c    elf32-sh.c      elf32-sh-lin.c  elf32-sh-nbsd.c         elf32-sh64-nbsd.c       elf32-sparc.c   elf32-v850.c    elf32-vax.c     elf32-xstormy16.c       elf32.c         elflink.c       elf-strtab.c    elf-eh-frame.c  epoc-pe-arm.c   epoc-pei-arm.c  hp300bsd.c      hp300hpux.c     som.c   i386aout.c      i386bsd.c       i386dynix.c     i386freebsd.c   i386linux.c     i386lynx.c      i386msdos.c     i386netbsd.c    i386mach3.c     i386os9k.c      ieee.c  m68k4knetbsd.c  m68klinux.c     m68klynx.c      m68knetbsd.c    m88kmach3.c     mipsbsd.c       newsos3.c       nlm.c   nlm32-i386.c    nlm32-sparc.c   nlm32-ppc.c     nlm32.c         ns32knetbsd.c   oasys.c         pc532-mach.c    pdp11.c         pe-arm.c        pei-arm.c       pe-i386.c       pei-i386.c      pe-mcore.c      pei-mcore.c     pe-ppc.c        pei-ppc.c       pe-sh.c         pei-sh.c        pe-mips.c       pei-mips.c      ppcboot.c       reloc16.c       riscix.c        sparclinux.c    sparclynx.c     sparcnetbsd.c   sunos.c         vaxnetbsd.c     vax1knetbsd.c   versados.c      vms.c   vms-gsd.c       vms-hdr.c       vms-misc.c      vms-tir.c       xcofflink.c
 
 
 # The .o files needed by all of the 64 bit vectors that are configured into
 # target_vector in targets.c if configured with --enable-targets=all
 # and --enable-64-bit-bfd.
-BFD64_BACKENDS = \
-       aix5ppc-core.lo \
-       aout64.lo \
-       coff-alpha.lo \
-       coff64-rs6000.lo \
-       demo64.lo \
-       efi-app-ia64.lo \
-       elf64-x86-64.lo \
-       elf64-alpha.lo \
-       elf64-hppa.lo \
-       elf64-ia64.lo \
-       elf64-gen.lo \
-       elf64-mips.lo \
-       elf64-mmix.lo \
-       elf64-sh64.lo \
-       elf64-sh64-nbsd.lo \
-       elf64-ppc.lo \
-       elf64-s390.lo \
-       elf64-sparc.lo \
-       elf64.lo \
-       mmo.lo \
-       nlm32-alpha.lo \
-       nlm64.lo \
-       pepigen.lo
-
-
-BFD64_BACKENDS_CFILES = \
-       aix5ppc-core.c \
-       aout64.c \
-       coff-alpha.c \
-       coff64-rs6000.c \
-       demo64.c \
-       efi-app-ia64.c \
-       elf64-x86-64.c \
-       elf64-alpha.c \
-       elf64-hppa.c \
-       elf64-gen.c \
-       elf64-mips.c \
-       elf64-mmix.c \
-       elf64-ppc.c \
-       elf64-s390.c \
-       elf64-sh64.c \
-       elf64-sh64-nbsd.c \
-       elf64-sparc.c \
-       elf64.c \
-       mmo.c \
-       nlm32-alpha.c \
-       nlm64.c
-
-
-OPTIONAL_BACKENDS = \
-       aix386-core.lo \
-       hpux-core.lo \
-       irix-core.lo \
-       lynx-core.lo \
-       osf-core.lo \
-       sco5-core.lo \
-       trad-core.lo \
-       cisco-core.lo
-
-
-OPTIONAL_BACKENDS_CFILES = \
-       aix386-core.c \
-       hpux-core.c \
-       irix-core.c \
-       lynx-core.c \
-       osf-core.c \
-       sco5-core.c \
-       trad-core.c \
-       cisco-core.c
+BFD64_BACKENDS =       aix5ppc-core.lo         aout64.lo       coff-alpha.lo   coff64-rs6000.lo        demo64.lo       efi-app-ia64.lo         elf64-x86-64.lo         elf64-alpha.lo  elf64-hppa.lo   elf64-ia64.lo   elf64-gen.lo    elf64-mips.lo   elf64-mmix.lo   elf64-sh64.lo   elf64-sh64-nbsd.lo      elf64-ppc.lo    elf64-s390.lo   elf64-sparc.lo  elf64.lo        mmo.lo  nlm32-alpha.lo  nlm64.lo        pepigen.lo
+
+
+BFD64_BACKENDS_CFILES =        aix5ppc-core.c  aout64.c        coff-alpha.c    coff64-rs6000.c         demo64.c        efi-app-ia64.c  elf64-x86-64.c  elf64-alpha.c   elf64-hppa.c    elf64-gen.c     elf64-mips.c    elf64-mmix.c    elf64-ppc.c     elf64-s390.c    elf64-sh64.c    elf64-sh64-nbsd.c       elf64-sparc.c   elf64.c         mmo.c   nlm32-alpha.c   nlm64.c
+
+
+OPTIONAL_BACKENDS =    aix386-core.lo  hpux-core.lo    irix-core.lo    lynx-core.lo    osf-core.lo     sco5-core.lo    trad-core.lo    cisco-core.lo
+
+
+OPTIONAL_BACKENDS_CFILES =     aix386-core.c   hpux-core.c     irix-core.c     lynx-core.c     osf-core.c      sco5-core.c     trad-core.c     cisco-core.c
 
 
 # These are defined by configure.in:
@@ -669,33 +203,18 @@ TDEFAULTS = @tdefaults@
 INCLUDES = -D_GNU_SOURCE @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl
 
 # C source files that correspond to .o's.
-SOURCE_CFILES = \
-       $(BFD32_LIBS_CFILES) \
-       $(BFD64_LIBS_CFILES) \
-       $(ALL_MACHINES_CFILES) \
-       $(BFD32_BACKENDS_CFILES) \
-       $(BFD64_BACKENDS_CFILES) \
-       $(OPTIONAL_BACKENDS_CFILES)
+SOURCE_CFILES =        $(BFD32_LIBS_CFILES)    $(BFD64_LIBS_CFILES)    $(ALL_MACHINES_CFILES)  $(BFD32_BACKENDS_CFILES)        $(BFD64_BACKENDS_CFILES)        $(OPTIONAL_BACKENDS_CFILES)
 
 
-BUILD_CFILES = \
-       elf32-ia64.c elf64-ia64.c peigen.c pepigen.c
+BUILD_CFILES =         elf32-ia64.c elf64-ia64.c peigen.c pepigen.c
 
 
 CFILES = $(SOURCE_CFILES) $(BUILD_CFILES)
 
-SOURCE_HFILES = \
-       aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \
-       elf-bfd.h elf-hppa.h elf32-arm.h elf32-hppa.h elf64-hppa.h \
-       elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h \
-       libaout.h libbfd.h libcoff.h libecoff.h libhppa.h \
-       libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h \
-       nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h \
-       xcoff-target.h version.h
+SOURCE_HFILES =        aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h        elf-bfd.h elf-hppa.h elf32-arm.h elf32-hppa.h elf64-hppa.h      elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h    libaout.h libbfd.h libcoff.h libecoff.h libhppa.h       libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h    nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h    xcoff-target.h version.h
 
 
-BUILD_HFILES = \
-       elf32-target.h elf64-target.h targmatch.h
+BUILD_HFILES =         elf32-target.h elf64-target.h targmatch.h
 
 
 HFILES = $(SOURCE_HFILES) $(BUILD_HFILES)
@@ -725,8 +244,7 @@ libbfd_a_SOURCES =
 BFD_H_DEPS = $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
 LOCAL_H_DEPS = libbfd.h sysdep.h config.h
 
-BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
-       reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c version.h
+BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c   reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c version.h
 
 BFD64_H_FILES = archive64.c
 LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c cache.c reloc.c archures.c elf.c
@@ -734,8 +252,7 @@ LIBCOFF_H_FILES = libcoff-in.h coffcode.h
 
 MOSTLYCLEANFILES = ofiles stamp-ofiles
 
-CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \
-       stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
+CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib    stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
 
 
 DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES)
@@ -1951,6 +1468,9 @@ sunos.lo: sunos.c $(INCDIR)/bfdlink.h libaout.h aoutf1.h \
 vaxnetbsd.lo: vaxnetbsd.c netbsd.h $(INCDIR)/filenames.h \
   libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \
   $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
+vax1knetbsd.lo: vax1knetbsd.c netbsd.h $(INCDIR)/filenames.h \
+  libaout.h $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \
+  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
 versados.lo: versados.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h
 vms.lo: vms.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   vms.h
index 956e90931e29dd624d248f346a8640e4a460e5d0..a407681e9a267396db0ff2a40f1ada060b1c54bb 100644 (file)
@@ -1100,12 +1100,12 @@ case "${targ}" in
 
   vax-*-netbsdelf*)
     targ_defvec=bfd_elf32_vax_vec
-    targ_selvecs=vaxnetbsd_vec
+    targ_selvecs="vaxnetbsd_vec vax1knetbsd_vec"
     ;;
 
   vax-*-netbsdaout* | vax-*-netbsd*)
     targ_defvec=vaxnetbsd_vec
-    targ_selvecs=bfd_elf32_vax_vec
+    targ_selvecs="bfd_elf32_vax_vec vax1knetbsd_vec"
     targ_underscore=yes
     ;;
 
index dca9eb46748e2fb171bac0d5776bc70f4139aa7b..a17601132fa1ea418812cf0490226e19868033d2 100755 (executable)
@@ -6226,6 +6226,7 @@ do
     tic54x_coff2_vec)          tb="$tb coff-tic54x.lo" ;;
     tic80coff_vec)             tb="$tb coff-tic80.lo cofflink.lo" ;;
     vaxnetbsd_vec)             tb="$tb vaxnetbsd.lo aout32.lo" ;;
+    vax1knetbsd_vec)           tb="$tb vax1knetbsd.lo aout32.lo" ;;
     versados_vec)              tb="$tb versados.lo" ;;
     vms_alpha_vec)             tb="$tb vms.lo vms-hdr.lo vms-gsd.lo vms-tir.lo vms-misc.lo"; target_size=64 ;;
     vms_vax_vec)               tb="$tb vms.lo vms-hdr.lo vms-gsd.lo vms-tir.lo vms-misc.lo" ;;
@@ -6301,10 +6302,10 @@ case ${host64}-${target64}-${want64} in
     if test -n "$GCC" ; then
        bad_64bit_gcc=no;
        echo $ac_n "checking for gcc version with buggy 64-bit support""... $ac_c" 1>&6
-echo "configure:6305: checking for gcc version with buggy 64-bit support" >&5
+echo "configure:6306: checking for gcc version with buggy 64-bit support" >&5
        # Add more tests for gcc versions with non-working 64-bit support here.
        cat > conftest.$ac_ext <<EOF
-#line 6308 "configure"
+#line 6309 "configure"
 #include "confdefs.h"
 :__GNUC__:__GNUC_MINOR__:__i386__:
 EOF
@@ -6349,17 +6350,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6353: checking for $ac_hdr" >&5
+echo "configure:6354: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6358 "configure"
+#line 6359 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6388,12 +6389,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6392: checking for $ac_func" >&5
+echo "configure:6393: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6397 "configure"
+#line 6398 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6416,7 +6417,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6441,7 +6442,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6445: checking for working mmap" >&5
+echo "configure:6446: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6449,7 +6450,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6453 "configure"
+#line 6454 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6589,7 +6590,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:6593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6614,12 +6615,12 @@ fi
 for ac_func in madvise mprotect
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6618: checking for $ac_func" >&5
+echo "configure:6619: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6623 "configure"
+#line 6624 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6642,7 +6643,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
index a143777f1b93243e0cc17bfe23fc3ec19115f3b5..040a068a9023fb25697709628d32109b593abdce 100644 (file)
@@ -740,6 +740,7 @@ do
     tic54x_coff2_vec)          tb="$tb coff-tic54x.lo" ;;
     tic80coff_vec)             tb="$tb coff-tic80.lo cofflink.lo" ;;
     vaxnetbsd_vec)             tb="$tb vaxnetbsd.lo aout32.lo" ;;
+    vax1knetbsd_vec)           tb="$tb vax1knetbsd.lo aout32.lo" ;;
     versados_vec)              tb="$tb versados.lo" ;;
     vms_alpha_vec)             tb="$tb vms.lo vms-hdr.lo vms-gsd.lo vms-tir.lo vms-misc.lo"; target_size=64 ;;
     vms_vax_vec)               tb="$tb vms.lo vms-hdr.lo vms-gsd.lo vms-tir.lo vms-misc.lo" ;;
index 6902f4126b623ab416153b5d4e0314e6f616a32e..7c6f4f3c94a08e8957892c75a10251826cd31d61 100644 (file)
@@ -671,6 +671,7 @@ extern const bfd_target tic54x_coff2_beh_vec;
 extern const bfd_target tic54x_coff2_vec;
 extern const bfd_target tic80coff_vec;
 extern const bfd_target vaxnetbsd_vec;
+extern const bfd_target vax1knetbsd_vec;
 extern const bfd_target versados_vec;
 extern const bfd_target vms_alpha_vec;
 extern const bfd_target vms_vax_vec;
@@ -979,6 +980,7 @@ static const bfd_target * const _bfd_target_vector[] = {
        &tic54x_coff2_vec,
        &tic80coff_vec,
        &vaxnetbsd_vec,
+       &vax1knetbsd_vec,
        &versados_vec,
 #ifdef BFD64
        &vms_alpha_vec,
diff --git a/bfd/vax1knetbsd.c b/bfd/vax1knetbsd.c
new file mode 100644 (file)
index 0000000..e20cd17
--- /dev/null
@@ -0,0 +1,37 @@
+/* BFD back-end for NetBSD/VAX (1K page size) a.out-ish binaries.
+   Copyright 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+This file is part of BFD, the Binary File Descriptor library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#define        BYTES_IN_WORD   4
+#undef TARGET_IS_BIG_ENDIAN_P
+
+#define        TARGET_PAGE_SIZE        1024
+#define        SEGMENT_SIZE    TARGET_PAGE_SIZE
+
+#define        DEFAULT_ARCH    bfd_arch_vax
+#define        DEFAULT_MID     M_VAX_NETBSD
+
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (vax1knetbsd_,OP)
+
+/* This needs to start with a.out so GDB knows it is an a.out variant.  */
+#define TARGETNAME "a.out-vax1k-netbsd"
+
+#include "netbsd.h"
index 21a0b37aafcb50dcec5a96b0897ead757d6c0664..48a1ed637a25cc92ebac7d3b4b4fc277df94a522 100644 (file)
@@ -1,5 +1,5 @@
-/* BFD back-end for NetBSD/VAX a.out-ish binaries.
-   Copyright 1998, 2000, 2001 Free Software Foundation, Inc.
+/* BFD back-end for NetBSD/VAX (4K page size) a.out-ish binaries.
+   Copyright 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -20,11 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        BYTES_IN_WORD   4
 #undef TARGET_IS_BIG_ENDIAN_P
 
-#define        TARGET_PAGE_SIZE        1024
+#define        TARGET_PAGE_SIZE        0x1000
 #define        SEGMENT_SIZE    TARGET_PAGE_SIZE
 
 #define        DEFAULT_ARCH    bfd_arch_vax
-#define        DEFAULT_MID     M_VAX_NETBSD
+#define        DEFAULT_MID     M_VAX4K_NETBSD
 
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate