From f2724df5662ed204e41660907ac49ead75f79f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ni=C3=B1o=20D=C3=ADaz?= Date: Sun, 23 Apr 2017 20:45:32 +0200 Subject: [PATCH] Fix rgblink error messages about prohibited sections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antonio Niño Díaz --- src/link/object.c | 4 ++-- test/link/vram-fixed-dmg-mode-d.out | 2 +- test/link/wramx-dmg-mode-d.out | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/link/object.c b/src/link/object.c index 67536531..3a8d1a5d 100644 --- a/src/link/object.c +++ b/src/link/object.c @@ -160,12 +160,12 @@ obj_ReadRGBSection(FILE * f) errx(1, "ROMX sections can't be used with option -t."); } if ((options & OPT_CONTWRAM) && (pSection->Type == SECT_WRAMX)) { - errx(1, "WRAMX sections can't be used with option -w."); + errx(1, "WRAMX sections can't be used with options -w or -d."); } if (options & OPT_DMG_MODE) { /* WRAMX sections are checked for OPT_CONTWRAM */ if (pSection->Type == SECT_VRAM && pSection->nBank == 1) { - errx(1, "VRAM bank 1 can't be used with option -w."); + errx(1, "VRAM bank 1 can't be used with option -d."); } } diff --git a/test/link/vram-fixed-dmg-mode-d.out b/test/link/vram-fixed-dmg-mode-d.out index 1ed998ce..dc1e50a1 100644 --- a/test/link/vram-fixed-dmg-mode-d.out +++ b/test/link/vram-fixed-dmg-mode-d.out @@ -1 +1 @@ -error: VRAM bank 1 can't be used with option -w. +error: VRAM bank 1 can't be used with option -d. diff --git a/test/link/wramx-dmg-mode-d.out b/test/link/wramx-dmg-mode-d.out index 8ca11a50..0c732ca8 100644 --- a/test/link/wramx-dmg-mode-d.out +++ b/test/link/wramx-dmg-mode-d.out @@ -1 +1 @@ -error: WRAMX sections can't be used with option -w. +error: WRAMX sections can't be used with options -w or -d.