Skip to contentSkip to conversation

target/unicore32: Remove CURSES stuff from the Makefile.objs

PATCH In review Thomas Huth 4 participants 7 messages Jul 23, 2020 – Jul 25, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/unicore32: Remove CURSES stuff from the Makefile.objs

The dependency on curses has been removed in commit c7a856b42e403e2b ("target/unicore32: Prefer qemu_semihosting_log_out() over curses"). So we can remove the related lines in the Makefile now, too.

---
 target/unicore32/Makefile.objs | 4 ----
 1 file changed, 4 deletions(-)
target/unicore32/Makefile.objs +0 -4
index 35d8bf530d..6b41b1e9ef 100644
@@ -2,7 +2,3 @@ obj-y += translate.o op_helper.o helper.o cpu.o
 obj-y += ucf64_helper.o
 
 obj-$(CONFIG_SOFTMMU) += softmmu.o
-
-# Huh? Uses curses directly instead of using ui/console.h interfaces ...
-helper.o-cflags := $(CURSES_CFLAGS)
-helper.o-libs := $(CURSES_LIBS)
Signature · 1 line
2.18.1
#1 lore raw
Quoted 3 lines · Thomas Huth

The dependency on curses has been removed in commit c7a856b42e403e2b ("target/unicore32: Prefer qemu_semihosting_log_out() over curses"). So we can remove the related lines in the Makefile now, too.

Don't we also need to remove all uses of CONFIG_CURSES to be complete? Eventually display a warning with --(en|dis)able-curses is used.

Quoted 19 lines
---
 target/unicore32/Makefile.objs | 4 ----
 1 file changed, 4 deletions(-)
target/unicore32/Makefile.objs +0 -4
index 35d8bf530d..6b41b1e9ef 100644
@@ -2,7 +2,3 @@ obj-y += translate.o op_helper.o helper.o cpu.o
 obj-y += ucf64_helper.o
 
 obj-$(CONFIG_SOFTMMU) += softmmu.o
-
-# Huh? Uses curses directly instead of using ui/console.h interfaces ...
-helper.o-cflags := $(CURSES_CFLAGS)
-helper.o-libs := $(CURSES_LIBS)
#2 lore raw
Quoted 8 lines · Philippe Mathieu-Daudé
Quoted 3 lines · Thomas Huth

The dependency on curses has been removed in commit c7a856b42e403e2b ("target/unicore32: Prefer qemu_semihosting_log_out() over curses"). So we can remove the related lines in the Makefile now, too.

Don't we also need to remove all uses of CONFIG_CURSES to be complete? Eventually display a warning with --(en|dis)able-curses is used.

Which ones do you mean? I can't find any other CONFIG_CURSES anymore in the target/ folder...

Or do you also plan to get rid of ui/curses.c ??? ... that's certainly another story.

Thomas

Reviewed-by on v1 1/1
#4 lore raw
In reply to Thomas Huth
Quoted 6 lines · Thomas Huth

The dependency on curses has been removed in commit c7a856b42e403e2b ("target/unicore32: Prefer qemu_semihosting_log_out() over curses"). So we can remove the related lines in the Makefile now, too.

Another, unrelated, CONFIG_CURSES oddity:
hw/input/virtio-input-hid.c has an "#undef CONFIG_CURSES" before it includes ui/console.h. But that header file doesn't do anything different if CONFIG_CURSES is defined, so I think the undef is now useless and can be removed.

thanks
-- PMM

#3 lore raw
In reply to Thomas Huth
Quoted 10 lines · Thomas Huth
Quoted 8 lines · Philippe Mathieu-Daudé
Quoted 3 lines · Thomas Huth

The dependency on curses has been removed in commit c7a856b42e403e2b ("target/unicore32: Prefer qemu_semihosting_log_out() over curses"). So we can remove the related lines in the Makefile now, too.

Don't we also need to remove all uses of CONFIG_CURSES to be complete? Eventually display a warning with --(en|dis)able-curses is used.

Quoted 5 lines

Which ones do you mean? I can't find any other CONFIG_CURSES anymore in the target/ folder...

Or do you also plan to get rid of ui/curses.c ??? ... that's certainly another story.

Ah indeed.

#5 lore raw
In reply to Peter Maydell
Quoted 8 lines · Peter Maydell
Quoted 6 lines · Thomas Huth

The dependency on curses has been removed in commit c7a856b42e403e2b ("target/unicore32: Prefer qemu_semihosting_log_out() over curses"). So we can remove the related lines in the Makefile now, too.

Quoted 7 lines

Another, unrelated, CONFIG_CURSES oddity:
hw/input/virtio-input-hid.c has an "#undef CONFIG_CURSES" before it includes ui/console.h. But that header file doesn't do anything different if CONFIG_CURSES is defined, so I think the undef is now useless and can be removed.

There used to be some curses stuff in that header, but it has been removed more than two years ago (see commit b0766612d16da18). So yes, I think you're right, that #undef CONFIG_CURSES can be removed now. Care to send a patch?

Thomas

Acked-by on v1 1/1
#6 lore raw
In reply to Thomas Huth

That's OK for unicore32 target.

Quoted 30 lines

-----原始邮件-----
发件人: "Thomas Huth" <[email protected]>
发送时间: 2020-07-23 21:22:19 (星期四)
收件人: "Guan Xuetao" <[email protected]>, [email protected]
抄送: "Philippe Mathieu-Daudé" <[email protected]>, [email protected], "Richard Henderson" <[email protected]> 主题: [PATCH] target/unicore32: Remove CURSES stuff from the Makefile.objs

The dependency on curses has been removed in commit c7a856b42e403e2b ("target/unicore32: Prefer qemu_semihosting_log_out() over curses"). So we can remove the related lines in the Makefile now, too.

---
 target/unicore32/Makefile.objs | 4 ----
 1 file changed, 4 deletions(-)
target/unicore32/Makefile.objs +0 -4
index 35d8bf530d..6b41b1e9ef 100644
@@ -2,7 +2,3 @@ obj-y += translate.o op_helper.o helper.o cpu.o
 obj-y += ucf64_helper.o
 
 obj-$(CONFIG_SOFTMMU) += softmmu.o
-
-# Huh? Uses curses directly instead of using ui/console.h interfaces ...
-helper.o-cflags := $(CURSES_CFLAGS)
-helper.o-libs := $(CURSES_LIBS)
Signature · 1 line
2.18.1