]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Merged in from default
authoreija <devnull@localhost>
Mon, 13 Dec 2010 13:49:52 +0000 (14:49 +0100)
committereija <devnull@localhost>
Mon, 13 Dec 2010 13:49:52 +0000 (14:49 +0100)
12 files changed:
1  2 
arch/ppc/mpc55xx/kernel/irq_types.h
common/newlib_port.c
communication/PduR/PduR.c
include/Can.h
include/EcuM.h
include/PduR.h
include/Platform_Types.h
scripts/compile_examples.sh
scripts/rules.mk
system/kernel/include/internal.h
system/kernel/include/kernel.h
system/kernel/resource.c

Simple merge
Simple merge
Simple merge
diff --cc include/Can.h
Simple merge
diff --cc include/EcuM.h
Simple merge
diff --cc include/PduR.h
Simple merge
index dcfbab78a21077e02c808e69208d44fb47887c7b,718d98e14f0e3b82f7d1bd094d087600ef4076ca..7c3f018919dfe17e3266c48b44b5494772565689
@@@ -38,7 -39,7 +39,7 @@@ typedef unsigned char       uint8
  typedef signed short        sint16;       \r
  typedef unsigned short      uint16;       \r
  typedef signed long         sint32;       \r
- typedef unsigned long       uint32;    \r
 -typedef unsigned long      uint32;\r
++typedef unsigned long       uint32;\r
  typedef unsigned long long  uint64;\r
  typedef unsigned long       uint8_least;  \r
  typedef unsigned long       uint16_least; \r
index 21d2fae1d9f07d90d2db24a93f2640827bf7ed7d,0000000000000000000000000000000000000000..21d2fae1d9f07d90d2db24a93f2640827bf7ed7d
mode 100755,000000..100644
--- /dev/null
index 52c43cbdc036e6280cf08e9d28d28484aa2fcb03,5c111093a74ac11ef89282f2bab10ff9c312f7c5..e626bf5768d5a89018665b5f3c1709ccd621dfc8
@@@ -135,25 -127,23 +135,36 @@@ inc-y += ../includ
  # Some dependency for xxx_offset.c/h also\r
  -include $(subst .h,.d,$(dep-y))\r
  \r
 -inc-y += /C/lint/lnt #LINT: To run PC-lint\r
+ #LINT:\r
- $(Q)$(PCLINT) $(lint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<)\r
++LINT_EXCLUDE ?= arc-tests\r
++\r
 +ifneq ($(PCLINT),)\r
 +define run_pclint\r
++$(if \r
++$(findstring $(LINT_EXCLUDE),$(abspath $<)),\r
++$(info $(abspath $<):0:0: Info: Not running lint check on $(abspath $<)),\r
++$(Q)$(PCLINT) $(lint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<))\r
 +endef\r
 +endif\r
  \r
 -abs-inc-y = $(abspath $(inc-y))\r
 +ifneq ($(SPLINT),)\r
 +define run_splint\r
- $(Q)$(SPLINT) $(splint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<)\r
++$(if \r
++$(findstring $(LINT_EXCLUDE),$(abspath $<)),\r
++$(info $(abspath $<):0:0: Info: Not running lint check on $(abspath $<)),\r
++$(Q)$(SPLINT) $(splint_extra) $(addprefix $(lintinc_ext),$(inc-y)) $(addprefix $(lintdef_ext),$(def-y)) $(abspath $<))\r
 +endef\r
 +endif\r
  \r
 -#LINT:\r
 -lint_exclude_path := arc-tests\r
  \r
  # Compile\r
  %.o: %.c\r
        @echo "  >> CC $(notdir $<)"\r
 -# LINT: if path does not include "lint_exclude_path" then run PC-lint to check MISRA C standard\r
 -ifeq ($(ENABLE_PCLINT), y)\r
 -      $(if $(findstring $(lint_exclude_path),$(abspath $<)),$(info $(abspath $<):0:0: Info: Not running lint MISRA check on $(abspath $<)),/C/lint/Lint-nt +v $(addprefix -i,$(abs-inc-y)) /C/lint/std.lnt  $(abspath $<))\r
 -endif\r
+ # compile\r
        $(Q)$(CC) -c $(CFLAGS) -o $(goal) $(addprefix -I ,$(inc-y)) $(addprefix -D,$(def-y)) $(abspath $<)\r
++# run lint if enabled\r
 +      $(run_pclint)\r
 +      $(run_splint)\r
  \r
  # Assembler\r
  \r
Simple merge
Simple merge
Simple merge