--- a/packages/error/current/cdl/error.cdl
+++ b/packages/error/current/cdl/error.cdl
@@ -31,10 +31,10 @@
 # ====================================================================
 ######DESCRIPTIONBEGIN####
 #
-# Author(s):      bartv
+# Author(s):      bartv,jlarmour
 # Original data:  jlarmour
-# Contributors:
-# Date:           1999-06-13
+# Contributors:   
+# Date:           2000-04-14
 #
 #####DESCRIPTIONEND####
 #
@@ -42,8 +42,10 @@
 
 cdl_package CYGPKG_ERROR {
     display       "Common error code support"
-    compile       strerror.cxx
+    compile       strerror.cxx errno.cxx
     include_dir   cyg/error
+    implements    CYGINT_ISO_ERRNO_CODES
+    requires      { CYGBLD_ISO_ERRNO_CODES_HEADER == "<cyg/error/codes.h>" }
     description   "
         This package contains the common list of error and
         status codes. It is held centrally to allow
@@ -53,11 +55,94 @@ cdl_package CYGPKG_ERROR {
         reporting. The error codes are modelled on the
         POSIX style naming e.g. EINVAL etc. This package
         also provides the standard strerror() function to
-        convert error codes to textual representation."
+        convert error codes to textual representation, as
+        well as an implementation of the errno idiom."
+        
+# ====================================================================
+# ERRNO OPTIONS
+
+    cdl_component CYGPKG_ERROR_ERRNO {
+        display       "errno variable"
+        flavor        bool
+        implements    CYGINT_ISO_ERRNO
+        requires      { CYGBLD_ISO_ERRNO_HEADER == "<cyg/error/errno.h>" }
+        default_value 1
+        description   "
+            This package controls the behaviour of the
+            errno variable (or more strictly, expression)
+            from <errno.h>."
+
+        cdl_option CYGSEM_ERROR_PER_THREAD_ERRNO {
+            display       "Per-thread errno"
+            requires      CYGVAR_KERNEL_THREADS_DATA
+            default_value 1
+            description   "
+                This option controls whether the standard error
+                code reporting variable errno is a per-thread
+                variable, rather than global."
+        }
+
+        cdl_option CYGNUM_ERROR_ERRNO_TRACE_LEVEL {
+            display       "Tracing level"
+            flavor        data
+            legal_values  0 to 1
+            default_value 0
+            description   "
+                Trace verbosity level for debugging the errno
+                retrieval mechanism in errno.cxx. Increase this
+                value to get additional trace output."
+        }
+    }
+
+# ====================================================================
+# STRERROR OPTIONS
 
-    define_proc {
-        puts $::cdl_header "/***** proc output start *****/"
-        puts $::cdl_header "#include <pkgconf/system.h>"
-        puts $::cdl_header "/*****  proc output end  *****/"
+    cdl_option CYGPKG_ERROR_STRERROR {
+        display       "strerror function"
+        flavor        bool
+        implements    CYGINT_ISO_STRERROR
+        requires      { CYGBLD_ISO_STRERROR_HEADER == "<cyg/error/strerror.h>" }
+        default_value 1
+        description   "
+            This package controls the presence and behaviour of the
+            strerror() function from <string.h>"
+    }
+
+# ====================================================================
+# BUILD OPTIONS
+    cdl_component CYGPKG_ERROR_OPTIONS {
+        display "Error package build options"
+        flavor  none
+        no_define
+        description   "
+	    Package specific build options including control over
+	    compiler flags used only in building this package,
+	    and details of which tests are built."
+
+
+        cdl_option CYGPKG_ERROR_CFLAGS_ADD {
+            display "Additional compiler flags"
+            flavor  data
+            no_define
+            default_value { "" }
+            description   "
+                This option modifies the set of compiler flags for
+                building the error package. These flags are used in addition
+                to the set of global flags."
+        }
+
+        cdl_option CYGPKG_ERROR_CFLAGS_REMOVE {
+            display "Suppressed compiler flags"
+            flavor  data
+            no_define
+            default_value { "" }
+            description   "
+                This option modifies the set of compiler flags for
+                building the error package. These flags are removed from
+                the set of global flags if present."
+        }
     }
 }
+
+# ====================================================================
+# EOF error.cdl