aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gregor <doug.gregor@gmail.com>2008-01-02 04:35:50 +0000
committerDoug Gregor <dgregor@gcc.gnu.org>2008-01-02 04:35:50 +0000
commit1a7817e4e80c5f7f84d61e6885adb2cfdd1e32e7 (patch)
tree135035bda8ab77ed5c7cbc16dfbc4e18cf05251d
parent224e5fa7438e7f6489861fe39e59ad853cc49929 (diff)
downloadgcc-1a7817e4e80c5f7f84d61e6885adb2cfdd1e32e7.zip
gcc-1a7817e4e80c5f7f84d61e6885adb2cfdd1e32e7.tar.gz
gcc-1a7817e4e80c5f7f84d61e6885adb2cfdd1e32e7.tar.bz2
c-opts.c (sanitize_cpp_opts): Don't warn about "long long" when in C++0x mode.
2008-01-01 Douglas Gregor <doug.gregor@gmail.com> * c-opts.c (sanitize_cpp_opts): Don't warn about "long long" when in C++0x mode. 2008-01-01 Douglas Gregor <doug.gregor@gmail.com> * parser.c (cp_parser_check_decl_spec): Don't warn about "long long" in C++0x mode; change the warning to note that "long long" is only unsupported in C++98 mode. 2008-01-01 Douglas Gregor <doug.gregor@gmail.com> * g++.dg/cpp0x/long_long.C: New. From-SVN: r131254
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-opts.c6
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c5
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/long_long.C6
6 files changed, 29 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce2f258..7fc21c4d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01 Douglas Gregor <doug.gregor@gmail.com>
+
+ * c-opts.c (sanitize_cpp_opts): Don't warn about "long long" when
+ in C++0x mode.
+
2008-01-01 Volker Reichelt <v.reichelt@netcologne.de>
PR libmudflap/26442
diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index a5c2270..3c62192 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1429,7 +1429,11 @@ sanitize_cpp_opts (void)
/* We want -Wno-long-long to override -pedantic -std=non-c99
and/or -Wtraditional, whatever the ordering. */
cpp_opts->warn_long_long
- = warn_long_long && ((!flag_isoc99 && pedantic) || warn_traditional);
+ = warn_long_long && ((pedantic
+ && (c_dialect_cxx ()
+ ? cxx_dialect == cxx98
+ : !flag_isoc99))
+ || warn_traditional);
/* Similarly with -Wno-variadic-macros. No check for c99 here, since
this also turns off warnings about GCCs extension. */
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a67b941..cc99369 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-01 Douglas Gregor <doug.gregor@gmail.com>
+
+ * parser.c (cp_parser_check_decl_spec): Don't warn about "long
+ long" in C++0x mode; change the warning to note that "long long"
+ is only unsupported in C++98 mode.
+
2007-12-20 Jason Merrill <jason@redhat.com>
PR c++/34111
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index d592620..16f5a4e 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -2147,8 +2147,9 @@ cp_parser_check_decl_spec (cp_decl_specifier_seq *decl_specs)
{
if (count > 2)
error ("%<long long long%> is too long for GCC");
- else if (pedantic && !in_system_header && warn_long_long)
- pedwarn ("ISO C++ does not support %<long long%>");
+ else if (pedantic && !in_system_header && warn_long_long
+ && cxx_dialect == cxx98)
+ pedwarn ("ISO C++ 1998 does not support %<long long%>");
}
else if (count > 1)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 76e5a14..f8ea8d2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-01 Douglas Gregor <doug.gregor@gmail.com>
+
+ * g++.dg/cpp0x/long_long.C: New.
+
2008-01-01 Andrew Pinski <andrew_pinski@playstation.sony.com>
* gcc.target/spu/tag_manager.c : Include stdlib.h.
diff --git a/gcc/testsuite/g++.dg/cpp0x/long_long.C b/gcc/testsuite/g++.dg/cpp0x/long_long.C
new file mode 100644
index 0000000..3ef710d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/long_long.C
@@ -0,0 +1,6 @@
+// { dg-options "-std=c++0x -pedantic" }
+
+void foo()
+{
+ long long x = 17;
+}
BASE_ADDRESS_SPACE_IO); range = info->bus->memory_range = g_new0(PciMemoryRange, 1); range->base = pci_bridge_get_base(dev, PCI_BASE_ADDRESS_SPACE_MEMORY); range->limit = pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_MEMORY); range = info->bus->prefetchable_range = g_new0(PciMemoryRange, 1); range->base = pci_bridge_get_base(dev, PCI_BASE_ADDRESS_MEM_PREFETCH); range->limit = pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_MEM_PREFETCH); if (dev->config[PCI_SECONDARY_BUS] != 0) { PCIBus *child_bus = pci_find_bus_nr(bus, dev->config[PCI_SECONDARY_BUS]); if (child_bus) { info->has_devices = true; info->devices = qmp_query_pci_devices(child_bus, dev->config[PCI_SECONDARY_BUS]); } } return info; } static PciDeviceInfo *qmp_query_pci_device(PCIDevice *dev, PCIBus *bus, int bus_num) { const pci_class_desc *desc; PciDeviceInfo *info; uint8_t type; int class; info = g_new0(PciDeviceInfo, 1); info->bus = bus_num; info->slot = PCI_SLOT(dev->devfn); info->function = PCI_FUNC(dev->devfn); info->class_info = g_new0(PciDeviceClass, 1); class = pci_get_word(dev->config + PCI_CLASS_DEVICE); info->class_info->q_class = class; desc = get_class_desc(class); if (desc->desc) { info->class_info->desc = g_strdup(desc->desc); } info->id = g_new0(PciDeviceId, 1); info->id->vendor = pci_get_word(dev->config + PCI_VENDOR_ID); info->id->device = pci_get_word(dev->config + PCI_DEVICE_ID); info->regions = qmp_query_pci_regions(dev); info->qdev_id = g_strdup(dev->qdev.id ? dev->qdev.id : ""); info->irq_pin = dev->config[PCI_INTERRUPT_PIN]; if (dev->config[PCI_INTERRUPT_PIN] != 0) { info->has_irq = true; info->irq = dev->config[PCI_INTERRUPT_LINE]; } type = dev->config[PCI_HEADER_TYPE] & ~PCI_HEADER_TYPE_MULTI_FUNCTION; if (type == PCI_HEADER_TYPE_BRIDGE) { info->pci_bridge = qmp_query_pci_bridge(dev, bus, bus_num); } else if (type == PCI_HEADER_TYPE_NORMAL) { info->id->has_subsystem = info->id->has_subsystem_vendor = true; info->id->subsystem = pci_get_word(dev->config + PCI_SUBSYSTEM_ID); info->id->subsystem_vendor = pci_get_word(dev->config + PCI_SUBSYSTEM_VENDOR_ID); } else if (type == PCI_HEADER_TYPE_CARDBUS) { info->id->has_subsystem = info->id->has_subsystem_vendor = true; info->id->subsystem = pci_get_word(dev->config + PCI_CB_SUBSYSTEM_ID); info->id->subsystem_vendor = pci_get_word(dev->config + PCI_CB_SUBSYSTEM_VENDOR_ID); } return info; } static PciDeviceInfoList *qmp_query_pci_devices(PCIBus *bus, int bus_num) { PciDeviceInfoList *head = NULL, **tail = &head; PCIDevice *dev; int devfn; for (devfn = 0; devfn < ARRAY_SIZE(bus->devices); devfn++) { dev = bus->devices[devfn]; if (dev) { QAPI_LIST_APPEND(tail, qmp_query_pci_device(dev, bus, bus_num)); } } return head; } static PciInfo *qmp_query_pci_bus(PCIBus *bus, int bus_num) { PciInfo *info = NULL; bus = pci_find_bus_nr(bus, bus_num); if (bus) { info = g_malloc0(sizeof(*info)); info->bus = bus_num; info->devices = qmp_query_pci_devices(bus, bus_num); } return info; } PciInfoList *qmp_query_pci(Error **errp) { PciInfoList *head = NULL, **tail = &head; PCIHostState *host_bridge; QLIST_FOREACH(host_bridge, &pci_host_bridges, next) { QAPI_LIST_APPEND(tail, qmp_query_pci_bus(host_bridge->bus, pci_bus_num(host_bridge->bus))); } return head; }