Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by |
| 2 | the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers |
| 3 | use the STRING() macro from unistd.h. A header in the bash sources overrides |
| 4 | the unistd.h macro to 'x' when HAVE_STRINGIZE is not defined, causing the |
| 5 | wrappers to generate calls to 'xread' and 'xopen', which do not exist, |
| 6 | resulting in a failure to link. |
| 7 | |
| 8 | Assume we have stringize support when cross-compiling, which works around the |
| 9 | issue. |
| 10 | |
| 11 | It may be best for upstream to either give up on supporting compilers without |
| 12 | stringize support, or to not define STRING() at all when FORTIFY_SOURCES is |
| 13 | defined, letting the unistd.h one be used, instead. |
| 14 | |
| 15 | Upstream-Status: Pending |
| 16 | |
| 17 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
| 18 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
| 19 | |
| 20 | --- bash-4.2.orig/builtins/mkbuiltins.c |
| 21 | +++ bash-4.2/builtins/mkbuiltins.c |
| 22 | @@ -28,6 +28,7 @@ |
| 23 | # define HAVE_STDLIB_H |
| 24 | |
| 25 | # define HAVE_RENAME |
| 26 | +# define HAVE_STRINGIZE |
| 27 | #endif /* CROSS_COMPILING */ |
| 28 | |
| 29 | #if defined (HAVE_UNISTD_H) |