Should not compile simple, at least

diff --git a/scripts/cc_cw.mk b/scripts/cc_cw.mk
index 74f7b25d9e60839442f3e676d5135585cbd163e1..a74cc0de68f89776c59379aed79c2621c82875a6 100644 (file)
--- a/scripts/cc_cw.mk
+++ b/scripts/cc_cw.mk
@@ -27,30 +27,17 @@ CC  =       $(CW_BIN)/mwcceppc.exe
 #cflags-$(CFG_OPT_RELEASE) += -O3\r
 #cflags-$(CFG_OPT_DEBUG) += make  -O0\r
 \r
-# Remove sections if needed.. may be problems with other compilers here.\r
-#cflags-y += -ffunction-sections\r
-\r
-#ifneq ($(filter -O2 -O3 -O1,$(cflags-y)),) \r
-#      cflags-y += -fno-schedule-insns -fno-schedule-insns2\r
-#endif\r
-\r
 #cflags-y              += -c \r
-#cflags-y              += -fno-common\r
-#cflags-y              += -std=gnu99\r
 cflags-y               += -dialect=c99\r
 cflags-y               += -gccext=on\r
 cflags-y               += -gdwarf-2\r
 cflags-y               += -gccinc\r
 \r
 # Generate dependencies\r
-#cflags-y              += -MMD\r
 cflags-y               += -gccdepends -MMD\r
 \r
 # Warnings\r
 cflags-y          += -W=most\r
-#cflags-y          += -Wall\r
-#cflags-y          += -Winline # warn if inline failed\r
-#cflags-y          += -pedantic\r
 \r
 # Conformance\r
 cflags-y          += -abi=eabi\r
@@ -76,28 +63,13 @@ CCOUT               = -o $@
 \r
 CPP    =       $(CC) -E\r
 \r
-CPP_ASM_FLAGS += -ppopt noline\r
+CPP_ASM_FLAGS += -ppopt noline -dialect c\r
 \r
 comma = ,\r
 empty = \r
 space = $(empty) $(empty)\r
 \r
-# Note!\r
-# Libs related to GCC(libgcc.a, libgcov.a) is located under \r
-# lib/gcc/<machine>/<version>/<multilib>\r
-# Libs related to the library (libc.a,libm.a,etc) are under:\r
-# <machine>/lib/<multilib>\r
-\r
-# It seems some versions of make want "\=" and some "="\r
-# "=" - msys cpmake on windows 7 \r
-#gcc_lib_path := "$(subst /libgcc.a,,$(shell $(CC) $(CFLAGS) --print-libgcc-file-name))" \r
-#gcc_lib_path := $(subst \libgcc.a,,$(gcc_lib_path)) \r
-#lib_lib_path := "$(subst /libc.a,,$(shell $(CC) $(CFLAGS) --print-file-name=libc.a))"\r
-#lib_lib_path := $(subst \libc.a,,$(lib_lib_path))\r
-#text_chunk := $(subst \,/,$(shell touch i_m_here.c; $(CC) -v -c i_m_here.c &> i_m_here.txt;gawk -f $(TOPDIR)/scripts/gcc_getinclude.awk i_m_here.txt))\r
-#cc_inc_path := $(realpath $(text_chunk))\r
-#libpath-y += -L$(lib_lib_path)\r
-#libpath-y += -L$(gcc_lib_path)\r
+\r
 \r
 cw_lib_path += -L$(CW_COMPILE)/PowerPC_EABI_Support/Runtime/Lib\r
 cw_lib_path += -L$(CW_COMPILE)/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Lib\r
@@ -137,6 +109,7 @@ LD = $(CW_BIN)/mwldeppc.exe
 \r
 LDSCRIPT = -lcf\r
 \r
+# To make "rom" images (make LOAD() work)\r
 ldflags-y += -romaddr 0x0 \r
 ldflags-y += -rambuffer 0x0\r
 #ldflags-y += -nodefaults\r
@@ -148,13 +121,9 @@ ldflags-y += -map $(subst .$(TE),.map, $@)
 LDFLAGS += $(ldflags-y) \r
 LDOUT          = -o $@\r
 \r
-#LDMAPFILE = -M > $(subst .$(TE),.map, $@)\r
-\r
-\r
 LD_FILE = -lcf\r
 \r
 libitem-y += $(libitem-yy)\r
