From c890fb2ae80514b7fa35778557d52a5eb009f837 Mon Sep 17 00:00:00 2001 From: Mike Lowis Date: Mon, 2 May 2016 12:30:22 -0400 Subject: [PATCH] Fixed up sh build rules --- source/sh/Rules.mk | 90 +++++++++++++++++++++++++++++++++++++----- source/sh/signames.inc | 31 +++++++++++++++ 2 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 source/sh/signames.inc diff --git a/source/sh/Rules.mk b/source/sh/Rules.mk index f40bb9b7..d945c8ae 100644 --- a/source/sh/Rules.mk +++ b/source/sh/Rules.mk @@ -19,12 +19,13 @@ MKSH_OBJS = \ $(MKSH_OBJDIR)/syn.o \ $(MKSH_OBJDIR)/tree.o \ $(MKSH_OBJDIR)/var.o \ - $(MKSH_OBJDIR)/edit.o + $(MKSH_OBJDIR)/edit.o \ + $(MKSH_OBJDIR)/strlcpy.o MKSH_DEFINES = \ -DMKSH_BUILD_R=523 \ -DMKSH_BUILDSH \ - -DHAVE_ATTRIBUTE_BOUNDED=1 \ + -DHAVE_ATTRIBUTE_BOUNDED=0 \ -DHAVE_ATTRIBUTE_FORMAT=1 \ -DHAVE_ATTRIBUTE_NORETURN=1 \ -DHAVE_ATTRIBUTE_PURE=1 \ @@ -40,7 +41,7 @@ MKSH_DEFINES = \ -DHAVE_SYS_PARAM_H=1 \ -DHAVE_SYS_RESOURCE_H=1 \ -DHAVE_SYS_SELECT_H=1 \ - -DHAVE_SYS_SYSMACROS_H=0 \ + -DHAVE_SYS_SYSMACROS_H=1 \ -DHAVE_BSTRING_H=0 \ -DHAVE_GRP_H=1 \ -DHAVE_IO_H=0 \ @@ -51,7 +52,7 @@ MKSH_DEFINES = \ -DHAVE_STRINGS_H=1 \ -DHAVE_TERMIOS_H=1 \ -DHAVE_ULIMIT_H=1 \ - -DHAVE_VALUES_H=0 \ + -DHAVE_VALUES_H=1 \ -DHAVE_CAN_INTTYPES=1 \ -DHAVE_CAN_UCBINTS=1 \ -DHAVE_CAN_INT8TYPE=1 \ @@ -59,7 +60,7 @@ MKSH_DEFINES = \ -DHAVE_RLIM_T=1 \ -DHAVE_SIG_T=1 \ -DHAVE_SYS_ERRLIST=1 \ - -DHAVE_SYS_SIGNAME=1 \ + -DHAVE_SYS_SIGNAME=0 \ -DHAVE_SYS_SIGLIST=1 \ -DHAVE_FLOCK=1 \ -DHAVE_LOCK_FCNTL=1 \ @@ -71,15 +72,15 @@ MKSH_DEFINES = \ -DHAVE_MKNOD=0 \ -DHAVE_MMAP=1 \ -DHAVE_NICE=1 \ - -DHAVE_REVOKE=1 \ + -DHAVE_REVOKE=0 \ -DHAVE_SETLOCALE_CTYPE=1 \ -DHAVE_LANGINFO_CODESET=1 \ -DHAVE_SELECT=1 \ - -DHAVE_SETRESUGID=0 \ - -DHAVE_SETGROUPS=0 \ + -DHAVE_SETRESUGID=1 \ + -DHAVE_SETGROUPS=1 \ -DHAVE_STRERROR=0 \ -DHAVE_STRSIGNAL=0 \ - -DHAVE_STRLCPY=1 \ + -DHAVE_STRLCPY=0 \ -DHAVE_FLOCK_DECL=1 \ -DHAVE_REVOKE_DECL=1 \ -DHAVE_SYS_ERRLIST_DECL=1 \ @@ -133,3 +134,74 @@ $(MKSH_OBJDIR)/var.o: $(MKSH_SUBDIR)/var.c $(MKSH_OBJDIR)/edit.o: $(MKSH_SUBDIR)/edit.c $(MKSH_CCCMD) + +$(MKSH_OBJDIR)/strlcpy.o: $(MKSH_SUBDIR)/strlcpy.c + $(MKSH_CCCMD) + + + +#-DMKSH_BUILDSH +#-D_GNU_SOURCE +#-DSETUID_CAN_FAIL_WITH_EAGAIN +#-DHAVE_ATTRIBUTE_BOUNDED=0 +#-DHAVE_ATTRIBUTE_FORMAT=1 +#-DHAVE_ATTRIBUTE_NORETURN=1 +#-DHAVE_ATTRIBUTE_PURE=1 +#-DHAVE_ATTRIBUTE_UNUSED=1 +#-DHAVE_ATTRIBUTE_USED=1 +#-DHAVE_SYS_TIME_H=1 +#-DHAVE_TIME_H=1 +#-DHAVE_BOTH_TIME_H=1 +#-DHAVE_SYS_BSDTYPES_H=0 +#-DHAVE_SYS_FILE_H=1 +#-DHAVE_SYS_MKDEV_H=0 +#-DHAVE_SYS_MMAN_H=1 +#-DHAVE_SYS_PARAM_H=1 +#-DHAVE_SYS_RESOURCE_H=1 +#-DHAVE_SYS_SELECT_H=1 +#-DHAVE_SYS_SYSMACROS_H=1 +#-DHAVE_BSTRING_H=0 +#-DHAVE_GRP_H=1 +#-DHAVE_IO_H=0 +#-DHAVE_LIBGEN_H=1 +#-DHAVE_LIBUTIL_H=0 +#-DHAVE_PATHS_H=1 +#-DHAVE_STDINT_H=1 +#-DHAVE_STRINGS_H=1 +#-DHAVE_TERMIOS_H=1 +#-DHAVE_ULIMIT_H=1 +#-DHAVE_VALUES_H=1 +#-DHAVE_CAN_INTTYPES=1 +#-DHAVE_CAN_UCBINTS=1 +#-DHAVE_CAN_INT8TYPE=1 +#-DHAVE_CAN_UCBINT8=1 +#-DHAVE_RLIM_T=1 +#-DHAVE_SIG_T=1 +#-DHAVE_SYS_ERRLIST=1 +#-DHAVE_SYS_SIGNAME=0 +#-DHAVE_SYS_SIGLIST=1 +#-DHAVE_FLOCK=1 +#-DHAVE_LOCK_FCNTL=1 +#-DHAVE_GETRUSAGE=1 +#-DHAVE_GETSID=1 +#-DHAVE_GETTIMEOFDAY=1 +#-DHAVE_KILLPG=1 +#-DHAVE_MEMMOVE=1 +#-DHAVE_MKNOD=0 +#-DHAVE_MMAP=1 +#-DHAVE_NICE=1 +#-DHAVE_REVOKE=0 +#-DHAVE_SETLOCALE_CTYPE=1 +#-DHAVE_LANGINFO_CODESET=1 +#-DHAVE_SELECT=1 +#-DHAVE_SETRESUGID=1 +#-DHAVE_SETGROUPS=1 +#-DHAVE_STRERROR=0 +#-DHAVE_STRSIGNAL=0 +#-DHAVE_STRLCPY=0 +#-DHAVE_FLOCK_DECL=1 +#-DHAVE_REVOKE_DECL=1 +#-DHAVE_SYS_ERRLIST_DECL=1 +#-DHAVE_SYS_SIGLIST_DECL=1 +#-DHAVE_PERSISTENT_HISTORY=1 +#-DMKSH_BUILD_R=523 diff --git a/source/sh/signames.inc b/source/sh/signames.inc new file mode 100644 index 00000000..07811fdc --- /dev/null +++ b/source/sh/signames.inc @@ -0,0 +1,31 @@ + { "ABRT", 6 }, + { "FPE", 8 }, + { "ILL", 4 }, + { "INT", 2 }, + { "SEGV", 11 }, + { "TERM", 15 }, + { "ALRM", 14 }, + { "BUS", 7 }, + { "CHLD", 17 }, + { "CONT", 18 }, + { "HUP", 1 }, + { "KILL", 9 }, + { "PIPE", 13 }, + { "QUIT", 3 }, + { "STOP", 19 }, + { "TSTP", 20 }, + { "TTIN", 21 }, + { "TTOU", 22 }, + { "USR1", 10 }, + { "USR2", 12 }, + { "POLL", 29 }, + { "PROF", 27 }, + { "SYS", 31 }, + { "TRAP", 5 }, + { "URG", 23 }, + { "VTALRM", 26 }, + { "XCPU", 24 }, + { "XFSZ", 25 }, + { "WINCH", 28 }, + { "PWR", 30 }, + { "STKFLT", 16 }, -- 2.52.0