summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorGreg Menke <gregory.menke@gsfc.nasa.gov>2005-01-04 19:17:20 +0000
committerGreg Menke <gregory.menke@gsfc.nasa.gov>2005-01-04 19:17:20 +0000
commite1765dd4522017afca59608e16098cc1a23e1373 (patch)
treed434333520f43cbf78c7138ab3bed47165b229f2 /cpukit
parent2005-01-03 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-e1765dd4522017afca59608e16098cc1a23e1373.tar.bz2
PR 739
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/score/cpu/mips/ChangeLog7
-rw-r--r--cpukit/score/cpu/mips/iregdef.h2
-rw-r--r--cpukit/score/cpu/mips/rtems/mips/iregdef.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog
index c645e83917..3fb6333427 100644
--- a/cpukit/score/cpu/mips/ChangeLog
+++ b/cpukit/score/cpu/mips/ChangeLog
@@ -1,4 +1,11 @@
2005-01-03 Greg Menke <gregory.menke@gsfc.nasa.gov>
+ PR 739
+ * iregdef.h: Fixes gcc warning about redundant definition of R_SZ
+ when compiling cpu_asm.S. Problem was a #define sneaked in in
+ version 1.11, no ill effects would have only affected R4000
+ builds.
+
+2005-01-03 Greg Menke <gregory.menke@gsfc.nasa.gov>
PR 737
* cpu_asm.S: Fixes gcc warning about instructions in branch delay
slot when compiling cpu_asm.S
diff --git a/cpukit/score/cpu/mips/iregdef.h b/cpukit/score/cpu/mips/iregdef.h
index 6b6f2e82f8..bb7675e5a2 100644
--- a/cpukit/score/cpu/mips/iregdef.h
+++ b/cpukit/score/cpu/mips/iregdef.h
@@ -298,7 +298,7 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
#define R_SP R_R29
#define R_FP R_R30
#define R_RA R_R31
-#define R_SZ 4
+
/* disabled for RTEMS */
#if 0
/* Ketan added the following */
diff --git a/cpukit/score/cpu/mips/rtems/mips/iregdef.h b/cpukit/score/cpu/mips/rtems/mips/iregdef.h
index 6b6f2e82f8..bb7675e5a2 100644
--- a/cpukit/score/cpu/mips/rtems/mips/iregdef.h
+++ b/cpukit/score/cpu/mips/rtems/mips/iregdef.h
@@ -298,7 +298,7 @@ LICENSED MATERIAL - PROGRAM PROPERTY OF IDT
#define R_SP R_R29
#define R_FP R_R30
#define R_RA R_R31
-#define R_SZ 4
+
/* disabled for RTEMS */
#if 0
/* Ketan added the following */