Reconfigured sh rules to allow building with musl-gcc

diff --git a/Makefile b/Makefile
index 6fef297aa7db495091c0d6964126d93e35ede44d..e1988ebc27d81d0c9927af99632c2b2c16c882c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,23 @@ clean:
 # load user-specific settings if they exist
 -include config.mk
 
+# cc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h -c -o build/lib/Scrt1.o source/musl/crt/Scrt1.c -fPIC -fno-stack-protector -DCRT
+#gcc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h  -fPIC -fno-stack-protector -DCRT -c -o obj/crt/Scrt1.o crt/Scrt1.c
+#
+# cc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h -c -o build/lib/crt1.o source/musl/crt/crt1.c -fno-stack-protector -DCRT
+#gcc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h  -fno-stack-protector -DCRT -c -o obj/crt/crt1.o crt/crt1.c
+#
+# cc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h -c -o build/lib/rcrt1.o source/musl/crt/rcrt1.c -fPIC -fno-stack-protector -DCRT
+#gcc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h  -fPIC -fno-stack-protector -DCRT -c -o obj/crt/rcrt1.o crt/rcrt1.c
+#
+# cc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h -c -o build/lib/crti.o source/musl/crt/x86_64/crti.s -DCRT
+#gcc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h  -DCRT -c -o obj/crt/x86_64/crti.o crt/x86_64/crti.s
+#
+# cc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h -c -o build/lib/crtn.o source/musl/crt/x86_64/crtn.s -DCRT
+#gcc -std=c99 -nostdinc -ffreestanding -fexcess-precision=standard -frounding-math -Wa,--noexecstack -D_XOPEN_SOURCE=700 -Os -pipe -fomit-frame-pointer -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -include vis.h  -DCRT -c -o obj/crt/x86_64/crtn.o crt/x86_64/crtn.s
+
+
+
 #------------------------------------------------------------------------------
 # Ensure The Build Dir Exists
 #------------------------------------------------------------------------------

diff --git a/source/sh/Rules.mk b/source/sh/Rules.mk
index 15537fdc4661974c256c19444a46a5ed6aeb9d00..8212a0d8a19ba34f1e54d81ae04760bd2d18b39e 100644 (file)
--- a/source/sh/Rules.mk
+++ b/source/sh/Rules.mk
@@ -24,69 +24,71 @@ MKSH_OBJS =                  \
     $(MKSH_OBJDIR)/edit.o    \
     $(MKSH_OBJDIR)/strlcpy.o
 
-MKSH_DEFINES =                  \
-    -DMKSH_BUILD_R=523          \
-    -DMKSH_BUILDSH              \
-    -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   \
+MKSH_DEFINES =                    \
+    -DMKSH_BUILD_R=523            \
+    -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=0          \
+    -DHAVE_SYS_SIGNAME=0          \
+    -DHAVE_SYS_SIGLIST=0          \
+    -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=1             \
+    -DHAVE_STRSIGNAL=1            \
+    -DHAVE_STRLCPY=1              \
+    -DHAVE_FLOCK_DECL=1           \
+    -DHAVE_REVOKE_DECL=1          \
+    -DHAVE_SYS_ERRLIST_DECL=0     \
+    -DHAVE_SYS_SIGLIST_DECL=0     \
     -DHAVE_PERSISTENT_HISTORY=1
 
 $(MKSH_BIN): $(BINDIR)/$(MKSH_BIN)