[Qemu-devel] [PATCH] Fix bsd-user build errors after 8642c1b81e0418df066a7960a7426d85a923a253

[Qemu-devel] [PATCH] Fix bsd-user build errors after 8642c1b81e0418df066a7960a7426d85a923a253

[Sean Bruno]

  LINK  sparc-bsd-user/qemu-sparc
bsd-user/main.o: In function `cpu_loop':
/home/sbruno/bsd/qemu/bsd-user/main.c:515: undefined reference to `cpu_sparc_exec'
c++: error: linker command failed with exit code 1 (use -v to see invocation)
gmake[1]: *** [Makefile:197: qemu-sparc] Error 1
gmake: *** [Makefile:204: subdir-sparc-bsd-user] Error 2

  LINK  i386-bsd-user/qemu-i386
bsd-user/main.o: In function `cpu_loop':
/home/sbruno/bsd/qemu/bsd-user/main.c:174: undefined reference to `cpu_x86_exec'
c++: error: linker command failed with exit code 1 (use -v to see invocation)
gmake[1]: *** [Makefile:197: qemu-i386] Error 1
gmake: *** [Makefile:204: subdir-i386-bsd-user] Error 2

Signed-off-by:  Sean Bruno <sbruno@freebsd.org>
---
 bsd-user/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bsd-user/main.c b/bsd-user/main.c
index 315ba1d..bbba43f 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -171,7 +171,7 @@ void cpu_loop(CPUX86State *env)
     //target_siginfo_t info;
 
     for(;;) {
-        trapnr = cpu_x86_exec(cs);
+        trapnr = cpu_exec(cs);
         switch(trapnr) {
         case 0x80:
             /* syscall from int $0x80 */
@@ -512,7 +512,7 @@ void cpu_loop(CPUSPARCState *env)
     //target_siginfo_t info;
 
     while (1) {
-        trapnr = cpu_sparc_exec(cs);
+        trapnr = cpu_exec(cs);
 
         switch (trapnr) {
 #ifndef TARGET_SPARC64
-- 
2.9.2

Re: [Qemu-devel] [PATCH] Fix bsd-user build errors after 8642c1b81e0418df066a7960a7426d85a923a253

[Peter Maydell]

On 29 July 2016 at 17:02, Sean Bruno <sbruno@freebsd.org> wrote:
>   LINK  sparc-bsd-user/qemu-sparc
> bsd-user/main.o: In function `cpu_loop':
> /home/sbruno/bsd/qemu/bsd-user/main.c:515: undefined reference to `cpu_sparc_exec'
> c++: error: linker command failed with exit code 1 (use -v to see invocation)
> gmake[1]: *** [Makefile:197: qemu-sparc] Error 1
> gmake: *** [Makefile:204: subdir-sparc-bsd-user] Error 2
>
>   LINK  i386-bsd-user/qemu-i386
> bsd-user/main.o: In function `cpu_loop':
> /home/sbruno/bsd/qemu/bsd-user/main.c:174: undefined reference to `cpu_x86_exec'
> c++: error: linker command failed with exit code 1 (use -v to see invocation)
> gmake[1]: *** [Makefile:197: qemu-i386] Error 1
> gmake: *** [Makefile:204: subdir-i386-bsd-user] Error 2
>
> Signed-off-by:  Sean Bruno <sbruno@freebsd.org>

Applied to master, thanks.

-- PMM