Merge remote-tracking branch 'upstream/master' into creativision

diff --cc libsrc/Makefile
index 364b266c809e11e1b3dda9b12116d61f3a5d6e00,6b6a8fce8b3bee0f5024f2cafb393268b683434a..6b98696813fe769b294e14e0b23a41bc7a382c96
--- 1/libsrc/Makefile
--- 2/libsrc/Makefile
+++ b/libsrc/Makefile
@@@ -18,9 -19,9 +19,10 @@@ TARGETS = apple2    
            apple2enh \
            atari     \
            atarixl   \
+           atari2600 \
            atari5200 \
            atmos     \
 +          creativision \
            $(CBMS)   \
            $(GEOS)   \
            gamate    \

diff --cc src/ca65/main.c
Simple merge

diff --cc src/cc65/main.c
Simple merge

diff --cc src/common/target.c
index cc5d412069c81cb672f09b3b98fab37715d91de4,42db5dee3928c9718ae8540aa8213be3f7beaed3..bf87b17e0ade1ad593bc79949ab1c2c6ce6b30c9
--- 1/src/common/target.c
--- 2/src/common/target.c
+++ b/src/common/target.c
@@@ -152,9 -153,9 +153,10 @@@ static const TargetEntry TargetMap[] = 
      {   "c128",         TGT_C128        },
      {   "c16",          TGT_C16         },
      {   "c64",          TGT_C64         },
+     {   "c65",          TGT_C65         },
      {   "cbm510",       TGT_CBM510      },
      {   "cbm610",       TGT_CBM610      },
 +    {   "creativision", TGT_CREATIVISION},
      {   "gamate",       TGT_GAMATE      },
      {   "geos",         TGT_GEOS_CBM    },
      {   "geos-apple",   TGT_GEOS_APPLE  },
@@@ -193,21 -194,21 +195,24 @@@ static const TargetProperties PropertyT
      { "cbm610",         CPU_6502,       BINFMT_BINARY,      CTPET   },
      { "osic1p",         CPU_6502,       BINFMT_BINARY,      CTOSI   },
      { "pet",            CPU_6502,       BINFMT_BINARY,      CTPET   },
 -    { "bbc",            CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "apple2",         CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "apple2enh",      CPU_65C02,      BINFMT_BINARY,      CTNone  },
 -    { "geos-cbm",       CPU_6502,       BINFMT_BINARY,      CTNone  },
 +    { "atmos",          CPU_6502,       BINFMT_BINARY,      CTNone  },
 +    { "bbc",            CPU_6502,       BINFMT_BINARY,      CTNone  },
 +    { "creativision",   CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "geos-apple",     CPU_65C02,      BINFMT_BINARY,      CTNone  },
 +    { "geos-cbm",       CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "lunix",          CPU_6502,       BINFMT_O65,         CTNone  },
-     { "lynx",           CPU_65C02,      BINFMT_BINARY,      CTNone  },
+     { "atmos",          CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "nes",            CPU_6502,       BINFMT_BINARY,      CTNone  },
+     { "supervision",    CPU_65SC02,     BINFMT_BINARY,      CTNone  },
+     { "lynx",           CPU_65SC02,     BINFMT_BINARY,      CTNone  },
      { "sim6502",        CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "sim65c02",       CPU_65C02,      BINFMT_BINARY,      CTNone  },
      { "pce",            CPU_HUC6280,    BINFMT_BINARY,      CTNone  },
      { "gamate",         CPU_6502,       BINFMT_BINARY,      CTNone  },
 +    { "supervision",    CPU_65SC02,     BINFMT_BINARY,      CTNone  },
+     { "c65",            CPU_4510,       BINFMT_BINARY,      CTPET   },
  };
  
  /* Target system */

diff --cc src/common/target.h
index c266a4408f1c74b405896e0bfb1eea5d5e657b83,a5cb44b98e1b4cda44d3e6cf4c451c8ac3cf041d..1e54784b163e3df7e76eefb9ed9e6da963b20055
--- 1/src/common/target.h
--- 2/src/common/target.h
+++ b/src/common/target.h
@@@ -80,7 -81,7 +81,8 @@@ typedef enum 
      TGT_SIM65C02,
      TGT_PCENGINE,
      TGT_GAMATE,
 +    TGT_SUPERVISION,
+     TGT_C65,
      TGT_COUNT                   /* Number of target systems */
  } target_t;