* progmodes/ld-script.el (auto-mode-alist): Support suffix conventions used in netbsd...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53adc193d6aa55b4ce9906dd8975a69c98212865..94c9abeea1c314c967296825e1da18c10fd53770 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-12  Masatake YAMATO  <jet@gyve.org>
+
+       * progmodes/ld-script.el (auto-mode-alist): Support
+       suffix conventions used in netbsd and eCos.
+
 2006-01-11  Luc Teirlinck  <teirllm@auburn.edu>
 
        * cus-edit.el (custom-reset-menu, custom-buffer-create-internal)

diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 4dbbe0faa1822d416481a74cf37a79aa5382d24b..989439695ae000408812170ce513f852254e17f8 100644 (file)
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -125,8 +125,14 @@
    cpp-font-lock-keywords)
   "Default font-lock-keywords for `ld-script-mode'.")
 
+;; Linux-2.6.9 uses some different suffix for linker scripts:
+;; "ld", "lds", "lds.S", "lds.in", "ld.script", and "ld.script.balo".
+;; eCos uses "ld" and "ldi".
+;; Netbsd uses "ldscript.*".
 ;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.ld[s]?\\>" . ld-script-mode))
+(add-to-list 'auto-mode-alist '("\\.ld[si]?\\>" . ld-script-mode))
+(add-to-list 'auto-mode-alist '("ld[.]?script\\>" . ld-script-mode))
+
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.x[bdsru]?[cn]?$" . ld-script-mode))