From: <jo...@us...> - 2013-03-26 13:26:47
|
Revision: 5691 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5691&view=rev Author: jon_y Date: 2013-03-26 13:26:38 +0000 (Tue, 26 Mar 2013) Log Message: ----------- Remove old leading-underscores option Modified Paths: -------------- trunk/mingw-w64-crt/Makefile.am trunk/mingw-w64-crt/Makefile.in trunk/mingw-w64-crt/configure trunk/mingw-w64-crt/configure.ac Modified: trunk/mingw-w64-crt/Makefile.am =================================================================== --- trunk/mingw-w64-crt/Makefile.am 2013-03-25 15:18:22 UTC (rev 5690) +++ trunk/mingw-w64-crt/Makefile.am 2013-03-26 13:26:38 UTC (rev 5691) @@ -20,18 +20,10 @@ withsys= endif -if UNDERSCORES - cflags_underscores= - dlltool_underscores= -else - cflags_underscores=-fno-leading-underscore - dlltool_underscores=--no-leading-underscore -endif - AM_CPPFLAGS=-D_CRTBLD $(sysincludes) -AM_CFLAGS=$(cflags_underscores) -pipe -std=gnu99 @ADD_C_CXX_WARNING_FLAGS@ @ADD_C_ONLY_WARNING_FLAGS@ +AM_CFLAGS=-pipe -std=gnu99 @ADD_C_CXX_WARNING_FLAGS@ @ADD_C_ONLY_WARNING_FLAGS@ AM_CXXFLAGS=@ADD_C_CXX_WARNING_FLAGS@ @ADD_CXX_ONLY_WARNING_FLAGS@ -AM_DLLTOOLFLAGS=$(dlltool_underscores) -k --as=$(AS) --output-lib $@ +AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ if DELAY_IMPORT_LIBS AM_DLLTOOLFLAGS += --output-delaylib $@.delayimp.a endif Modified: trunk/mingw-w64-crt/Makefile.in =================================================================== --- trunk/mingw-w64-crt/Makefile.in 2013-03-25 15:18:22 UTC (rev 5690) +++ trunk/mingw-w64-crt/Makefile.in 2013-03-26 13:26:38 UTC (rev 5691) @@ -3448,15 +3448,10 @@ @WITHSYSROOT_TRUE@sysincludes = -I@TARGET_SYSTEM_ROOT@/include @WITHSYSROOT_FALSE@withsys = @WITHSYSROOT_TRUE@withsys = --with-sysroot=@TARGET_SYSTEM_ROOT@ -@UNDERSCORES_FALSE@cflags_underscores = -fno-leading-underscore -@UNDERSCORES_TRUE@cflags_underscores = -@UNDERSCORES_FALSE@dlltool_underscores = --no-leading-underscore -@UNDERSCORES_TRUE@dlltool_underscores = AM_CPPFLAGS = -D_CRTBLD $(sysincludes) -AM_CFLAGS = $(cflags_underscores) -pipe -std=gnu99 @ADD_C_CXX_WARNING_FLAGS@ @ADD_C_ONLY_WARNING_FLAGS@ +AM_CFLAGS = -pipe -std=gnu99 @ADD_C_CXX_WARNING_FLAGS@ @ADD_C_ONLY_WARNING_FLAGS@ AM_CXXFLAGS = @ADD_C_CXX_WARNING_FLAGS@ @ADD_CXX_ONLY_WARNING_FLAGS@ -AM_DLLTOOLFLAGS = $(dlltool_underscores) -k --as=$(AS) --output-lib $@ \ - $(am__append_1) +AM_DLLTOOLFLAGS = -k --as=$(AS) --output-lib $@ $(am__append_1) CPPFLAGS32 = -m32 CPPFLAGS64 = -m64 DLLTOOLFLAGS32 = --as-flags=--32 -m i386 Modified: trunk/mingw-w64-crt/configure =================================================================== --- trunk/mingw-w64-crt/configure 2013-03-25 15:18:22 UTC (rev 5690) +++ trunk/mingw-w64-crt/configure 2013-03-26 13:26:38 UTC (rev 5691) @@ -639,8 +639,6 @@ DELAY_IMPORT_LIBS_TRUE PRIVATE_EXPORTS_FALSE PRIVATE_EXPORTS_TRUE -UNDERSCORES_FALSE -UNDERSCORES_TRUE LIB32SUFFIXDIR LIB64SUFFIXDIR LIBCE_FALSE @@ -771,7 +769,6 @@ enable_lib64 enable_libce enable_wildcard -enable_leading_underscores enable_private_exports enable_delay_import_libs enable_tests_unicode @@ -1422,9 +1419,6 @@ --enable-lib64 Build the Win64 libraries --enable-libce Build the WinCE libraries --enable-wildcard Enable command line globbing - --disable-leading-underscores - Disable leading underscores to match the MSVC - calling convention --enable-private-exports Enable exporting private internal functions --enable-delay-import-libs @@ -5259,34 +5253,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_wildcard" >&5 $as_echo "$enable_wildcard" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable leading underscores" >&5 -$as_echo_n "checking whether to enable leading underscores... " >&6; } -# Check whether --enable-leading-underscores was given. -if test "${enable_leading_underscores+set}" = set; then : - enableval=$enable_leading_underscores; -else - enable_leading_underscores=yes -fi - -case $enable_leading_underscores in #( - yes) : - ;; #( - no) : - ;; #( - *) : - as_fn_error $? "Please only use --enable-leading-underscores or --disable-leading-underscores, without any additional arguments." "$LINENO" 5 ;; -esac - if test $enable_leading_underscores = yes; then - UNDERSCORES_TRUE= - UNDERSCORES_FALSE='#' -else - UNDERSCORES_TRUE='#' - UNDERSCORES_FALSE= -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_leading_underscores" >&5 -$as_echo "$enable_leading_underscores" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable private exports" >&5 $as_echo_n "checking whether to enable private exports... " >&6; } # Check whether --enable-private-exports was given. @@ -6028,10 +5994,6 @@ as_fn_error $? "conditional \"LIBCE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${UNDERSCORES_TRUE}" && test -z "${UNDERSCORES_FALSE}"; then - as_fn_error $? "conditional \"UNDERSCORES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${PRIVATE_EXPORTS_TRUE}" && test -z "${PRIVATE_EXPORTS_FALSE}"; then as_fn_error $? "conditional \"PRIVATE_EXPORTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 Modified: trunk/mingw-w64-crt/configure.ac =================================================================== --- trunk/mingw-w64-crt/configure.ac 2013-03-25 15:18:22 UTC (rev 5690) +++ trunk/mingw-w64-crt/configure.ac 2013-03-26 13:26:38 UTC (rev 5691) @@ -150,19 +150,6 @@ AC_DEFINE_UNQUOTED([__ENABLE_GLOBBING],[$enable_wildcard_value],[Define as -1 to enable command line globbing or 0 to disable it.]) AC_MSG_RESULT([$enable_wildcard]) -AC_MSG_CHECKING([whether to enable leading underscores]) -AC_ARG_ENABLE([leading-underscores], - [AS_HELP_STRING([--disable-leading-underscores], - [Disable leading underscores to match the MSVC calling convention])], - [], - [enable_leading_underscores=yes]) -AS_CASE([$enable_leading_underscores], - [yes],[], - [no],[], - [AC_MSG_ERROR([Please only use --enable-leading-underscores or --disable-leading-underscores, without any additional arguments.])]) -AM_CONDITIONAL([UNDERSCORES],[test $enable_leading_underscores = yes]) -AC_MSG_RESULT([$enable_leading_underscores]) - AC_MSG_CHECKING([whether to enable private exports]) AC_ARG_ENABLE([private-exports], [AS_HELP_STRING([--enable-private-exports], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |