From: Masatake YAMATO <jet@gyve.org>
Date: Thu, 12 Jan 2006 10:09:44 +0000 (+0000)
Subject: * progmodes/ld-script.el (auto-mode-alist): Support suffix conventions used in netbsd... 
X-Git-Tag: emacs-pretest-22.0.90~4786
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ec7bdfdf7169d13613347b9680b1bca7b64df81;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53adc193d6a..94c9abeea1c 100644
--- 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 4dbbe0faa18..989439695ae 100644
--- 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))