FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove libctf/mkerrors.sed

Browse source 
This patch removes libctf/mkerrors.sed, replacing it with a macro in
ctf-api.h.  This simplifies the build and avoids possible unportable
code in the sed script.

2020-10-21  Tom Tromey  <tromey@adacore.com>

	* ctf-api.h (_CTF_ERRORS): New macro.

libctf/ChangeLog
2020-10-21  Tom Tromey  <tromey@adacore.com>

	* mkerrors.sed: Remove.
	* ctf-error.c (_CTF_FIRST): New define.
	(_CTF_ITEM): Define this, not _CTF_STR.
	(_ctf_errlist, _ctf_erridx): Use _CTF_ERRORS.
	(ERRSTRFIELD): Rewrite.
	(ERRSTRFIELD1): Remove.
	* Makefile.in: Rebuild.
	* Makefile.am (BUILT_SOURCES): Remove.
	(ctf-error.h): Remove.
This commit is contained in:
Tom Tromey 2020-10-21 08:54:17 -06:00
parent ffd73a8b9e
commit 0d01fbe64f
7 changed files with 104 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libctf/ctf-error.c
View file

@ -24,10 +24,13 @@
/* This construct is due to Bruno Haible: much thanks. */
/* Give each structure member a unique name. The name does not matter, so we
use the line number in ctf-error.h to uniquify them. */
use the enum constant to uniquify them. */
#define ERRSTRFIELD(line) ERRSTRFIELD1 (line)
#define ERRSTRFIELD1(line) ctf_errstr##line
#define ERRSTRFIELD(N) ctf_errstr##N
/* In this file, we want to treat the first item of the ctf error
macro like subsequent items. */
#define _CTF_FIRST(NAME, VALUE) _CTF_ITEM(NAME, VALUE)
/* The error message strings, each in a unique structure member precisely big
enough for that error, plus a str member to access them all as a string
@ -37,17 +40,17 @@ static const union _ctf_errlist_t
{
__extension__ struct
{
#define _CTF_STR(n, s) char ERRSTRFIELD (__LINE__) [sizeof (s)];
#include "ctf-error.h"
#undef _CTF_STR
#define _CTF_ITEM(n, s) char ERRSTRFIELD (n) [sizeof (s)];
_CTF_ERRORS
#undef _CTF_ITEM
};
char str[1];
} _ctf_errlist =
{
{
#define _CTF_STR(n, s) N_(s),
#include "ctf-error.h"
#undef _CTF_STR
#define _CTF_ITEM(n, s) N_(s),
_CTF_ERRORS
#undef _CTF_ITEM
}
};
@ -55,9 +58,9 @@ static const union _ctf_errlist_t
static const unsigned int _ctf_erridx[] =
{
#define _CTF_STR(n, s) [n - ECTF_BASE] = offsetof (union _ctf_errlist_t, ERRSTRFIELD (__LINE__)),
#include "ctf-error.h"
#undef _CTF_STR
#define _CTF_ITEM(n, s) [n - ECTF_BASE] = offsetof (union _ctf_errlist_t, ERRSTRFIELD (n)),
_CTF_ERRORS
#undef _CTF_ITEM
};
const char *