diff options
| -rw-r--r-- | sim/bfin/linux-targ-map.h | 5 | ||||
| -rwxr-xr-x | sim/common/gennltvals.py | 6 | ||||
| -rw-r--r-- | sim/common/nltvals.def | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h index e9c8c8f..0340ed547 100644 --- a/sim/bfin/linux-targ-map.h +++ b/sim/bfin/linux-targ-map.h @@ -30,6 +30,7 @@ echo # XXX: nothing uses this ? echo '#include <signal.h>' | \ bfin-uclinux-gcc -E -dD -P - | \ +grep -v SIGSTKSZ | \ sed -r -n \ -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \ -e '$i\ \ { 0, -1, -1 }\n};' \ @@ -1988,9 +1989,5 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] = # define TARGET_LINUX_SIG_SETMASK 2 { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK }, #endif -#ifdef SIGSTKSZ -# define TARGET_LINUX_SIGSTKSZ 8192 - { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ }, -#endif { 0, -1, -1 } }; diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py index db3ff64..955ace34 100755 --- a/sim/common/gennltvals.py +++ b/sim/common/gennltvals.py @@ -67,6 +67,7 @@ FILE_HEADER = f"""\ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, headers: Iterable[str], pattern: str, + filter: str = r'^$', target: str = None): """Extract constants from the specified files using a regular expression. @@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path, srcfile = ''.join(f'#include <{x}>\n' for x in headers) syms = set() define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')') + filter_pattern = re.compile(filter) for header in headers: with open(srcdir / header, 'r', encoding='utf-8') as fp: data = fp.read() for line in data.splitlines(): m = define_pattern.match(line) - if m: + if m and not filter_pattern.search(line): syms.add(m.group(1)) for sym in sorted(syms): srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n' @@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str): ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*') gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include', - ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*') + ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ') gentvals(output, cpp, 'open', newlib / 'newlib/libc/include', ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*') diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def index 8ae8839..8bc6ae5 100644 --- a/sim/common/nltvals.def +++ b/sim/common/nltvals.def @@ -116,7 +116,6 @@ { "SIGPROF", 27 }, { "SIGQUIT", 3 }, { "SIGSEGV", 11 }, - { "SIGSTKSZ", 8192 }, { "SIGSTOP", 17 }, { "SIGSYS", 12 }, { "SIGTERM", 15 }, |