diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0f40482673..985cab82d4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2008-03-04  Joel Brobecker  <brobecker@adacore.com>
+
+	* features/rs6000/power-core.xml, features/rs6000/power64-core.xml,
+	features/rs6000/powerpc-601.xml, features/rs6000/rs6000.xml:
+	Change the type of the lr register to code_ptr.
+	* features/rs6000/powerpc-32.c, features/rs6000/powerpc-403.c,
+	features/rs6000/powerpc-403gc.c, features/rs6000/powerpc-505.c,
+	features/rs6000/powerpc-601.c, features/rs6000/powerpc-602.c,
+	features/rs6000/powerpc-603.c, features/rs6000/powerpc-604.c,
+	features/rs6000/powerpc-64.c, features/rs6000/powerpc-7400.c,
+	features/rs6000/powerpc-750.c, features/rs6000/powerpc-860.c,
+	features/rs6000/powerpc-e500.c, features/rs6000/rs6000.c: Regenerate.
+
 2008-03-03  James E. Wilson  <wilson@tuliptree.org>
 
 	* MAINTAINERS: Update my email address.
diff --git a/gdb/features/rs6000/power-core.xml b/gdb/features/rs6000/power-core.xml
index 05b89f64cd..0c69e8c8a7 100644
--- a/gdb/features/rs6000/power-core.xml
+++ b/gdb/features/rs6000/power-core.xml
@@ -43,7 +43,7 @@
   <reg name="pc" bitsize="32" type="code_ptr" regnum="64"/>
   <reg name="msr" bitsize="32" type="uint32"/>
   <reg name="cr" bitsize="32" type="uint32"/>
-  <reg name="lr" bitsize="32" type="uint32"/>
+  <reg name="lr" bitsize="32" type="code_ptr"/>
   <reg name="ctr" bitsize="32" type="uint32"/>
   <reg name="xer" bitsize="32" type="uint32"/>
 </feature>
diff --git a/gdb/features/rs6000/power64-core.xml b/gdb/features/rs6000/power64-core.xml
index 400006cc7f..6cc1531201 100644
--- a/gdb/features/rs6000/power64-core.xml
+++ b/gdb/features/rs6000/power64-core.xml
@@ -43,7 +43,7 @@
   <reg name="pc" bitsize="64" type="code_ptr" regnum="64"/>
   <reg name="msr" bitsize="64" type="uint64"/>
   <reg name="cr" bitsize="32" type="uint32"/>
-  <reg name="lr" bitsize="64" type="uint64"/>
+  <reg name="lr" bitsize="64" type="code_ptr"/>
   <reg name="ctr" bitsize="64" type="uint64"/>
   <reg name="xer" bitsize="32" type="uint32"/>
 </feature>
diff --git a/gdb/features/rs6000/powerpc-32.c b/gdb/features/rs6000/powerpc-32.c
index a657803cee..4c0ffbb37d 100644
--- a/gdb/features/rs6000/powerpc-32.c
+++ b/gdb/features/rs6000/powerpc-32.c
@@ -50,7 +50,7 @@ initialize_tdesc_powerpc_32 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-403.c b/gdb/features/rs6000/powerpc-403.c
index 69c33404fd..6040e6f32f 100644
--- a/gdb/features/rs6000/powerpc-403.c
+++ b/gdb/features/rs6000/powerpc-403.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_403 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-403gc.c b/gdb/features/rs6000/powerpc-403gc.c
index b88098b898..4a1e6608e5 100644
--- a/gdb/features/rs6000/powerpc-403gc.c
+++ b/gdb/features/rs6000/powerpc-403gc.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_403gc (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-505.c b/gdb/features/rs6000/powerpc-505.c
index f0fe907fee..8946bfd8bb 100644
--- a/gdb/features/rs6000/powerpc-505.c
+++ b/gdb/features/rs6000/powerpc-505.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_505 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-601.c b/gdb/features/rs6000/powerpc-601.c
index 84a42863e7..0eb12c85c7 100644
--- a/gdb/features/rs6000/powerpc-601.c
+++ b/gdb/features/rs6000/powerpc-601.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_601 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "int");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "int");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "int");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "int");
   tdesc_create_reg (feature, "mq", 124, 1, NULL, 32, "int");
