Patches OK?
From 8f28e1c607c0acf90ebbf37e1169c5099dc732b0 Mon Sep 17 00:00:00 2001 From: Jonathan Yong <[email protected]> Date: Fri, 6 Oct 2017 13:36:55 +0000 Subject: [PATCH 1/3] gendef: Fix remaining fallthrough cases
Based on a patch by Marty Plummer <ntzrmtthihu777 at gmail.com> Signed-off-by: Jonathan Yong <[email protected]> --- mingw-w64-tools/gendef/src/gendef.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c index 4aa9a42e..8344b32e 100644 --- a/mingw-w64-tools/gendef/src/gendef.c +++ b/mingw-w64-tools/gendef/src/gendef.c @@ -1034,13 +1034,16 @@ redo_switch: PRDEBUG(" 0x%x illegal ", (unsigned int) b); #endif *aCode=c_ill; return 0; - case c_4: sz++;/* fallthru */ - case c_3: sz++;/* fallthru */ - case c_lb: - case c_2: sz++;/* fallthru */ - case c_retn: case c_retf: - case c_iret: case c_int3: - case c_ad: case c_op: + case c_4: sz++; /* fallthrough */ + case c_3: sz++; /* fallthrough */ + case c_lb: /* fallthrough */ + case c_2: sz++; /* fallthrough */ + case c_retn: /* fallthrough */ + case c_retf: /* fallthrough */ + case c_iret: /* fallthrough */ + case c_int3: /* fallthrough */ + case c_ad: /* fallthrough */ + case c_op: /* fallthrough */ case c_1: *aCode=tb1; return sz; case c_lv: if (oper_mode) sz+=4; -- 2.13.6
From 95f8d98fbf996310a6690deafa67bb5961371249 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev <[email protected]> Date: Mon, 4 May 2015 20:39:52 +0300 Subject: [PATCH 2/3] build: autoconf: support winpthreads library Signed-off-by: Alon Bar-Lev <[email protected]> Signed-off-by: Jonathan Yong <[email protected]> --- Makefile.am | 6 +++++- configure.ac | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 26a7606e..308b6fd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,10 @@ if LIBRARIES_PSEH MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh endif +if LIBRARIES_WINPTHREADS + MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads +endif + if TOOLS_GENDEF MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef endif @@ -22,7 +26,7 @@ if TOOLS_GENIDL MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl endif -SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL) +SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_LIBRARIES_WINPTHREADS) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL) DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all diff --git a/configure.ac b/configure.ac index 4bb3926b..468d1b19 100644 --- a/configure.ac +++ b/configure.ac @@ -53,30 +53,41 @@ AC_MSG_RESULT([$with_crt]) AC_MSG_CHECKING([whether to build the optional libraries]) AC_ARG_WITH([libraries], [AS_HELP_STRING([--with-libraries=ARG], - [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, or all])], + [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])], [], [with_libraries=no]) AS_CASE([$with_libraries], [yes|all],[ - with_libraries="libmangle,pseh" + with_libraries="libmangle,pseh,winpthreads" + with_libraries_winpthreads=yes with_libraries_mangle=yes with_libraries_pseh=yes], [libmangle],[ with_libraries="libmangle" + with_libraries_winpthreads=no with_libraries_mangle=yes with_libraries_pseh=no], [pseh],[ with_libraries="pseh" + with_libraries_winpthreads=no with_libraries_mangle=no with_libraries_pseh=yes], + [winpthreads],[ + with_libraries="winpthreads" + with_libraries_winpthreads=yes + with_libraries_mangle=no + with_libraries_pseh=no], [no],[ + with_libraries_winpthreads=no with_libraries_mangle=no with_libraries_pseh=no], [MW64_OPTION_ERROR([with-libraries])]) AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes]) AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes]) +AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes]) AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])]) AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])]) +AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])]) AC_MSG_RESULT([$with_libraries]) AC_MSG_CHECKING([whether to build the optional tools]) -- 2.13.6
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