-#LDFLAGS += --gc-section\r
 \r
 # ---------------------------------------------------------------------------\r
 # Assembler\r
@@ -175,15 +144,15 @@ ASOUT = -o $@
 \r
 #DDUMP          = $(Q)$(COMPILER_ROOT)/$(cross_machine-y)-objcopy\r
 #DDUMP_FLAGS    = -O srec\r
-OBJCOPY                = $(CROSS_COMPILE)objcopy\r
+#OBJCOPY               = $(CROSS_COMPILE)objcopy\r
 \r
 # ---------------------------------------------------------------------------\r
 # Archiver\r
 #\r
 # AROUT                - archiver flags\r
 \r
-AR     =       $(CROSS_COMPILE)ar\r
-AROUT  = $@\r
+#AR    =       $(CROSS_COMPILE)ar\r
+#AROUT         = $@\r
 \r
 \r
 \r

diff --git a/scripts/cc_gcc.mk b/scripts/cc_gcc.mk
index b9a9d1af85910ff2455030000cb2fb45d6854c2b..07372a1ef0cd71cf69acb64f112715fc7eb2c449 100644 (file)
--- a/scripts/cc_gcc.mk
+++ b/scripts/cc_gcc.mk
@@ -91,11 +91,12 @@ libpath-y += -L$(gcc_lib_path)
 \r
 LD = $(CROSS_COMPILE)ld\r
 \r
+\r
 LD_FILE = -T\r
 \r
 LDOUT          = -o $@\r
 TE = elf\r
-LDMAPFILE = -M > $(subst .$(TE),.map, $@)\r
+LDFLAGS += -Map $(subst .$(TE),.map, $@)\r
 \r
 libitem-y += $(libitem-yy)\r
 \r

diff --git a/scripts/rules.mk b/scripts/rules.mk
index ad82bc36ddeb7763089cc6ae15581281773ea2bd..bd590e4eea5338af2755953efe8c81f85d04881c 100644 (file)
--- a/scripts/rules.mk
+++ b/scripts/rules.mk
@@ -226,9 +226,6 @@ $(build-exe-y): $(dep-y) $(obj-y) $(sim-y) $(libitem-y) $(ldcmdfile-y)
        @echo "  >> LD $@"\r
 ifeq ($(CROSS_COMPILE),)\r
        $(Q)$(CC) $(LDFLAGS) -o $@ $(libpath-y) $(obj-y) $(lib-y) $(libitem-y)  \r
-else\r
-ifeq ($(COMPILER),cw)  \r
-       $(Q)$(LD) $(LDFLAGS) $(LD_FILE) $(ldcmdfile-y) -o $@ $(libpath-y) $(LD_START_GRP) $(obj-y) $(lib-y) $(libitem-y) $(LD_END_GRP) \r
 else\r
        $(Q)$(LD) $(LDFLAGS) $(LD_FILE) $(ldcmdfile-y) -o $@ $(libpath-y) $(LD_START_GRP) $(obj-y) $(lib-y) $(libitem-y) $(LD_END_GRP) $(LDMAPFILE)\r
 endif\r
@@ -241,12 +238,11 @@ ifeq ($(COMPILER),gcc)
                                                                /^\.data/ { print "  data:"  $$3+0 " bytes"; rom+=$$3; ram+=$$3}; \\r
                                                                /^\.bss/ { print "  bss :"  $$3+0 " bytes"; ram+=$$3}; \\r
                                                                END { print "  ROM: ~" rom " bytes"; print "  RAM: ~" ram " bytes"}' $(subst .elf,.map,$@)\r
-endif                                                          \r
+endif # ($(COMPILER),gcc)                                                              \r
 ifeq ($(BUILD_LOAD_MODULE),y)\r
        @$(CROSS_COMPILE)objcopy -O srec $@ $@.raw.s19\r
        srec_cat $@.raw.s19 --crop 0x8008000 0x803fffc --fill 0x00 0x8008000 0x803fffc --l-e-crc32 0x803fffc -o $@.lm.s19\r
 endif\r
-endif\r
 endif\r
        @echo\r
        @echo "  >>>>>>>  DONE  <<<<<<<<<"\r