diff options
author | Jan Nieuwenhuizen <janneke@gnu.org> | 2019-09-24 20:23:31 +0200 |
---|---|---|
committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2019-09-27 06:42:47 +0200 |
commit | 308eb5c11a885768f81fb6136fd4d30b4639fe04 (patch) | |
tree | 3ee1c8f6923a2b83a45d9511c7750a54d089d2f2 /gnu/packages/patches | |
parent | fc16ef9d906f356cd63e3fc8b14e505568978b32 (diff) | |
download | guix-308eb5c11a885768f81fb6136fd4d30b4639fe04.tar.gz |
gnu: gcc: Fix mingw cross compiler.
* gnu/packages/patches/gcc-7-cross-mingw.patch: New file. * gnu/packages/cross-base.scm (cross-gcc-patches): Add XGCC parameter; update caller. Use it for target mingw and gcc >= 7. * gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/gcc-7-cross-mingw.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/gcc-7-cross-mingw.patch b/gnu/packages/patches/gcc-7-cross-mingw.patch new file mode 100644 index 0000000000..eec6f88953 --- /dev/null +++ b/gnu/packages/patches/gcc-7-cross-mingw.patch @@ -0,0 +1,24 @@ +This fixes + +../../../../gcc-7.4.0/libstdc++-v3/libsupc++/new_opa.cc: In function ‘void* __gnu_cxx::aligned_alloc(std::size_t, std::size_t)’: +../../../../gcc-7.4.0/libstdc++-v3/libsupc++/new_opa.cc:78:10: error: ‘memalign’ was not declared in this scope + return memalign (al, sz); + ^~~~~~~~ +../../../../gcc-7.4.0/libstdc++-v3/libsupc++/new_opa.cc:78:10: note: suggested alternative: ‘max_align_t’ + return memalign (al, sz); + ^~~~~~~~ + max_align_t + +diff --git a/libstdc++-v3/libsupc++/new_opa.cc b/libstdc++-v3/libsupc++/new_opa.cc +index 94e79cadb0e..084900e0daf 100644 +--- a/libstdc++-v3/libsupc++/new_opa.cc ++++ b/libstdc++-v3/libsupc++/new_opa.cc +@@ -39,6 +39,8 @@ extern "C" void *memalign(std::size_t boundary, std::size_t size); + # endif + #endif + ++#define memalign _aligned_malloc ++ + using std::new_handler; + using std::bad_alloc; + |