Fix for GENERIC defined for all release builds

diff --git a/makerules/rules_64p.mk b/makerules/rules_64p.mk
index f55889c0a6ba855e41cfa8e48f579ff009c9251d..4a179797a8a7608f5c3ffe2d2004b28c7bae75e3 100755 (executable)
--- a/makerules/rules_64p.mk
+++ b/makerules/rules_64p.mk
@@ -88,13 +88,18 @@ ifeq ($(PROFILE_$(CORE)), debug)
 endif\r
 ifeq ($(PROFILE_$(CORE)), release)\r
  CFLAGS_INTERNAL += -O2\r
- CFLAGS_XDCINTERNAL = -Dxdc_bld__profile_release -DGENERIC\r
+ CFLAGS_XDCINTERNAL = -Dxdc_bld__profile_release\r
  ifndef MODULE_NAME\r
   CFLAGS_XDCINTERNAL += -Dxdc_cfg__header__='$(CONFIGURO_DIR)/package/cfg/$(XDC_CFG_BASE_FILE_NAME)_pem3.h' \r
  endif\r
  LNKFLAGS_INTERNAL_PROFILE = -o2\r
 # LNKFLAGS_INTERNAL_PROFILE = \r
 endif\r
+\r
+# For generic platform define GENERIC in CFLAGS\r
+ifeq ($(PLATFORM),generic)\r
+ CFLAGS_XDCINTERNAL += -DGENERIC\r
+endif\r
 CFLAGS_XDCINTERNAL += $(XDCINTERNAL_DEFINES)\r
 \r
 # Following 'if...' block is for an application; to add a #define for each\r
@@ -195,7 +200,11 @@ xdc_configuro : $(XDC_CFG_FILE)
        $(ECHO) \# Invoking configuro...\r
        $(ECHO) -e $(CONFIGURO_CMD) > $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
        $(CHMOD) a+x $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+ifeq ($(OS),Windows_NT)\r
        $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+else\r
