3720c734f7
asm volatile("":::"memory") doesn't work reliably, so it is better to disable
optimization for whole function where INIT_G() or similar is used to avoid
instruction reordering.
Covers following issues:
* https://github.com/termux/termux-packages/issues/2488
* https://github.com/termux/termux-packages/issues/3216
57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
diff -uNr busybox-1.31.1/miscutils/less.c busybox-1.31.1.mod/miscutils/less.c
|
|
--- busybox-1.31.1/miscutils/less.c 2019-06-10 13:50:53.000000000 +0300
|
|
+++ busybox-1.31.1.mod/miscutils/less.c 2019-11-12 03:30:59.054944977 +0200
|
|
@@ -1803,6 +1803,7 @@
|
|
}
|
|
#endif
|
|
|
|
+#pragma clang optimize off
|
|
int less_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int less_main(int argc, char **argv)
|
|
{
|
|
diff -uNr busybox-1.31.1/networking/ftpd.c busybox-1.31.1.mod/networking/ftpd.c
|
|
--- busybox-1.31.1/networking/ftpd.c 2019-06-10 13:50:53.000000000 +0300
|
|
+++ busybox-1.31.1.mod/networking/ftpd.c 2019-11-12 04:05:11.739983958 +0200
|
|
@@ -1169,6 +1169,7 @@
|
|
OPT_w = (1 << (BIT_A + 3)) * ENABLE_FEATURE_FTPD_WRITE,
|
|
};
|
|
|
|
+#pragma clang optimize off
|
|
int ftpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int ftpd_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd.c
|
|
--- busybox-1.31.1/networking/httpd.c 2019-06-10 13:50:53.000000000 +0300
|
|
+++ busybox-1.31.1.mod/networking/httpd.c 2019-11-12 03:30:08.104709323 +0200
|
|
@@ -2663,7 +2663,7 @@
|
|
OPT_VERBOSE = 1 << p_opt_verbose,
|
|
};
|
|
|
|
-
|
|
+#pragma clang optimize off
|
|
int httpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int httpd_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
diff -uNr busybox-1.31.1/runit/svlogd.c busybox-1.31.1.mod/runit/svlogd.c
|
|
--- busybox-1.31.1/runit/svlogd.c 2019-06-10 13:50:53.000000000 +0300
|
|
+++ busybox-1.31.1.mod/runit/svlogd.c 2019-11-12 03:28:11.214155815 +0200
|
|
@@ -1034,6 +1034,7 @@
|
|
}
|
|
}
|
|
|
|
+#pragma clang optimize off
|
|
int svlogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int svlogd_main(int argc, char **argv)
|
|
{
|
|
diff -uNr busybox-1.31.1/shell/ash.c busybox-1.31.1.mod/shell/ash.c
|
|
--- busybox-1.31.1/shell/ash.c 2019-10-21 17:54:40.000000000 +0300
|
|
+++ busybox-1.31.1.mod/shell/ash.c 2019-11-12 03:24:39.613095056 +0200
|
|
@@ -14278,6 +14278,7 @@
|
|
* exception occurs. When an exception occurs the variable "state"
|
|
* is used to figure out how far we had gotten.
|
|
*/
|
|
+#pragma clang optimize off
|
|
int ash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
#if NUM_SCRIPTS > 0
|
|
int ash_main(int argc, char **argv)
|