Merge 21ae2e1 into 04f8aa6

AUTHORS

@@ -158,6 +158,7 @@ Bernhard M. Wiedemann          <bwiedemann@suse.de>
 Bill Campbell                  <bill@celestial.com>
 Bill Glicker                   <billg@burrelles.com>
 Billy Constantine              <wdconsta@cs.adelaide.edu.au>
+Biswapriyo Nath                <nathbappai@gmail.com>
 Blair Zajac                    <blair@orcaware.com>
 Bo Borgerson                   <gigabo@gmail.com>
 Bo Johansson                   <bo.johansso@lsn.se>

perl.h

@@ -686,7 +686,9 @@ Now a placeholder that declares nothing
 #    define dTHXs		dNOOP
 #endif
 
-#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) && !defined(__cplusplus)
+/* clang shows warnings for tokens introducing statement expression appear
+ * in different macro expansion contexts. */
+#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) && !defined(__cplusplus) && !defined(__clang__)
 #  ifndef PERL_USE_GCC_BRACE_GROUPS
 #    define PERL_USE_GCC_BRACE_GROUPS
 #  endif

win32/GNUmakefile

@@ -408,12 +408,16 @@ CCHOME		:= $(VCINSTALLDIR)
 endif
 endif
 
+# Check processor architecture from target triplet
+# possible values:
+# gcc: i686-w64-mingw32, x86_64-w64-mingw32
+# clang: i686-w64-windows-gnu, x86_64-w64-windows-gnu
 ifeq ($(CCTYPE),GCC)
-ifeq ($(GCCTARGET),x86_64-w64-mingw32)
+ifeq (x86_64, $(findstring x86_64, $(GCCTARGET)))
 WIN64 := define
 PROCESSOR_ARCHITECTURE := x64
 endif
-ifeq ($(GCCTARGET),i686-w64-mingw32)
+ifeq (i686, $(findstring i686, $(GCCTARGET)))
 WIN64 := undef
 PROCESSOR_ARCHITECTURE := x86
 endif
@@ -623,7 +627,7 @@ OPTIMIZE	= -g -O2
 LINK_DBG	= -g
 DEFINES		+= -DDEBUGGING
 else
-OPTIMIZE	= -s -O2
+OPTIMIZE	= -O2
 LINK_DBG	= -s
 endif
 
@@ -1604,7 +1608,7 @@ endif
 
 $(PERLDLL): $(PERLEXPLIB) $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
 ifeq ($(CCTYPE),GCC)
-	$(LINK32) -mdll -o $@ $(BLINK_FLAGS) \
+	$(LINK32) -shared -o $@ $(BLINK_FLAGS) \
 	   $(PERLDLL_OBJ) $(shell type Extensions_static) $(LIBFILES) $(PERLEXPLIB)
 else
 	$(LINK32) -dll -out:$@ $(BLINK_FLAGS) \

win32/config.gc

@@ -860,7 +860,7 @@ ivtype='long'
 known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 ksh=''
 ld='~ARCHPREFIX~g++'
-lddlflags='-mdll ~LINK_FLAGS~'
+lddlflags='-shared ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
 ldflags_uselargefiles=''
 ldlibpthname=''