Master #1312
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| From 81b5dabfed88d2976faf587598361c054630ef95 Mon Sep 17 00:00:00 2001 | ||
| From: Martell Malone <[email protected]> | ||
| Date: Tue, 21 Jul 2015 04:35:55 +0100 | ||
| Subject: [PATCH] libunwind add support for mingw-w64 | ||
|
|
||
|
|
||
| diff --git a/include/unwind.h b/include/unwind.h | ||
| index 31fb871..e8c63d7 100644 | ||
| --- a/include/unwind.h | ||
| +++ b/include/unwind.h | ||
| @@ -121,7 +121,7 @@ struct _Unwind_Exception { | ||
| _Unwind_Exception *exc); | ||
| uintptr_t private_1; // non-zero means forced unwind | ||
| uintptr_t private_2; // holds sp that phase1 found for phase2 to use | ||
| -#ifndef __LP64__ | ||
| +#if !defined(__LP64__) && !defined(_WIN64) | ||
| // The gcc implementation of _Unwind_Exception used attribute mode on the | ||
| // above fields which had the side effect of causing this whole struct to | ||
| // round up to 32 bytes in size. To be more explicit, we add pad fields | ||
| diff --git a/src/AddressSpace.hpp b/src/AddressSpace.hpp | ||
| index 567cbda..fd0b233 100644 | ||
| --- a/src/AddressSpace.hpp | ||
| +++ b/src/AddressSpace.hpp | ||
| @@ -18,7 +18,7 @@ | ||
| #include <stdlib.h> | ||
| #include <string.h> | ||
|
|
||
| -#ifndef _LIBUNWIND_IS_BAREMETAL | ||
| +#if !defined(_LIBUNWIND_IS_BAREMETAL) && !defined(_WIN32) | ||
| #include <dlfcn.h> | ||
| #endif | ||
|
|
||
| @@ -104,7 +104,7 @@ struct UnwindInfoSections { | ||
| /// making local unwinds fast. | ||
| class __attribute__((visibility("hidden"))) LocalAddressSpace { | ||
| public: | ||
| -#ifdef __LP64__ | ||
| +#if defined(__LP64__) || defined(_WIN64) | ||
| typedef uint64_t pint_t; | ||
| typedef int64_t sint_t; | ||
| #else | ||
| @@ -156,7 +156,7 @@ public: | ||
| }; | ||
|
|
||
| inline uintptr_t LocalAddressSpace::getP(pint_t addr) { | ||
| -#ifdef __LP64__ | ||
| +#if defined(__LP64__) || defined(_WIN64) | ||
| return get64(addr); | ||
| #else | ||
| return get32(addr); | ||
| @@ -434,6 +434,7 @@ inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr, | ||
| }, | ||
| &cb_data); | ||
| return static_cast<bool>(found); | ||
| +#elif defined(_WIN32) | ||
| #else | ||
| #error "_LIBUNWIND_SUPPORT_DWARF_UNWIND requires _LIBUNWIND_SUPPORT_DWARF_INDEX on this platform." | ||
| #endif | ||
| @@ -457,7 +458,9 @@ inline bool LocalAddressSpace::findOtherFDE(pint_t targetAddr, pint_t &fde) { | ||
| inline bool LocalAddressSpace::findFunctionName(pint_t addr, char *buf, | ||
| size_t bufLen, | ||
| unw_word_t *offset) { | ||
| -#ifndef _LIBUNWIND_IS_BAREMETAL | ||
| +#ifdef _WIN32 | ||
| +// FIXME: support DLLs on Windows. | ||
| +#elif !defined(_LIBUNWIND_IS_BAREMETAL) | ||
| Dl_info dyldInfo; | ||
| if (dladdr((void *)addr, &dyldInfo)) { | ||
| if (dyldInfo.dli_sname != NULL) { | ||
| diff --git a/src/UnwindLevel1-gcc-ext.c b/src/UnwindLevel1-gcc-ext.c | ||
| index 28ba092..0decf77 100644 | ||
| --- a/src/UnwindLevel1-gcc-ext.c | ||
| +++ b/src/UnwindLevel1-gcc-ext.c | ||
| @@ -29,7 +29,7 @@ | ||
| _LIBUNWIND_EXPORT _Unwind_Reason_Code | ||
| _Unwind_Resume_or_Rethrow(_Unwind_Exception *exception_object) { | ||
| #if _LIBUNWIND_ARM_EHABI | ||
| - _LIBUNWIND_TRACE_API("_Unwind_Resume_or_Rethrow(ex_obj=%p), private_1=%ld\n", | ||
| + _LIBUNWIND_TRACE_API("_Unwind_Resume_or_Rethrow(ex_obj=%p), private_1=%" PRIdPTR "\n", | ||
| (void *)exception_object, | ||
| (long)exception_object->unwinder_cache.reserved1); | ||
| #else | ||
| diff --git a/src/assembly.h b/src/assembly.h | ||
| index f46a24d..4d6c3e1 100644 | ||
| --- a/src/assembly.h | ||
| +++ b/src/assembly.h | ||
| @@ -26,6 +26,8 @@ | ||
|
|
||
| #if defined(__APPLE__) | ||
| #define HIDDEN_DIRECTIVE .private_extern | ||
| +#elif defined(_WIN32) | ||
| +#define HIDDEN_DIRECTIVE .globl | ||
| #else | ||
| #define HIDDEN_DIRECTIVE .hidden | ||
| #endif | ||
| diff --git a/src/config.h b/src/config.h | ||
| index c9ec087..6f14e92 100644 | ||
| --- a/src/config.h | ||
| +++ b/src/config.h | ||
| @@ -60,6 +60,23 @@ | ||
| #define _LIBUNWIND_SUPPORT_DWARF_INDEX 0 | ||
| #endif | ||
|
|
||
| +#elif defined(_WIN32) | ||
| + // Note! the assembler files must be .S and not .s. | ||
| + #define _LIBUNWIND_BUILD_ZERO_COST_APIS 1 | ||
| + | ||
| + // #define _LIBUNWIND_BUILD_SJLJ_APIS | ||
| + // #define _LIBUNWIND_SUPPORT_FRAME_APIS | ||
| + #define _LIBUNWIND_EXPORT | ||
| + #define _LIBUNWIND_HIDDEN | ||
| + #define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__) | ||
| + #define _LIBUNWIND_ABORT(msg) do { fprintf(stderr, msg); abort(); } while(0) | ||
| + #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 1 | ||
| + #define _LIBUNWIND_SUPPORT_DWARF_UNWIND 1 | ||
| + // #define _LIBUNWIND_SUPPORT_DWARF_INDEX | ||
| + #define bzero(s,n) memset(s,0,n) | ||
| + // libcxx may have defined __USE_MINGW_ANSI_STDIO. | ||
| + // Here we would like to get the regular versions, not the _mingw ones. | ||
| + #undef __USE_MINGW_ANSI_STDIO | ||
| #else | ||
| #include <stdlib.h> | ||
|
|
||
| -- | ||
| 2.4.5 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # Maintainer: Some One <[email protected]> | ||
|
|
||
| _realname=cunit | ||
| pkgbase=mingw-w64-${_realname} | ||
| pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") | ||
| _distname="CUnit" | ||
| _distver="2.1-3" | ||
| pkgver=2.1.3 | ||
| pkgrel=1 | ||
| pkgdesc="Lightweight system for writing, administering, and running unit tests in C (mingw-w64)" | ||
| arch=('any') | ||
| url='http://cunit.sourceforge.net/' | ||
| license=('LGPL2.1') | ||
| source=("https://downloads.sourceforge.net/project/cunit/CUnit/2.1-3/CUnit-2.1-3.tar.bz2") | ||
| sha256sums=('f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214') | ||
|
|
||
| prepare() { | ||
| cd "$srcdir/"${_distname}-${_distver} | ||
| } | ||
|
|
||
| build() { | ||
| cd "$srcdir"/${_distname}-${_distver} | ||
| rm -rf "${srcdir}"/build-${CARCH} | true | ||
| mkdir -p "${srcdir}"/build-${CARCH} | ||
| cp -Rf ${srcdir}/${_distname}-${_distver}/* "${srcdir}"/build-${CARCH} | ||
| cd "${srcdir}"/build-${CARCH} | ||
|
|
||
| ./bootstrap /mingw | ||
| ./configure \ | ||
| --prefix=${MINGW_PREFIX} \ | ||
| --build=${MINGW_CHOST} \ | ||
| --host=${MINGW_CHOST} \ | ||
| --target=${MINGW_CHOST} \ | ||
| --enable-debug \ | ||
| --enable-static \ | ||
| --enable-shared | ||
| sed "s|\/Users\/aks\/CUnitHome|${MINGW_PREFIX}|" -i cunit.pc | ||
| make | ||
| } | ||
|
|
||
| check() { | ||
| cd "${srcdir}"/build-${CARCH} | ||
| } | ||
|
|
||
| package() { | ||
| cd "${srcdir}"/build-${CARCH} | ||
| make install DESTDIR="${pkgdir}" | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Increase pkgrel