# HG changeset patch
# User sergeig
# Date 1293976129 0
# Node ID f1c9d35ca75acfc47b0a36ac9802c13c50e8084c
# Parent  839b599cc2165d9711e879bb5205fa69c6242f8b
* cdl/hal_sh.cdl: Eliminate some warnings. [ Bugzilla 1001083 ]
* cdl/hal_sh_sh2.cdl: Ditto.
* cdl/hal_sh_sh3.cdl: Ditto.
* cdl/hal_sh_sh4.cdl: Ditto.

diff --git a/packages/hal/sh/arch/current/ChangeLog b/packages/hal/sh/arch/current/ChangeLog
--- a/packages/hal/sh/arch/current/ChangeLog
+++ b/packages/hal/sh/arch/current/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-02  Sergei Gavrikov  <sergei.gavrikov@gmail.com>
+
+	* cdl/hal_sh.cdl: Eliminate some warnings. [ Bugzilla 1001083 ]
+
 2009-02-04  John Dallaway  <john@dallaway.org.uk>
 
 	* src/sh.ld: Process *(.gcc_except_table.*) as for i386
diff --git a/packages/hal/sh/arch/current/cdl/hal_sh.cdl b/packages/hal/sh/arch/current/cdl/hal_sh.cdl
--- a/packages/hal/sh/arch/current/cdl/hal_sh.cdl
+++ b/packages/hal/sh/arch/current/cdl/hal_sh.cdl
@@ -67,7 +67,7 @@ cdl_package CYGPKG_HAL_SH {
     # n.b. grep does not behave itself under win32
     make -priority 1 {
         <PREFIX>/include/cyg/hal/sh_offsets.inc : <PACKAGE>/src/hal_mk_defs.c
-        $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,sh_offsets.tmp -o hal_mk_defs.tmp -S $<
+        $(CC) $(ACTUAL_CFLAGS) $(INCLUDE_PATH) -Wp,-MD,sh_offsets.tmp -o hal_mk_defs.tmp -S $<
         fgrep .equ hal_mk_defs.tmp | sed s/#// > $@
         @echo $@ ": \\" > $(notdir $@).deps
         @tail -n +2 sh_offsets.tmp >> $(notdir $@).deps
@@ -86,7 +86,7 @@ cdl_package CYGPKG_HAL_SH {
 
     make {
         <PREFIX>/lib/target.ld: <PACKAGE>/src/sh.ld
-        $(CC) -E -P -Wp,-MD,target.tmp -xc $(INCLUDE_PATH) $(CFLAGS) -o $@ $<
+        $(CC) -E -P -Wp,-MD,target.tmp -xc $(INCLUDE_PATH) $(ACTUAL_CFLAGS) -o $@ $<
         @echo $@ ": \\" > $(notdir $@).deps
         @tail -n +2 target.tmp >> $(notdir $@).deps
         @echo >> $(notdir $@).deps
diff --git a/packages/hal/sh/sh2/current/ChangeLog b/packages/hal/sh/sh2/current/ChangeLog
--- a/packages/hal/sh/sh2/current/ChangeLog
+++ b/packages/hal/sh/sh2/current/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-02  Sergei Gavrikov  <sergei.gavrikov@gmail.com>
+
+	* cdl/hal_sh_sh2.cdl: Eliminate some warnings. [ Bugzilla
+	1001083 ]
+
 2004-04-22  Jani Monoses <jani@iv.ro>
 
 	 * cdl/hal_sh_sh2.cdl :
diff --git a/packages/hal/sh/sh2/current/cdl/hal_sh_sh2.cdl b/packages/hal/sh/sh2/current/cdl/hal_sh_sh2.cdl
--- a/packages/hal/sh/sh2/current/cdl/hal_sh_sh2.cdl
+++ b/packages/hal/sh/sh2/current/cdl/hal_sh_sh2.cdl
@@ -74,7 +74,7 @@ cdl_package CYGPKG_HAL_SH_SH2 {
     # n.b. grep does not behave itself under win32
     make -priority 1 {
         <PREFIX>/include/cyg/hal/sh2_offsets.inc : <PACKAGE>/src/var_mk_defs.c
-        $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,sh2_offsets.tmp -o var_mk_defs.tmp -S $<
+        $(CC) $(ACTUAL_CFLAGS) $(INCLUDE_PATH) -Wp,-MD,sh2_offsets.tmp -o var_mk_defs.tmp -S $<
         fgrep .equ var_mk_defs.tmp | sed s/#// > $@
         @echo $@ ": \\" > $(notdir $@).deps
         @tail -n +2 sh2_offsets.tmp >> $(notdir $@).deps
diff --git a/packages/hal/sh/sh3/current/ChangeLog b/packages/hal/sh/sh3/current/ChangeLog
--- a/packages/hal/sh/sh3/current/ChangeLog
+++ b/packages/hal/sh/sh3/current/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-02  Sergei Gavrikov  <sergei.gavrikov@gmail.com>
+
+	* cdl/hal_sh_sh3.cdl: Eliminate some warnings. [ Bugzilla
+	1001083 ]
+
 2004-04-22  Jani Monoses <jani@iv.ro>
 
 	 * cdl/hal_sh_sh3.cdl :
diff --git a/packages/hal/sh/sh3/current/cdl/hal_sh_sh3.cdl b/packages/hal/sh/sh3/current/cdl/hal_sh_sh3.cdl
--- a/packages/hal/sh/sh3/current/cdl/hal_sh_sh3.cdl
+++ b/packages/hal/sh/sh3/current/cdl/hal_sh_sh3.cdl
@@ -72,7 +72,7 @@ cdl_package CYGPKG_HAL_SH_SH3 {
     # n.b. grep does not behave itself under win32
     make -priority 1 {
         <PREFIX>/include/cyg/hal/sh3_offsets.inc : <PACKAGE>/src/var_mk_defs.c
-        $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,sh3_offsets.tmp -o var_mk_defs.tmp -S $<
+        $(CC) $(ACTUAL_CFLAGS) $(INCLUDE_PATH) -Wp,-MD,sh3_offsets.tmp -o var_mk_defs.tmp -S $<
         fgrep .equ var_mk_defs.tmp | sed s/#// > $@
         @echo $@ ": \\" > $(notdir $@).deps
         @tail -n +2 sh3_offsets.tmp >> $(notdir $@).deps
diff --git a/packages/hal/sh/sh4/current/ChangeLog b/packages/hal/sh/sh4/current/ChangeLog
--- a/packages/hal/sh/sh4/current/ChangeLog
+++ b/packages/hal/sh/sh4/current/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-02  Sergei Gavrikov  <sergei.gavrikov@gmail.com>
+
+	* cdl/hal_sh_sh4.cdl: Eliminate some warnings. [ Bugzilla
+	1001083 ]
+
 2005-05-13  Hajime Ishitani <pigmon@mail.snd.co.jp>
 
 	* include/mod_regs_cpg.h :
diff --git a/packages/hal/sh/sh4/current/cdl/hal_sh_sh4.cdl b/packages/hal/sh/sh4/current/cdl/hal_sh_sh4.cdl
--- a/packages/hal/sh/sh4/current/cdl/hal_sh_sh4.cdl
+++ b/packages/hal/sh/sh4/current/cdl/hal_sh_sh4.cdl
@@ -75,7 +75,7 @@ cdl_package CYGPKG_HAL_SH_SH4 {
     # n.b. grep does not behave itself under win32
     make -priority 1 {
         <PREFIX>/include/cyg/hal/sh4_offsets.inc : <PACKAGE>/src/var_mk_defs.c
-        $(CC) $(CFLAGS) $(INCLUDE_PATH) -Wp,-MD,sh4_offsets.tmp -o var_mk_defs.tmp -S $<
+        $(CC) $(ACTUAL_CFLAGS) $(INCLUDE_PATH) -Wp,-MD,sh4_offsets.tmp -o var_mk_defs.tmp -S $<
         fgrep .equ var_mk_defs.tmp | sed s/#// > $@
         @echo $@ ": \\" > $(notdir $@).deps
         @tail -n +2 sh4_offsets.tmp >> $(notdir $@).deps