Merge remote-tracking branch 'upstream/master'

2013-06-28 00:49:12 +02:00
parent 82e73447c9 5edcd639e0
commit 1e9823306a
7 changed files with 7 additions and 14 deletions
--- a/libsrc/dbg/dbg.c
+++ b/libsrc/dbg/dbg.c
@@ -47,7 +47,7 @@ static char GetKeyUpdate (void);


 /* Color definitions */
-#if defined(__PLUS4__) || defined(__C16__)
+#if defined(__C16__)
 #  define COLOR_BORDER          (BCOLOR_DARKBLUE | CATTR_LUMA6)
 #  define COLOR_BACKGROUND      COLOR_WHITE
 #  define COLOR_TEXTHIGH        COLOR_BLACK
--- a/libsrc/runtime/zeropage.s
+++ b/libsrc/runtime/zeropage.s
@@ -22,10 +22,3 @@ tmp2:           .res    1
 tmp3:           .res    1
 tmp4:           .res    1
 regbank:        .res    regbanksize     ; Register bank
-
-; Add an empty EXTZP zeropage segment to avoid linker warnings that this
-; segment does not exist (it does not exist in most builtin linker configs
-; but is used when linking modules).
-
-.segment        "EXTZP" : zeropage
-
--- a/libsrc/sim6502/exehdr.s
+++ b/libsrc/sim6502/exehdr.s
@@ -6,8 +6,6 @@

        .export         __EXEHDR__ : absolute = 1       ; Linker referenced

-; ------------------------------------------------------------------------
-
        .segment        "EXEHDR"

        .byte   .defined(__SIM65C02__)