From 4046c861ba773788575746fdb2dac6155cfdb0bb Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 10 Nov 2015 14:39:09 +0100 Subject: [PATCH] These are not needed with official tools (nw) --- src/devices/cpu/sh2/sh2comn.cpp | 11 ----------- src/devices/machine/nvram.cpp | 12 ------------ src/devices/machine/pci.cpp | 11 ----------- src/devices/machine/pit8253.cpp | 11 ----------- src/devices/sound/discrete.cpp | 12 ------------ src/emu/audit.cpp | 12 ------------ src/emu/schedule.cpp | 12 ------------ src/lib/netlist/nl_parser.cpp | 11 ----------- src/lib/netlist/plib/pconfig.h | 11 ----------- src/lib/netlist/plib/pparser.cpp | 12 ------------ src/lib/netlist/solver/nld_solver.cpp | 12 ------------ src/lib/netlist/tools/nl_convert.cpp | 11 ----------- src/mame/drivers/chihiro.cpp | 11 ----------- src/mame/drivers/model3.cpp | 12 ------------ src/mame/drivers/naomi.cpp | 12 ------------ src/mame/drivers/ssem.cpp | 11 ----------- src/mame/machine/dc.cpp | 10 ---------- src/mame/machine/xbox.cpp | 11 ----------- 18 files changed, 205 deletions(-) diff --git a/src/devices/cpu/sh2/sh2comn.cpp b/src/devices/cpu/sh2/sh2comn.cpp index 1080203494f..687306babb8 100644 --- a/src/devices/cpu/sh2/sh2comn.cpp +++ b/src/devices/cpu/sh2/sh2comn.cpp @@ -13,14 +13,6 @@ #include "sh2.h" #include "sh2comn.h" - -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) @@ -1022,6 +1014,3 @@ WRITE16_MEMBER(sh2a_device::sh7021_w) { COMBINE_DATA(&m_sh7021_regs[offset]); } -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/devices/machine/nvram.cpp b/src/devices/machine/nvram.cpp index a1c9d734e2e..8ea20a58eac 100644 --- a/src/devices/machine/nvram.cpp +++ b/src/devices/machine/nvram.cpp @@ -11,14 +11,6 @@ #include "emu.h" #include "machine/nvram.h" - -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - //************************************************************************** // LIVE DEVICE //************************************************************************** @@ -175,7 +167,3 @@ void nvram_device::determine_final_base() if (m_region != NULL && m_region->bytes() != m_length) throw emu_fatalerror("NVRAM device '%s' has a default region, but it should be 0x%" SIZETFMT "X bytes", tag(), m_length); } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/devices/machine/pci.cpp b/src/devices/machine/pci.cpp index a5c95198c75..079444f379b 100644 --- a/src/devices/machine/pci.cpp +++ b/src/devices/machine/pci.cpp @@ -2,13 +2,6 @@ // copyright-holders:Olivier Galibert #include "pci.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - const device_type PCI_ROOT = &device_creator; const device_type PCI_BRIDGE = &device_creator; @@ -902,7 +895,3 @@ void pci_root_device::device_start() void pci_root_device::device_reset() { } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp index 1ad506686e0..2a0be4466ab 100644 --- a/src/devices/machine/pit8253.cpp +++ b/src/devices/machine/pit8253.cpp @@ -23,13 +23,6 @@ #include "emu.h" #include "machine/pit8253.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - /* device types */ enum { @@ -1129,7 +1122,3 @@ WRITE_LINE_MEMBER( pit8253_device::write_clk2 ) { set_clock_signal(2, state); } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp index e9e1281f42c..323c996d84b 100644 --- a/src/devices/sound/discrete.cpp +++ b/src/devices/sound/discrete.cpp @@ -39,14 +39,6 @@ #include "sound/wavwrite.h" #include "discrete.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - /* for_each collides with c++ standard libraries - include it here */ #define for_each(_T, _e, _l) for (_T _e = (_l)->begin_ptr() ; _e <= (_l)->end_ptr(); _e++) @@ -1142,7 +1134,3 @@ WRITE8_MEMBER( discrete_device::write ) discrete_log("discrete_sound_w write to non-existent NODE_%02d\n", offset-NODE_00); } } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/emu/audit.cpp b/src/emu/audit.cpp index 0f2b5cf4854..8f13a2a5d86 100644 --- a/src/emu/audit.cpp +++ b/src/emu/audit.cpp @@ -15,14 +15,6 @@ #include "sound/samples.h" #include "softlist.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - //************************************************************************** // CORE FUNCTIONS //************************************************************************** @@ -615,7 +607,3 @@ audit_record::audit_record(const char *name, media_type type) m_shared_device(NULL) { } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/emu/schedule.cpp b/src/emu/schedule.cpp index 28521538d16..565d027cfc4 100644 --- a/src/emu/schedule.cpp +++ b/src/emu/schedule.cpp @@ -11,14 +11,6 @@ #include "emu.h" #include "debugger.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - //************************************************************************** // DEBUGGING //************************************************************************** @@ -990,7 +982,3 @@ void device_scheduler::dump_timers() const timer->dump(); machine().logerror("=============================================\n"); } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/lib/netlist/nl_parser.cpp b/src/lib/netlist/nl_parser.cpp index 312410fafc6..638bbae219a 100644 --- a/src/lib/netlist/nl_parser.cpp +++ b/src/lib/netlist/nl_parser.cpp @@ -9,13 +9,6 @@ #include "nl_factory.h" #include "devices/nld_truthtable.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - namespace netlist { // ---------------------------------------------------------------------------------------- @@ -463,7 +456,3 @@ nl_double parser_t::eval_param(const token_t tok) #endif } } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h index cfa622c9118..6a96eca52d1 100644 --- a/src/lib/netlist/plib/pconfig.h +++ b/src/lib/netlist/plib/pconfig.h @@ -5,13 +5,6 @@ * */ -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #ifndef PCONFIG_H_ #define PCONFIG_H_ @@ -206,7 +199,3 @@ private: #endif #endif /* PCONFIG_H_ */ - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp index aa11c30cfa9..f61a1677ced 100644 --- a/src/lib/netlist/plib/pparser.cpp +++ b/src/lib/netlist/plib/pparser.cpp @@ -9,13 +9,6 @@ #include "pparser.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - // ---------------------------------------------------------------------------------------- // A simple tokenizer // ---------------------------------------------------------------------------------------- @@ -475,8 +468,3 @@ postream & ppreprocessor::process_i(pistream &istrm, postream &ostrm) } return ostrm; } - - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index c2544f7dbdf..b862e031f3d 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -9,14 +9,6 @@ * the vectorizations fast-math enables pretty expensive */ -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - #if 0 #pragma GCC optimize "-ffast-math" //#pragma GCC optimize "-ftree-parallelize-loops=4" @@ -649,7 +641,3 @@ ATTR_COLD void NETLIB_NAME(solver)::post_start() } NETLIB_NAMESPACE_DEVICES_END() - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp index dae68968445..8157bfffdcd 100644 --- a/src/lib/netlist/tools/nl_convert.cpp +++ b/src/lib/netlist/tools/nl_convert.cpp @@ -11,13 +11,6 @@ #include "nl_convert.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - template static plist_t bubble(const pnamedlist_t &sl) { @@ -453,7 +446,3 @@ void nl_convert_eagle_t::convert(const pstring &contents) } } - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp index 3fd14bec79e..4c89e9e0972 100644 --- a/src/mame/drivers/chihiro.cpp +++ b/src/mame/drivers/chihiro.cpp @@ -378,13 +378,6 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info. #include "includes/chihiro.h" #include "includes/xbox.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #define LOG_PCI //#define LOG_BASEBOARD @@ -1283,7 +1276,3 @@ ROM_END // 0023 // 0024 GAME( 2009, ccfboxo, ccfboxa, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Chihiro Firmware Update For Compact Flash Box (GDX-0024)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING ) /* 0024A */ GAME( 2009, ccfboxa, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Chihiro Firmware Update For Compact Flash Box (Rev A) (GDX-0024A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING ) - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index a1de28a0cf4..e793b648ab5 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -667,14 +667,6 @@ ALL VROM ROMs are 16M MASK #include "includes/model3.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - void model3_state::update_irq_state() { if ((m_irq_enable & m_irq_state) || m_scsi_irq_state) @@ -6059,7 +6051,3 @@ GAME( 1998, magtruck, 0, model3_21_5881, eca, model3_state, magtruc GAME( 1999, eca, 0, model3_21_5881, eca, model3_state, eca, ROT0, "Sega", "Emergency Call Ambulance (Export)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) GAME( 1999, ecau, eca, model3_21_5881, eca, model3_state, eca, ROT0, "Sega", "Emergency Call Ambulance (USA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) GAME( 1999, ecap, eca, model3_21_5881, eca, model3_state, eca, ROT0, "Sega", "Emergency Call Ambulance (US location test?)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index dec0205d9b5..460a48bcf72 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -1580,14 +1580,6 @@ Sushi Bar #include "includes/naomi.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - - #define CPU_CLOCK (200000000) READ64_MEMBER(naomi_state::naomi_arm_r ) @@ -9437,7 +9429,3 @@ GAME( 2006, mslug6, awbios, aw2c, aw2c, naomi_state, atomiswave, ROT0, "Sega GAME( 2006, xtrmhnt2, awbios, aw2c, aw2c, naomi_state, xtrmhnt2, ROT0, "Sega", "Extreme Hunting 2", GAME_FLAGS ) GAME( 2008, claychal, awbios, aw2c, aw2c, naomi_state, atomiswave, ROT0, "Sega", "Sega Clay Challenge", GAME_FLAGS ) GAME( 2009, basschal, awbios, aw2c, aw2c, naomi_state, atomiswave, ROT0, "Sega", "Sega Bass Fishing Challenge", GAME_FLAGS ) - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp index db4d1842cc3..da054feb016 100644 --- a/src/mame/drivers/ssem.cpp +++ b/src/mame/drivers/ssem.cpp @@ -11,13 +11,6 @@ #include "cpu/ssem/ssem.h" #include "imagedev/snapquik.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - class ssem_state : public driver_device { public: @@ -649,7 +642,3 @@ ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ COMP(1948, ssem, 0, 0, ssem, ssem, driver_device, 0, "Manchester University", "Small-Scale Experimental Machine (SSEM), 'Baby'", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE ) - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/machine/dc.cpp b/src/mame/machine/dc.cpp index a28b6c17810..324a1a1dfe6 100644 --- a/src/mame/machine/dc.cpp +++ b/src/mame/machine/dc.cpp @@ -14,13 +14,6 @@ #include "machine/naomig1.h" #include "video/powervr2.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #define DEBUG_REGISTERS (1) #if DEBUG_REGISTERS @@ -729,6 +722,3 @@ TIMER_DEVICE_CALLBACK_MEMBER(dc_state::dc_scanline) { m_powervr2->pvr_scanline_timer(param); } -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index ebb0d6fa631..03d4c89df8f 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -16,13 +16,6 @@ #include "includes/chihiro.h" #include "includes/xbox.h" -// for now, make buggy GCC/Mingw STFU about I64FMT -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat" -#pragma GCC diagnostic ignored "-Wformat-extra-args" -#endif - #define LOG_PCI //#define LOG_OHCI //#define USB_ENABLED @@ -1536,7 +1529,3 @@ MACHINE_CONFIG_START(xbox_base, xbox_base_state) MCFG_SCREEN_UPDATE_DRIVER(xbox_base_state, screen_update_callback) MCFG_SCREEN_VBLANK_DRIVER(xbox_base_state, vblank_callback) MACHINE_CONFIG_END - -#if (defined(__MINGW32__) && (__GNUC__ >= 5)) -#pragma GCC diagnostic pop -#endif