Module Name: src
Committed By: christos
Date: Sun Aug 16 10:00:19 UTC 2015
Modified Files:
src/external/gpl3/gdb/dist/sim: configure
src/external/gpl3/gdb/dist/sim/common: callback.c
src/external/gpl3/gdb/dist/sim/mn10300: Makefile.in
src/external/gpl3/gdb/dist/sim/ppc: hw_memory.c
src/external/gpl3/gdb/dist/sim/v850: Makefile.in
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/sim/configure
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/sim/common/callback.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/sim/mn10300/Makefile.in
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/sim/ppc/hw_memory.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/sim/v850/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/sim/configure
diff -u src/external/gpl3/gdb/dist/sim/configure:1.4 src/external/gpl3/gdb/dist/sim/configure:1.5
--- src/external/gpl3/gdb/dist/sim/configure:1.4 Sun Jun 22 19:52:59 2014
+++ src/external/gpl3/gdb/dist/sim/configure Sun Aug 16 06:00:19 2015
@@ -3775,6 +3775,7 @@ subdirs="$subdirs arm"
subdirs="$subdirs msp430"
+ sim_testsuite=yes
;;
rl78-*-*)
Index: src/external/gpl3/gdb/dist/sim/common/callback.c
diff -u src/external/gpl3/gdb/dist/sim/common/callback.c:1.4 src/external/gpl3/gdb/dist/sim/common/callback.c:1.5
--- src/external/gpl3/gdb/dist/sim/common/callback.c:1.4 Sun Jun 22 19:52:59 2014
+++ src/external/gpl3/gdb/dist/sim/common/callback.c Sun Aug 16 06:00:19 2015
@@ -1,5 +1,5 @@
/* Remote target callback routines.
- Copyright 1995-2014 Free Software Foundation, Inc.
+ Copyright 1995-2015 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of GDB.
@@ -69,43 +69,10 @@ extern CB_TARGET_DEFS_MAP cb_init_syscal
extern CB_TARGET_DEFS_MAP cb_init_errno_map[];
extern CB_TARGET_DEFS_MAP cb_init_open_map[];
-extern int system (const char *);
-
-static int os_init (host_callback *);
-static int os_shutdown (host_callback *);
-static int os_unlink (host_callback *, const char *);
-static long os_time (host_callback *, long *);
-static int os_system (host_callback *, const char *);
-static int os_rename (host_callback *, const char *, const char *);
-static int os_write_stdout (host_callback *, const char *, int);
-static void os_flush_stdout (host_callback *);
-static int os_write_stderr (host_callback *, const char *, int);
-static void os_flush_stderr (host_callback *);
-static int os_write (host_callback *, int, const char *, int);
-static int os_read_stdin (host_callback *, char *, int);
-static int os_read (host_callback *, int, char *, int);
-static int os_open (host_callback *, const char *, int);
-static int os_lseek (host_callback *, int, long, int);
-static int os_isatty (host_callback *, int);
-static int os_get_errno (host_callback *);
-static int os_close (host_callback *, int);
-static void os_vprintf_filtered (host_callback *, const char *, va_list);
-static void os_evprintf_filtered (host_callback *, const char *, va_list);
-static void os_error (host_callback *, const char *, ...)
-#ifdef __GNUC__
- __attribute__ ((__noreturn__))
-#endif
- ;
-static int fdmap (host_callback *, int);
-static int fdbad (host_callback *, int);
-static int wrap (host_callback *, int);
-
/* Set the callback copy of errno from what we see now. */
static int
-wrap (p, val)
- host_callback *p;
- int val;
+wrap (host_callback *p, int val)
{
p->last_errno = errno;
return val;
@@ -115,9 +82,7 @@ wrap (p, val)
and set errno. */
static int
-fdbad (p, fd)
- host_callback *p;
- int fd;
+fdbad (host_callback *p, int fd)
{
if (fd < 0 || fd > MAX_CALLBACK_FDS || p->fd_buddy[fd] < 0)
{
@@ -128,17 +93,13 @@ fdbad (p, fd)
}
static int
-fdmap (p, fd)
- host_callback *p;
- int fd;
+fdmap (host_callback *p, int fd)
{
return p->fdmap[fd];
}
static int
-os_close (p, fd)
- host_callback *p;
- int fd;
+os_close (host_callback *p, int fd)
{
int result;
int i, next;
@@ -206,8 +167,7 @@ os_close (p, fd)
#if defined(__GO32__) || defined (_MSC_VER)
static int
-os_poll_quit (p)
- host_callback *p;
+os_poll_quit (host_callback *p)
{
#if defined(__GO32__)
int kbhit ();
@@ -244,17 +204,14 @@ os_poll_quit (p)
#endif /* defined(__GO32__) || defined(_MSC_VER) */
static int
-os_get_errno (p)
- host_callback *p;
+os_get_errno (host_callback *p)
{
return cb_host_to_target_errno (p, p->last_errno);
}
static int
-os_isatty (p, fd)
- host_callback *p;
- int fd;
+os_isatty (host_callback *p, int fd)
{
int result;
@@ -267,11 +224,7 @@ os_isatty (p, fd)
}
static int
-os_lseek (p, fd, off, way)
- host_callback *p;
- int fd;
- long off;
- int way;
+os_lseek (host_callback *p, int fd, long off, int way)
{
int result;
@@ -283,10 +236,7 @@ os_lseek (p, fd, off, way)
}
static int
-os_open (p, name, flags)
- host_callback *p;
- const char *name;
- int flags;
+os_open (host_callback *p, const char *name, int flags)
{
int i;
for (i = 0; i < MAX_CALLBACK_FDS; i++)
@@ -309,11 +259,7 @@ os_open (p, name, flags)
}
static int
-os_read (p, fd, buf, len)
- host_callback *p;
- int fd;
- char *buf;
- int len;
+os_read (host_callback *p, int fd, char *buf, int len)
{
int result;
@@ -366,20 +312,13 @@ os_read (p, fd, buf, len)
}
static int
-os_read_stdin (p, buf, len)
- host_callback *p;
- char *buf;
- int len;
+os_read_stdin (host_callback *p, char *buf, int len)
{
return wrap (p, read (0, buf, len));
}
static int
-os_write (p, fd, buf, len)
- host_callback *p;
- int fd;
- const char *buf;
- int len;
+os_write (host_callback *p, int fd, const char *buf, int len)
{
int result;
int real_fd;
@@ -447,59 +386,44 @@ os_write (p, fd, buf, len)
}
static int
-os_write_stdout (p, buf, len)
- host_callback *p ATTRIBUTE_UNUSED;
- const char *buf;
- int len;
+os_write_stdout (host_callback *p ATTRIBUTE_UNUSED, const char *buf, int len)
{
return fwrite (buf, 1, len, stdout);
}
static void
-os_flush_stdout (p)
- host_callback *p ATTRIBUTE_UNUSED;
+os_flush_stdout (host_callback *p ATTRIBUTE_UNUSED)
{
fflush (stdout);
}
static int
-os_write_stderr (p, buf, len)
- host_callback *p ATTRIBUTE_UNUSED;
- const char *buf;
- int len;
+os_write_stderr (host_callback *p ATTRIBUTE_UNUSED, const char *buf, int len)
{
return fwrite (buf, 1, len, stderr);
}
static void
-os_flush_stderr (p)
- host_callback *p ATTRIBUTE_UNUSED;
+os_flush_stderr (host_callback *p ATTRIBUTE_UNUSED)
{
fflush (stderr);
}
static int
-os_rename (p, f1, f2)
- host_callback *p;
- const char *f1;
- const char *f2;
+os_rename (host_callback *p, const char *f1, const char *f2)
{
return wrap (p, rename (f1, f2));
}
static int
-os_system (p, s)
- host_callback *p;
- const char *s;
+os_system (host_callback *p, const char *s)
{
return wrap (p, system (s));
}
static long
-os_time (p, t)
- host_callback *p;
- long *t;
+os_time (host_callback *p, long *t)
{
long v = (long)time(NULL);
@@ -510,18 +434,13 @@ os_time (p, t)
static int
-os_unlink (p, f1)
- host_callback *p;
- const char *f1;
+os_unlink (host_callback *p, const char *f1)
{
return wrap (p, unlink (f1));
}
static int
-os_stat (p, file, buf)
- host_callback *p;
- const char *file;
- struct stat *buf;
+os_stat (host_callback *p, const char *file, struct stat *buf)
{
/* ??? There is an issue of when to translate to the target layout.
One could do that inside this function, or one could have the
@@ -531,10 +450,7 @@ os_stat (p, file, buf)
}
static int
-os_fstat (p, fd, buf)
- host_callback *p;
- int fd;
- struct stat *buf;
+os_fstat (host_callback *p, int fd, struct stat *buf)
{
if (fdbad (p, fd))
return -1;
@@ -578,10 +494,7 @@ os_fstat (p, fd, buf)
}
static int
-os_lstat (p, file, buf)
- host_callback *p;
- const char *file;
- struct stat *buf;
+os_lstat (host_callback *p, const char *file, struct stat *buf)
{
/* NOTE: hpn/2004-12-12: Same issue here as with os_fstat. */
#ifdef HAVE_LSTAT
@@ -592,10 +505,7 @@ os_lstat (p, file, buf)
}
static int
-os_ftruncate (p, fd, len)
- host_callback *p;
- int fd;
- long len;
+os_ftruncate (host_callback *p, int fd, long len)
{
int result;
@@ -617,10 +527,7 @@ os_ftruncate (p, fd, len)
}
static int
-os_truncate (p, file, len)
- host_callback *p;
- const char *file;
- long len;
+os_truncate (host_callback *p, const char *file, long len)
{
#ifdef HAVE_TRUNCATE
return wrap (p, truncate (file, len));
@@ -631,9 +538,7 @@ os_truncate (p, file, len)
}
static int
-os_pipe (p, filedes)
- host_callback *p;
- int *filedes;
+os_pipe (host_callback *p, int *filedes)
{
int i;
@@ -673,10 +578,7 @@ os_pipe (p, filedes)
now empty (so the writer should leave its waiting state). */
static void
-os_pipe_empty (p, reader, writer)
- host_callback *p;
- int reader;
- int writer;
+os_pipe_empty (host_callback *p, int reader, int writer)
{
}
@@ -684,16 +586,12 @@ os_pipe_empty (p, reader, writer)
non-empty (so the writer should wait). */
static void
-os_pipe_nonempty (p, reader, writer)
- host_callback *p;
- int reader;
- int writer;
+os_pipe_nonempty (host_callback *p, int reader, int writer)
{
}
static int
-os_shutdown (p)
- host_callback *p;
+os_shutdown (host_callback *p)
{
int i, next, j;
for (i = 0; i < MAX_CALLBACK_FDS; i++)
@@ -733,8 +631,7 @@ os_shutdown (p)
}
static int
-os_init (p)
- host_callback *p;
+os_init (host_callback *p)
{
int i;
@@ -782,6 +679,9 @@ os_evprintf_filtered (host_callback *p A
}
/* VARARGS */
+#ifdef __GNUC__
+__attribute__ ((__noreturn__))
+#endif
static void
os_error (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...)
{
@@ -865,9 +765,7 @@ host_callback default_callback =
If an error occurs, the existing mapping is not changed. */
CB_RC
-cb_read_target_syscall_maps (cb, file)
- host_callback *cb;
- const char *file;
+cb_read_target_syscall_maps (host_callback *cb, const char *file)
{
CB_TARGET_DEFS_MAP *syscall_map, *errno_map, *open_map, *signal_map;
const char *stat_map;
@@ -907,9 +805,7 @@ cb_read_target_syscall_maps (cb, file)
??? Perhaps this should be renamed to ..._canon_syscall. */
int
-cb_target_to_host_syscall (cb, target_val)
- host_callback *cb;
- int target_val;
+cb_target_to_host_syscall (host_callback *cb, int target_val)
{
CB_TARGET_DEFS_MAP *m;
@@ -927,9 +823,7 @@ cb_target_to_host_syscall (cb, target_va
/* Translate the host's version of errno to the target's. */
int
-cb_host_to_target_errno (cb, host_val)
- host_callback *cb;
- int host_val;
+cb_host_to_target_errno (host_callback *cb, int host_val)
{
CB_TARGET_DEFS_MAP *m;
@@ -949,9 +843,7 @@ cb_host_to_target_errno (cb, host_val)
to machine generate this function. */
int
-cb_target_to_host_open (cb, target_val)
- host_callback *cb;
- int target_val;
+cb_target_to_host_open (host_callback *cb, int target_val)
{
int host_val = 0;
CB_TARGET_DEFS_MAP *m;
@@ -985,14 +877,12 @@ cb_target_to_host_open (cb, target_val)
}
/* Utility for e.g. cb_host_to_target_stat to store values in the target's
- stat struct. */
+ stat struct.
+
+ ??? The "val" must be as big as target word size. */
void
-cb_store_target_endian (cb, p, size, val)
- host_callback *cb;
- char *p;
- int size;
- long val; /* ??? must be as big as target word size */
+cb_store_target_endian (host_callback *cb, char *p, int size, long val)
{
if (cb->target_endian == BFD_ENDIAN_BIG)
{
@@ -1021,10 +911,7 @@ cb_store_target_endian (cb, p, size, val
or zero if an error occurred during the translation. */
int
-cb_host_to_target_stat (cb, hs, ts)
- host_callback *cb;
- const struct stat *hs;
- PTR ts;
+cb_host_to_target_stat (host_callback *cb, const struct stat *hs, PTR ts)
{
const char *m = cb->stat_map;
char *p;
Index: src/external/gpl3/gdb/dist/sim/mn10300/Makefile.in
diff -u src/external/gpl3/gdb/dist/sim/mn10300/Makefile.in:1.4 src/external/gpl3/gdb/dist/sim/mn10300/Makefile.in:1.5
--- src/external/gpl3/gdb/dist/sim/mn10300/Makefile.in:1.4 Sun Jun 22 19:53:00 2014
+++ src/external/gpl3/gdb/dist/sim/mn10300/Makefile.in Sun Aug 16 06:00:19 2015
@@ -1,5 +1,5 @@
# Makefile template for Configure for the mn10300 sim library.
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
# Written by Cygnus Support.
#
# This program is free software; you can redistribute it and/or modify
Index: src/external/gpl3/gdb/dist/sim/ppc/hw_memory.c
diff -u src/external/gpl3/gdb/dist/sim/ppc/hw_memory.c:1.2 src/external/gpl3/gdb/dist/sim/ppc/hw_memory.c:1.3
--- src/external/gpl3/gdb/dist/sim/ppc/hw_memory.c:1.2 Fri Jan 16 05:08:37 2015
+++ src/external/gpl3/gdb/dist/sim/ppc/hw_memory.c Sun Aug 16 06:00:19 2015
@@ -25,6 +25,8 @@
#define STATIC_INLINE_HW_MEMORY STATIC_INLINE
#endif
+#include <stdlib.h>
+
#include "device_table.h"
#include <stdlib.h>
Index: src/external/gpl3/gdb/dist/sim/v850/Makefile.in
diff -u src/external/gpl3/gdb/dist/sim/v850/Makefile.in:1.4 src/external/gpl3/gdb/dist/sim/v850/Makefile.in:1.5
--- src/external/gpl3/gdb/dist/sim/v850/Makefile.in:1.4 Sun Jun 22 19:53:00 2014
+++ src/external/gpl3/gdb/dist/sim/v850/Makefile.in Sun Aug 16 06:00:19 2015
@@ -1,5 +1,5 @@
# Makefile template for Configure for the V850 sim library.
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
# Written by Cygnus Support.
#
# This program is free software; you can redistribute it and/or modify
