From b227e1609ce0d6ede800512837bde46b9c5390b5 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Mon, 18 Apr 2016 00:34:29 +0000 Subject: [PATCH] rules: provide default C and C++ standards Default CSTD to c99, no default for CXXSTD, but if provided it will be used. Add required gnu99 flags to projects using gnu styles. --- examples/rules.mk | 5 +++-- examples/stm32/f0/stm32f0-discovery/usart_stdio/Makefile | 1 + examples/stm32/f1/lisa-m-1/usb_dfu/Makefile | 1 + examples/stm32/f1/lisa-m-2/adc_injec/Makefile | 1 - examples/stm32/f1/lisa-m-2/adc_injec_timtrig/Makefile | 1 - examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/Makefile | 1 - .../stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/Makefile | 1 - examples/stm32/f1/lisa-m-2/adc_regular/Makefile | 1 - examples/stm32/f1/lisa-m-2/can/Makefile | 1 - examples/stm32/f1/lisa-m-2/fancyblink/Makefile | 1 - examples/stm32/f1/lisa-m-2/spi/Makefile | 1 - examples/stm32/f1/lisa-m-2/spi_dma/Makefile | 1 - examples/stm32/f1/lisa-m-2/spi_dma_adv/Makefile | 1 - examples/stm32/f1/lisa-m-2/usart/Makefile | 1 - examples/stm32/f1/lisa-m-2/usart_dma/Makefile | 1 - examples/stm32/f1/lisa-m-2/usart_irq/Makefile | 1 - examples/stm32/f1/lisa-m-2/usart_irq_printf/Makefile | 1 - examples/stm32/f1/lisa-m-2/usart_printf/Makefile | 1 - examples/stm32/f1/other/usb_dfu/Makefile | 1 + examples/stm32/f1/stm32-h103/usb_dfu/Makefile | 1 + examples/stm32/f1/stm32-h103/usb_iap/Makefile | 1 + examples/stm32/f4/stm32f429i-discovery/lcd-dma/Makefile | 1 + 22 files changed, 9 insertions(+), 17 deletions(-) diff --git a/examples/rules.mk b/examples/rules.mk index 4491b18..8a8da4a 100644 --- a/examples/rules.mk +++ b/examples/rules.mk @@ -43,6 +43,7 @@ STYLECHECK := /checkpatch.pl STYLECHECKFLAGS := --no-tree -f --terse --mailback STYLECHECKFILES := $(shell find . -name '*.[ch]') OPT := -Os +CSTD ?= -std=c99 ############################################################################### @@ -96,7 +97,7 @@ SCRIPT_DIR = $(OPENCM3_DIR)/scripts ############################################################################### # C flags -TGT_CFLAGS += $(OPT) -g +TGT_CFLAGS += $(OPT) $(CSTD) -g TGT_CFLAGS += $(ARCH_FLAGS) TGT_CFLAGS += -Wextra -Wshadow -Wimplicit-function-declaration TGT_CFLAGS += -Wredundant-decls -Wmissing-prototypes -Wstrict-prototypes @@ -105,7 +106,7 @@ TGT_CFLAGS += -fno-common -ffunction-sections -fdata-sections ############################################################################### # C++ flags -TGT_CXXFLAGS += $(OPT) -g +TGT_CXXFLAGS += $(OPT) $(CXXSTD) -g TGT_CXXFLAGS += $(ARCH_FLAGS) TGT_CXXFLAGS += -Wextra -Wshadow -Wredundant-decls -Weffc++ TGT_CXXFLAGS += -fno-common -ffunction-sections -fdata-sections diff --git a/examples/stm32/f0/stm32f0-discovery/usart_stdio/Makefile b/examples/stm32/f0/stm32f0-discovery/usart_stdio/Makefile index 4c9a0fb..f2648ad 100644 --- a/examples/stm32/f0/stm32f0-discovery/usart_stdio/Makefile +++ b/examples/stm32/f0/stm32f0-discovery/usart_stdio/Makefile @@ -18,6 +18,7 @@ ## BINARY = usart_stdio +CSTD = -std=gnu99 LDSCRIPT = ../stm32f0-discovery.ld diff --git a/examples/stm32/f1/lisa-m-1/usb_dfu/Makefile b/examples/stm32/f1/lisa-m-1/usb_dfu/Makefile index eab1567..c09ad9e 100644 --- a/examples/stm32/f1/lisa-m-1/usb_dfu/Makefile +++ b/examples/stm32/f1/lisa-m-1/usb_dfu/Makefile @@ -18,6 +18,7 @@ ## BINARY = usbdfu +CSTD = -std=gnu99 LDSCRIPT = ../lisa-m.ld diff --git a/examples/stm32/f1/lisa-m-2/adc_injec/Makefile b/examples/stm32/f1/lisa-m-2/adc_injec/Makefile index 666c393..ad3f597 100644 --- a/examples/stm32/f1/lisa-m-2/adc_injec/Makefile +++ b/examples/stm32/f1/lisa-m-2/adc_injec/Makefile @@ -21,7 +21,6 @@ BINARY = adc_injec # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/Makefile b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/Makefile index 72eab49..5aa32c3 100644 --- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/Makefile +++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/Makefile @@ -21,7 +21,6 @@ BINARY = adc_injec_timtrig # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/Makefile b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/Makefile index 8ad47e2..fd7077c 100644 --- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/Makefile +++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/Makefile @@ -21,7 +21,6 @@ BINARY = adc_injec_timtrig_irq # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/Makefile b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/Makefile index a3cccec..712fdb6 100644 --- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/Makefile +++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/Makefile @@ -21,7 +21,6 @@ BINARY = adc_injec_timtrig_irq_4ch # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/adc_regular/Makefile b/examples/stm32/f1/lisa-m-2/adc_regular/Makefile index b61587f..ef98ed0 100644 --- a/examples/stm32/f1/lisa-m-2/adc_regular/Makefile +++ b/examples/stm32/f1/lisa-m-2/adc_regular/Makefile @@ -21,7 +21,6 @@ BINARY = adc # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/can/Makefile b/examples/stm32/f1/lisa-m-2/can/Makefile index 71a787a..6313301 100644 --- a/examples/stm32/f1/lisa-m-2/can/Makefile +++ b/examples/stm32/f1/lisa-m-2/can/Makefile @@ -21,7 +21,6 @@ BINARY = can # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/fancyblink/Makefile b/examples/stm32/f1/lisa-m-2/fancyblink/Makefile index 90ce834..1a07a94 100644 --- a/examples/stm32/f1/lisa-m-2/fancyblink/Makefile +++ b/examples/stm32/f1/lisa-m-2/fancyblink/Makefile @@ -21,7 +21,6 @@ BINARY = fancyblink # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/spi/Makefile b/examples/stm32/f1/lisa-m-2/spi/Makefile index 9d90a1c..2ac0620 100644 --- a/examples/stm32/f1/lisa-m-2/spi/Makefile +++ b/examples/stm32/f1/lisa-m-2/spi/Makefile @@ -21,7 +21,6 @@ BINARY = spi # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/spi_dma/Makefile b/examples/stm32/f1/lisa-m-2/spi_dma/Makefile index 9aff3f1..05eb371 100644 --- a/examples/stm32/f1/lisa-m-2/spi_dma/Makefile +++ b/examples/stm32/f1/lisa-m-2/spi_dma/Makefile @@ -21,7 +21,6 @@ BINARY = spi_dma # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/spi_dma_adv/Makefile b/examples/stm32/f1/lisa-m-2/spi_dma_adv/Makefile index 4e524ad..8fe020d 100644 --- a/examples/stm32/f1/lisa-m-2/spi_dma_adv/Makefile +++ b/examples/stm32/f1/lisa-m-2/spi_dma_adv/Makefile @@ -21,7 +21,6 @@ BINARY = spi_dma_adv # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/usart/Makefile b/examples/stm32/f1/lisa-m-2/usart/Makefile index 498cd83..6ab92e3 100644 --- a/examples/stm32/f1/lisa-m-2/usart/Makefile +++ b/examples/stm32/f1/lisa-m-2/usart/Makefile @@ -21,7 +21,6 @@ BINARY = usart # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/usart_dma/Makefile b/examples/stm32/f1/lisa-m-2/usart_dma/Makefile index 5fa5c51..a55f194 100644 --- a/examples/stm32/f1/lisa-m-2/usart_dma/Makefile +++ b/examples/stm32/f1/lisa-m-2/usart_dma/Makefile @@ -21,7 +21,6 @@ BINARY = usart_dma # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/usart_irq/Makefile b/examples/stm32/f1/lisa-m-2/usart_irq/Makefile index dbab248..9b36d42 100644 --- a/examples/stm32/f1/lisa-m-2/usart_irq/Makefile +++ b/examples/stm32/f1/lisa-m-2/usart_irq/Makefile @@ -21,7 +21,6 @@ BINARY = usart_irq # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/usart_irq_printf/Makefile b/examples/stm32/f1/lisa-m-2/usart_irq_printf/Makefile index 1cc2ed1..843b185 100644 --- a/examples/stm32/f1/lisa-m-2/usart_irq_printf/Makefile +++ b/examples/stm32/f1/lisa-m-2/usart_irq_printf/Makefile @@ -21,7 +21,6 @@ BINARY = usart_irq_printf # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/lisa-m-2/usart_printf/Makefile b/examples/stm32/f1/lisa-m-2/usart_printf/Makefile index 6eaf005..6eeac17 100644 --- a/examples/stm32/f1/lisa-m-2/usart_printf/Makefile +++ b/examples/stm32/f1/lisa-m-2/usart_printf/Makefile @@ -21,7 +21,6 @@ BINARY = usart_printf # Comment the following line if you _don't_ have luftboot flashed! LDFLAGS += -Wl,-Ttext=0x8002000 -CFLAGS += -std=c99 LDSCRIPT = ../lisa-m.ld include ../../Makefile.include diff --git a/examples/stm32/f1/other/usb_dfu/Makefile b/examples/stm32/f1/other/usb_dfu/Makefile index c1e30dc..cbbcffa 100644 --- a/examples/stm32/f1/other/usb_dfu/Makefile +++ b/examples/stm32/f1/other/usb_dfu/Makefile @@ -18,6 +18,7 @@ ## BINARY = usbdfu +CSTD = -std=gnu99 include ../../Makefile.include diff --git a/examples/stm32/f1/stm32-h103/usb_dfu/Makefile b/examples/stm32/f1/stm32-h103/usb_dfu/Makefile index cc690fe..6ff7ce1 100644 --- a/examples/stm32/f1/stm32-h103/usb_dfu/Makefile +++ b/examples/stm32/f1/stm32-h103/usb_dfu/Makefile @@ -18,6 +18,7 @@ ## BINARY = usbdfu +CSTD = -std=gnu99 LDSCRIPT = ../stm32-h103.ld diff --git a/examples/stm32/f1/stm32-h103/usb_iap/Makefile b/examples/stm32/f1/stm32-h103/usb_iap/Makefile index eacc672..f81a18b 100644 --- a/examples/stm32/f1/stm32-h103/usb_iap/Makefile +++ b/examples/stm32/f1/stm32-h103/usb_iap/Makefile @@ -18,6 +18,7 @@ ## BINARY = usbiap +CSTD = -std=gnu99 LDSCRIPT = ../stm32-h103.ld diff --git a/examples/stm32/f4/stm32f429i-discovery/lcd-dma/Makefile b/examples/stm32/f4/stm32f429i-discovery/lcd-dma/Makefile index 4f84e13..a782d79 100644 --- a/examples/stm32/f4/stm32f429i-discovery/lcd-dma/Makefile +++ b/examples/stm32/f4/stm32f429i-discovery/lcd-dma/Makefile @@ -1,6 +1,7 @@ OBJS = sdram.o clock.o console.o lcd-spi.o BINARY = lcd-dma +CSTD = -std=gnu99 # we use sin/cos from the library LDLIBS += -lm