+       ./$(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+endif\r
        $(CP) $(XDCLNKCMD_FILE) $(LNKCMD_FILE)\r
 #      $(ECHO) @ $(EGREP_CMD) > maketemp_egrep_cmd.bat\r
 #      ./maketemp_egrep_cmd.bat | $(CYGWINPATH)/bin/tail -n+3 > $(LNKCMD_FILE)\r

diff --git a/makerules/rules_64t.mk b/makerules/rules_64t.mk
index 54df424725cd19e8d81097621604af5224e0e906..6544ada7cc11b6b748fcdcde08fb6a846ceab3f3 100644 (file)
--- a/makerules/rules_64t.mk
+++ b/makerules/rules_64t.mk
@@ -88,13 +88,18 @@ ifeq ($(PROFILE_$(CORE)), debug)
 endif
 ifeq ($(PROFILE_$(CORE)), release)
  CFLAGS_INTERNAL += -O2
- CFLAGS_XDCINTERNAL = -Dxdc_bld__profile_release -DGENERIC
+ CFLAGS_XDCINTERNAL = -Dxdc_bld__profile_release
  ifndef MODULE_NAME
   CFLAGS_XDCINTERNAL += -Dxdc_cfg__header__='$(CONFIGURO_DIR)/package/cfg/$(XDC_CFG_BASE_FILE_NAME)_pem3.h' 
  endif
  LNKFLAGS_INTERNAL_PROFILE = -o2
 # LNKFLAGS_INTERNAL_PROFILE = 
 endif
+
+# For generic platform define GENERIC in CFLAGS
+ifeq ($(PLATFORM),generic)
+ CFLAGS_XDCINTERNAL += -DGENERIC
+endif
 CFLAGS_XDCINTERNAL += $(XDCINTERNAL_DEFINES)
 
 # Following 'if...' block is for an application; to add a #define for each
@@ -195,7 +200,11 @@ xdc_configuro : $(XDC_CFG_FILE)
        $(ECHO) \# Invoking configuro...
        $(ECHO) -e $(CONFIGURO_CMD) > $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
        $(CHMOD) a+x $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
+ifeq ($(OS),Windows_NT)
        $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
+else
+       ./$(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
+endif
        $(CP) $(XDCLNKCMD_FILE) $(LNKCMD_FILE)
 #      $(ECHO) @ $(EGREP_CMD) > maketemp_egrep_cmd.bat
 #      ./maketemp_egrep_cmd.bat | $(CYGWINPATH)/bin/tail -n+3 > $(LNKCMD_FILE)

diff --git a/makerules/rules_66.mk b/makerules/rules_66.mk
index fc6928ff7182e65c4ca08b99b86d23f289e8d9f6..68554a3ed1370a3e8787e27d2229b328c89ebb9a 100644 (file)
--- a/makerules/rules_66.mk
+++ b/makerules/rules_66.mk
@@ -88,13 +88,18 @@ ifeq ($(PROFILE_$(CORE)), debug)
 endif
 ifeq ($(PROFILE_$(CORE)), release)
  CFLAGS_INTERNAL += -O2
- CFLAGS_XDCINTERNAL = -Dxdc_bld__profile_release -DGENERIC
+ CFLAGS_XDCINTERNAL = -Dxdc_bld__profile_release
  ifndef MODULE_NAME
   CFLAGS_XDCINTERNAL += -Dxdc_cfg__header__='$(CONFIGURO_DIR)/package/cfg/$(XDC_CFG_BASE_FILE_NAME)_pem3.h' 
  endif
  LNKFLAGS_INTERNAL_PROFILE = -o2
 # LNKFLAGS_INTERNAL_PROFILE = 
 endif
+
+# For generic platform define GENERIC in CFLAGS
+ifeq ($(PLATFORM),generic)
+ CFLAGS_XDCINTERNAL += -DGENERIC
+endif
 CFLAGS_XDCINTERNAL += $(XDCINTERNAL_DEFINES)
 
 # Following 'if...' block is for an application; to add a #define for each
@@ -195,7 +200,11 @@ xdc_configuro : $(XDC_CFG_FILE)
        $(ECHO) \# Invoking configuro...
        $(ECHO) -e $(CONFIGURO_CMD) > $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
        $(CHMOD) a+x $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
+ifeq ($(OS),Windows_NT)
        $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
+else
+       ./$(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
+endif
        $(CP) $(XDCLNKCMD_FILE) $(LNKCMD_FILE)
 #      $(ECHO) @ $(EGREP_CMD) > maketemp_egrep_cmd.bat
 #      ./maketemp_egrep_cmd.bat | $(CYGWINPATH)/bin/tail -n+3 > $(LNKCMD_FILE)

diff --git a/makerules/rules_674.mk b/makerules/rules_674.mk
index aafddab49659db7f063f756e3e655c0f5b21554e..849ff988094c979444ce4581edd7d3fbf85909ff 100755 (executable)
--- a/makerules/rules_674.mk
+++ b/makerules/rules_674.mk
@@ -86,13 +86,18 @@ ifeq ($(PROFILE_$(CORE)), debug)
 endif\r
 ifeq ($(PROFILE_$(CORE)), release)\r
  CFLAGS_INTERNAL += -O2\r
- CFLAGS_XDCINTERNAL = -Dxdc_target_name__=C674 -Dxdc_bld__profile_release -DGENERIC\r
+ CFLAGS_XDCINTERNAL = -Dxdc_target_name__=C674 -Dxdc_bld__profile_release\r
  ifndef MODULE_NAME\r
   CFLAGS_XDCINTERNAL += -Dxdc_cfg__header__='$(CONFIGURO_DIR)/package/cfg/$(XDC_CFG_BASE_FILE_NAME)_pem3.h' \r
  endif\r
  LNKFLAGS_INTERNAL_PROFILE = -o2\r
 # LNKFLAGS_INTERNAL_PROFILE = \r
 endif\r
+\r
+# For generic platform define GENERIC in CFLAGS\r
+ifeq ($(PLATFORM),generic)\r
+ CFLAGS_XDCINTERNAL += -DGENERIC\r
+endif\r
 CFLAGS_XDCINTERNAL += $(XDCINTERNAL_DEFINES)\r
 \r
 # Following 'if...' block is for an application; to add a #define for each\r
@@ -195,7 +200,11 @@ xdc_configuro : $(XDC_CFG_FILE)
        $(ECHO) \# Invoking configuro...\r
        $(ECHO) -e $(CONFIGURO_CMD) > $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
        $(CHMOD) a+x $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+ifeq ($(OS),Windows_NT)\r
        $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+else\r
+       ./$(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+endif\r
        $(CP) $(XDCLNKCMD_FILE) $(LNKCMD_FILE)\r
 #      $(ECHO) @ $(EGREP_CMD) > maketemp_egrep_cmd.bat\r
 #      ./maketemp_egrep_cmd.bat | $(CYGWINPATH)/bin/tail -n+3 > $(LNKCMD_FILE)\r

diff --git a/makerules/rules_TI_a8.mk b/makerules/rules_TI_a8.mk
index 8cc5ca0d48679963f7e7bec86795fc0f093d3152..50d7d3e87ca6f98471fe1bc01e22fb1eaebad9fd 100755 (executable)
--- a/makerules/rules_TI_a8.mk
+++ b/makerules/rules_TI_a8.mk
@@ -85,6 +85,11 @@ ifeq ($(PROFILE_$(CORE)), release)
  LNKFLAGS_INTERNAL_PROFILE = -o2\r
 endif\r
 \r
+# For generic platform define GENERIC in CFLAGS\r
+ifeq ($(PLATFORM),generic)\r
+ CFLAGS_XDCINTERNAL += -DGENERIC\r
+endif\r
+\r
 # Following 'if...' block is for an application; to add a #define for each\r
 #   component in the build. This is required to know - at compile time - which\r
 #   components are on which core.\r
@@ -183,7 +188,11 @@ xdc_configuro : $(XDC_CFG_FILE)
        $(ECHO) \# Invoking configuro...\r
        $(ECHO) -e $(CONFIGURO_CMD) > $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
        $(CHMOD) a+x $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+ifeq ($(OS),Windows_NT)\r
        $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+else\r
+       ./$(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+endif\r
        $(CP) $(XDCLNKCMD_FILE) $(LNKCMD_FILE)\r
 #      $(ECHO) @ $(EGREP_CMD) > maketemp_egrep_cmd.bat\r
 #      ./maketemp_egrep_cmd.bat | $(CYGWINPATH)/bin/tail -n+3 > $(LNKCMD_FILE)\r

diff --git a/makerules/rules_arm9.mk b/makerules/rules_arm9.mk
index db66a99cb284cef8636285c8d6e7faee97ad0b42..1ccb374d317dae9bfca6291e52207cb4644888e0 100755 (executable)
--- a/makerules/rules_arm9.mk
+++ b/makerules/rules_arm9.mk
@@ -85,6 +85,11 @@ ifeq ($(PROFILE_$(CORE)), release)
  LNKFLAGS_INTERNAL_PROFILE = -o2\r
 endif\r
 \r
+# For generic platform define GENERIC in CFLAGS\r
+ifeq ($(PLATFORM),generic)\r
+ CFLAGS_XDCINTERNAL += -DGENERIC\r
+endif\r
+\r
 # Following 'if...' block is for an application; to add a #define for each\r
 #   component in the build. This is required to know - at compile time - which\r
 #   components are on which core.\r
@@ -183,7 +188,11 @@ xdc_configuro : $(XDC_CFG_FILE)
        $(ECHO) \# Invoking configuro...\r
        $(ECHO) -e $(CONFIGURO_CMD) > $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
        $(CHMOD) a+x $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+ifeq ($(OS),Windows_NT)\r
        $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+else\r
+       ./$(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat\r
+endif\r
        $(CP) $(XDCLNKCMD_FILE) $(LNKCMD_FILE)\r
 #      $(ECHO) @ $(EGREP_CMD) > maketemp_egrep_cmd.bat\r
 #      ./maketemp_egrep_cmd.bat | $(CYGWINPATH)/bin/tail -n+3 > $(LNKCMD_FILE)\r

diff --git a/makerules/rules_m3.mk b/makerules/rules_m3.mk
index 0de67aa9e0b230ed1e77771d9ccd0239f10fd06f..14f1e7189ffe867afea07eee22c20bb88f1f4aec 100755 (executable)
--- a/makerules/rules_m3.mk
+++ b/makerules/rules_m3.mk
@@ -87,6 +87,11 @@ ifeq ($(PROFILE_$(CORE)), release)
  LNKFLAGS_INTERNAL_PROFILE = -o2
 endif
 
+# For generic platform define GENERIC in CFLAGS
+ifeq ($(PLATFORM),generic)
+ CFLAGS_XDCINTERNAL += -DGENERIC
+endif
+
 # Following 'if...' block is for an application; to add a #define for each
 #   component in the build. This is required to know - at compile time - which
 #   components are on which core.
@@ -187,7 +192,11 @@ xdc_configuro : $(XDC_CFG_FILE)
        $(ECHO) \# Invoking configuro...
        $(ECHO) -e $(CONFIGURO_CMD) > $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
        $(CHMOD) a+x $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
+ifeq ($(OS),Windows_NT)
        $(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
+else
+       ./$(DEST_ROOT)maketemp_configuro_cmd_$(CORE).bat
+endif
        $(CP) $(XDCLNKCMD_FILE) $(LNKCMD_FILE)
 #      $(ECHO) @ $(EGREP_CMD) > maketemp_egrep_cmd.bat
 #      ./maketemp_egrep_cmd.bat | $(CYGWINPATH)/bin/tail -n+3 > $(LNKCMD_FILE)