diff --git a/gdb/features/rs6000/powerpc-601.xml b/gdb/features/rs6000/powerpc-601.xml
index 3801621378..cafb4c2af8 100644
--- a/gdb/features/rs6000/powerpc-601.xml
+++ b/gdb/features/rs6000/powerpc-601.xml
@@ -49,7 +49,7 @@
     <reg name="pc" bitsize="32" type="code_ptr" regnum="64"/>
     <reg name="msr" bitsize="32"/>
     <reg name="cr" bitsize="32"/>
-    <reg name="lr" bitsize="32"/>
+    <reg name="lr" bitsize="32" type="code_ptr"/>
     <reg name="ctr" bitsize="32"/>
     <reg name="xer" bitsize="32"/>
     <reg name="mq" bitsize="32" regnum="124"/>
diff --git a/gdb/features/rs6000/powerpc-602.c b/gdb/features/rs6000/powerpc-602.c
index 9f6182f4c6..2c73b3a03f 100644
--- a/gdb/features/rs6000/powerpc-602.c
+++ b/gdb/features/rs6000/powerpc-602.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_602 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-603.c b/gdb/features/rs6000/powerpc-603.c
index 1bf1bcdfd7..f0d65aeadb 100644
--- a/gdb/features/rs6000/powerpc-603.c
+++ b/gdb/features/rs6000/powerpc-603.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_603 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-604.c b/gdb/features/rs6000/powerpc-604.c
index 15668a571e..5d8bf3d7de 100644
--- a/gdb/features/rs6000/powerpc-604.c
+++ b/gdb/features/rs6000/powerpc-604.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_604 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-64.c b/gdb/features/rs6000/powerpc-64.c
index 99b088b2cf..1a4567253c 100644
--- a/gdb/features/rs6000/powerpc-64.c
+++ b/gdb/features/rs6000/powerpc-64.c
@@ -50,7 +50,7 @@ initialize_tdesc_powerpc_64 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 64, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 64, "uint64");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 64, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 64, "uint64");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-7400.c b/gdb/features/rs6000/powerpc-7400.c
index decf7249d9..af0797e291 100644
--- a/gdb/features/rs6000/powerpc-7400.c
+++ b/gdb/features/rs6000/powerpc-7400.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_7400 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-750.c b/gdb/features/rs6000/powerpc-750.c
index 25717bf1bd..83eb862149 100644
--- a/gdb/features/rs6000/powerpc-750.c
+++ b/gdb/features/rs6000/powerpc-750.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_750 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-860.c b/gdb/features/rs6000/powerpc-860.c
index fc33b8a904..fb3b72d991 100644
--- a/gdb/features/rs6000/powerpc-860.c
+++ b/gdb/features/rs6000/powerpc-860.c
@@ -48,7 +48,7 @@ initialize_tdesc_powerpc_860 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/powerpc-e500.c b/gdb/features/rs6000/powerpc-e500.c
index 305b24a6ed..df409bb878 100644
--- a/gdb/features/rs6000/powerpc-e500.c
+++ b/gdb/features/rs6000/powerpc-e500.c
@@ -50,7 +50,7 @@ initialize_tdesc_powerpc_e500 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
 
diff --git a/gdb/features/rs6000/rs6000.c b/gdb/features/rs6000/rs6000.c
index e7eb5fa67c..7c3d4c5e7f 100644
--- a/gdb/features/rs6000/rs6000.c
+++ b/gdb/features/rs6000/rs6000.c
@@ -50,7 +50,7 @@ initialize_tdesc_rs6000 (void)
   tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "int");
   tdesc_create_reg (feature, "cnd", 66, 1, NULL, 32, "int");
-  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "cnt", 68, 1, NULL, 32, "int");
   tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "int");
   tdesc_create_reg (feature, "mq", 70, 1, NULL, 32, "int");
diff --git a/gdb/features/rs6000/rs6000.xml b/gdb/features/rs6000/rs6000.xml
index cbc94f0c55..55d2a60068 100644
--- a/gdb/features/rs6000/rs6000.xml
+++ b/gdb/features/rs6000/rs6000.xml
@@ -51,7 +51,7 @@
     <reg name="pc" bitsize="32" type="code_ptr" regnum="64"/>
     <reg name="msr" bitsize="32"/>
     <reg name="cnd" bitsize="32"/>
-    <reg name="lr" bitsize="32"/>
+    <reg name="lr" bitsize="32" type="code_ptr"/>
     <reg name="cnt" bitsize="32"/>
     <reg name="xer" bitsize="32"/>
     <reg name="mq" bitsize="32"/>