On Mon, Apr 21, 2014 at 07:06:24PM -0500, Felipe Contreras wrote:
> I managed to fix all the errors, some apply to newer mingw, regardless of 32 or
> 64, others are specific to 64-bit. It's all hacky and I haven't checked if it
> runs, but at least it compiles (mostly).
Do you plan to evolve it into something mergeable?
> diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
> index f216a2a..3e4affd 100644
> --- a/compat/nedmalloc/malloc.c.h
> +++ b/compat/nedmalloc/malloc.c.h
> @@ -720,6 +720,7 @@ struct mallinfo {
> inlining are defined as macros, so these aren't used for them.
> */
>
> +#undef FORCEINLINE
> #ifndef FORCEINLINE
> #if defined(__GNUC__)
> #define FORCEINLINE __inline __attribute__ ((always_inline))
> @@ -1352,58 +1353,6 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
> #ifndef __MINGW32__
> #pragma intrinsic (_InterlockedCompareExchange)
> #pragma intrinsic (_InterlockedExchange)
> -#else
> - /* --[ start GCC compatibility ]----------------------------------------------
> - * Compatibility <intrin_x86.h> header for GCC -- GCC equivalents of intrinsic
> - * Microsoft Visual C++ functions. Originally developed for the ReactOS
> - * (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>)
> - * projects.
> - *
> - * Copyright (c) 2006 KJK::Hyperion <hackbunny@xxxxxxxxxxx>
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> - * DEALINGS IN THE SOFTWARE.
> - */
> -
> - /*** Atomic operations ***/
> - #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
> - #define _ReadWriteBarrier() __sync_synchronize()
> - #else
> - static __inline__ __attribute__((always_inline)) long __sync_lock_test_and_set(volatile long * const Target, const long Value)
> - {
> - long res;
> - __asm__ __volatile__("xchg%z0 %2, %0" : "=g" (*(Target)), "=r" (res) : "1" (Value));
> - return res;
> - }
> - static void __inline__ __attribute__((always_inline)) _MemoryBarrier(void)
> - {
> - __asm__ __volatile__("" : : : "memory");
> - }
> - #define _ReadWriteBarrier() _MemoryBarrier()
> - #endif
> - /* BUGBUG: GCC only supports full barriers */
> - static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const Target, const long Value)
> - {
> - /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */
> - _ReadWriteBarrier();
> - return __sync_lock_test_and_set(Target, Value);
> - }
> - /* --[ end GCC compatibility ]---------------------------------------------- */
> #endif
> #define interlockedcompareexchange _InterlockedCompareExchange
> #define interlockedexchange _InterlockedExchange
Git doesn't link without this for me, fails to find _InterlockedExchange.
> diff --git a/config.mak.uname b/config.mak.uname
> index efaed94..01acd54 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> - COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
> + COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -Icompat -Icompat/win32
builtin/fast-export.c still failed for me with:
builtin/fast-export.c: At top level:
builtin/fast-export.c:28:15: error: expected identifier before numeric constant
static enum { ERROR, DROP, REWRITE } tag_of_filtered_mode = ERROR;
^
ERROR is defined in <mingw>/usr/include/wingdi.h and you dropped -DNOGDI what lead to wingdi.h inclusion,
perhaps you shouldn't.
For the reference: mingw64-runtime-3.1.0, x86_64-w64-mingw32-gcc 4.8.2
P.S. besides CC/LD, I also had to define AR and fix `windres` executable name in `config.mak.uname`.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html