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

diff --cc README.md
index 359fdaa08b7f976adcf26273cbf69f627a624638,16e92e8783e5f1b7afaba5d8d8b3f78d42749459..f8914c45af37f8e38d7cd99493dfc34a8566e566
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -29,8 -29,8 +29,9 @@@ includin
  - the NEC PC-Engine (aka TurboGrafx-16).
  - the Nintendo Entertainment System (NES) console.
  - the Watara Supervision console.
 +- the VTech Creativision console.
  - the Oric Atmos.
+ - the Oric Telestrat.
  - the Lynx console.
  - the Ohio Scientific Challenger 1P.
  

diff --cc libsrc/Makefile
Simple merge

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

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

diff --cc src/common/target.c
index 84559b0e7e80db385c9634481987947b09c9fc55,72de86a6779dc12d90d6472da577e3fbd76cc085..56ea0a2ffe9a085e05d3efc7c26e2082f7fc82c9
--- 1/src/common/target.c
--- 2/src/common/target.c
+++ b/src/common/target.c
@@@ -142,38 -142,38 +142,39 @@@ struct TargetEntry 
  ** Allows multiple entries for one target id (target name aliases).
  */
  static const TargetEntry TargetMap[] = {
 -    {   "apple2",       TGT_APPLE2      },
 -    {   "apple2enh",    TGT_APPLE2ENH   },
 -    {   "atari",        TGT_ATARI       },
 -    {   "atari2600",    TGT_ATARI2600   },
 -    {   "atari5200",    TGT_ATARI5200   },
 -    {   "atarixl",      TGT_ATARIXL     },
 -    {   "atmos",        TGT_ATMOS       },
 -    {   "bbc",          TGT_BBC         },
 -    {   "c128",         TGT_C128        },
 -    {   "c16",          TGT_C16         },
 -    {   "c64",          TGT_C64         },
 -    {   "c65",          TGT_C65         },
 -    {   "cbm510",       TGT_CBM510      },
 -    {   "cbm610",       TGT_CBM610      },
 -    {   "gamate",       TGT_GAMATE      },
 -    {   "geos",         TGT_GEOS_CBM    },
 -    {   "geos-apple",   TGT_GEOS_APPLE  },
 -    {   "geos-cbm",     TGT_GEOS_CBM    },
 -    {   "lunix",        TGT_LUNIX       },
 -    {   "lynx",         TGT_LYNX        },
 -    {   "module",       TGT_MODULE      },
 -    {   "nes",          TGT_NES         },
 -    {   "none",         TGT_NONE        },
 -    {   "osic1p",       TGT_OSIC1P      },
 -    {   "pce",          TGT_PCENGINE    },
 -    {   "pet",          TGT_PET         },
 -    {   "plus4",        TGT_PLUS4       },
 -    {   "sim6502",      TGT_SIM6502     },
 -    {   "sim65c02",     TGT_SIM65C02    },
 -    {   "supervision",  TGT_SUPERVISION },
 -    {   "telestrat",    TGT_TELESTRAT   },
 -    {   "vic20",        TGT_VIC20       },
 +    {   "apple2",       TGT_APPLE2       },
 +    {   "apple2enh",    TGT_APPLE2ENH    },
 +    {   "atari",        TGT_ATARI        },
 +    {   "atari2600",    TGT_ATARI2600    },
 +    {   "atari5200",    TGT_ATARI5200    },
 +    {   "atarixl",      TGT_ATARIXL      },
 +    {   "atmos",        TGT_ATMOS        },
 +    {   "bbc",          TGT_BBC          },
 +    {   "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   },
 +    {   "geos-cbm",     TGT_GEOS_CBM     },
 +    {   "lunix",        TGT_LUNIX        },
 +    {   "lynx",         TGT_LYNX         },
 +    {   "module",       TGT_MODULE       },
 +    {   "nes",          TGT_NES          },
 +    {   "none",         TGT_NONE         },
 +    {   "osic1p",       TGT_OSIC1P       },
 +    {   "pce",          TGT_PCENGINE     },
 +    {   "pet",          TGT_PET          },
 +    {   "plus4",        TGT_PLUS4        },
 +    {   "sim6502",      TGT_SIM6502      },
 +    {   "sim65c02",     TGT_SIM65C02     },
 +    {   "supervision",  TGT_SUPERVISION  },
++    {   "telestrat",    TGT_TELESTRAT    },
 +    {   "vic20",        TGT_VIC20        },
  };
  #define MAP_ENTRY_COUNT         (sizeof (TargetMap) / sizeof (TargetMap[0]))
  

diff --cc src/common/target.h
Simple merge