(ld-script-builtins): Add more words: "DATA_SEGMENT_ALIGN",

"DATA_SEGMENT_END",  "DATA_SEGMENT_RELRO_END", "LENGTH", "ORIGIN",
and "SEGMENT_START".
(auto-mode-alist): Accept .ld, .lds, ld.in and .lds.in.

2 files changed, 15 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f7dbefe4b0..338c577cf07 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-02  Masatake YAMATO  <jet@gyve.org>
+
+        * progmodes/ld-script.el (ld-script-builtins): Add
+        more words: "DATA_SEGMENT_ALIGN", "DATA_SEGMENT_END", 
+        "DATA_SEGMENT_RELRO_END", "LENGTH", "ORIGIN", and
+        "SEGMENT_START".
+        (auto-mode-alist): Accept .ld, .lds, ld.in and .lds.in.
+
 2005-11-01  Romain Francoise  <romain@orebokech.com>
 
         * vc-sccs.el: Update copyright year.
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index a2449b6817e..b2e6d2638fa 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -97,11 +97,17 @@
     "ADDR"
     "ALIGN"
     "BLOCK"
+    "DATA_SEGMENT_ALIGN"
+    "DATA_SEGMENT_END"
+    "DATA_SEGMENT_RELRO_END"
     "DEFINED"
+    "LENGTH"
     "LOADADDR"
     "MAX"
     "MIN"
     "NEXT"
+    "ORIGIN"
+    "SEGMENT_START"
     "SIZEOF"
     "SIZEOF_HEADERS"
     "sizeof_headers")
@@ -119,7 +125,7 @@
   "Default font-lock-keywords for `ld-script-mode'.")
 
 ;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.lds" . ld-script-mode))
+(add-to-list 'auto-mode-alist '("\\.ld[s]?\\(\\.in\\)?$" . ld-script-mode))
 
 ;;;###autoload
 (define-derived-mode ld-script-mode nil "LD-Script"