From c15ce7f3c73690499e836a71d0795fd96419bd33 Mon Sep 17 00:00:00 2001 From: Prasad Konnur Date: Tue, 7 Jun 2011 11:27:47 +0530 Subject: [PATCH] Fix for GENERIC defined for all release builds --- makerules/rules_64p.mk | 11 ++++++++++- makerules/rules_64t.mk | 11 ++++++++++- makerules/rules_66.mk | 11 ++++++++++- makerules/rules_674.mk | 11 ++++++++++- makerules/rules_TI_a8.mk | 9 +++++++++ makerules/rules_arm9.mk | 9 +++++++++ makerules/rules_m3.mk | 9 +++++++++ 7 files changed, 67 insertions(+), 4 deletions(-) diff --git a/makerules/rules_64p.mk b/makerules/rules_64p.mk index f55889c..4a17979 100755 --- a/makerules/rules_64p.mk +++ b/makerules/rules_64p.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_64t.mk b/makerules/rules_64t.mk index 54df424..6544ada 100644 --- 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 fc6928f..68554a3 100644 --- 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 aafddab..849ff98 100755 --- a/makerules/rules_674.mk +++ b/makerules/rules_674.mk @@ -86,13 +86,18 @@ ifeq ($(PROFILE_$(CORE)), debug) endif ifeq ($(PROFILE_$(CORE)), release) CFLAGS_INTERNAL += -O2 - CFLAGS_XDCINTERNAL = -Dxdc_target_name__=C674 -Dxdc_bld__profile_release -DGENERIC + CFLAGS_XDCINTERNAL = -Dxdc_target_name__=C674 -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_TI_a8.mk b/makerules/rules_TI_a8.mk index 8cc5ca0..50d7d3e 100755 --- a/makerules/rules_TI_a8.mk +++ b/makerules/rules_TI_a8.mk @@ -85,6 +85,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. @@ -183,7 +188,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_arm9.mk b/makerules/rules_arm9.mk index db66a99..1ccb374 100755 --- a/makerules/rules_arm9.mk +++ b/makerules/rules_arm9.mk @@ -85,6 +85,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. @@ -183,7 +188,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_m3.mk b/makerules/rules_m3.mk index 0de67aa..14f1e71 100755 --- 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) -- 2.39.2