* config/i386/cygwin.h (TARGET_DLL, TARGET_WIN32,

	TARGET_CYGWIN, TARGET_WINDOWS): Remove unused switches.
	(MASK_DLL, MASK_WIN32, MASK_CYGWIN, MASK_WINDOWS):
	Remove unnecessary masks.
	(MASK_NOP_FUN_DLLIMPORT): Use an unused an bit.
	(SUBTARGET_SWITCHES): Use empty masks for -mwin32, -mcygwin,
	-mwindows, -mdll switches and their negations.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51440 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9cb8673..d7bc10e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2002-03-27  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * config/i386/cygwin.h (TARGET_DLL, TARGET_WIN32,
+       TARGET_CYGWIN, TARGET_WINDOWS): Remove unused switches.
+       (MASK_DLL, MASK_WIN32, MASK_CYGWIN, MASK_WINDOWS):
+       Remove unnecessary masks.
+       (MASK_NOP_FUN_DLLIMPORT): Use an unused an bit.
+       (SUBTARGET_SWITCHES): Use empty masks for -mwin32, -mcygwin,
+       -mwindows, -mdll switches and their negations.
+
 2002-03-27  Neil Booth  <neil@daikokuya.demon.co.uk>
 
        * gcc-common.c (lang_mark_false_label_stack): Remove.

diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index 43e5bf4..1e2ff7b 100644 (file)
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -32,34 +32,24 @@ Boston, MA 02111-1307, USA.  */
 #include "i386/gas.h"
 #include "dbxcoff.h"
 
-/* Augment TARGET_SWITCHES with the cygwin/no-cygwin options.  */
-#define MASK_WIN32 0x40000000 /* Use -lming32 interface */
-#define MASK_CYGWIN  0x20000000 /* Use -lcygwin interface */
-#define MASK_WINDOWS 0x10000000 /* Use windows interface */
-#define MASK_DLL     0x08000000 /* Use dll interface    */
-#define MASK_NOP_FUN_DLLIMPORT 0x20000 /* Ignore dllimport for functions */
-
-#define TARGET_WIN32             (target_flags & MASK_WIN32)
-#define TARGET_CYGWIN            (target_flags & MASK_CYGWIN)
-#define TARGET_WINDOWS           (target_flags & MASK_WINDOWS)
-#define TARGET_DLL               (target_flags & MASK_DLL)
+/* Masks for subtarget switches used by other files.  */
+#define MASK_NOP_FUN_DLLIMPORT 0x08000000 /* Ignore dllimport for functions */
+
+/* Used in winnt.c.  */
 #define TARGET_NOP_FUN_DLLIMPORT (target_flags & MASK_NOP_FUN_DLLIMPORT)
 
 #undef  SUBTARGET_SWITCHES
 #define SUBTARGET_SWITCHES \
-{ "cygwin",              MASK_CYGWIN,                                  \
-  N_("Use the Cygwin interface") },                                    \
-{ "no-cygwin",           MASK_WIN32,                                   \
-  N_("Use the Mingw32 interface") },                                   \
-{ "windows",             MASK_WINDOWS, N_("Create GUI application") }, \
-{ "no-win32",            -MASK_WIN32, N_("Don't set Windows defines") },\
-{ "win32",               0, N_("Set Windows defines") },               \
-{ "console",             -MASK_WINDOWS,                                \
-  N_("Create console application") },                                  \
-{ "dll",                 MASK_DLL, N_("Generate code for a DLL") },    \
-{ "nop-fun-dllimport",   MASK_NOP_FUN_DLLIMPORT,                       \
-  N_("Ignore dllimport for functions") },                              \
-{ "no-nop-fun-dllimport", -MASK_NOP_FUN_DLLIMPORT, "" }, \
+{ "cygwin",              0, N_("Use the Cygwin interface") },  \
+{ "no-cygwin",           0, N_("Use the Mingw32 interface") }, \
+{ "windows",             0, N_("Create GUI application") },    \
+{ "no-win32",            0, N_("Don't set Windows defines") }, \
+{ "win32",               0, N_("Set Windows defines") },       \
+{ "console",             0, N_("Create console application") },\
+{ "dll",                 0, N_("Generate code for a DLL") },   \
+{ "nop-fun-dllimport",   MASK_NOP_FUN_DLLIMPORT,               \
+  N_("Ignore dllimport for functions") },                      \
+{ "no-nop-fun-dllimport", -MASK_NOP_FUN_DLLIMPORT, "" },       \
 { "threads",             0, N_("Use Mingw-specific thread support") },
 
 #undef CPP_PREDEFINES