Merge zizzer.eecs.umich.edu:/bk/newmem

into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

src/cpu/simple/base.cc:
    Hand merge

--HG--
extra : convert_revision : a2902ef9d917d22ffb9c7dfa2fd444694a65240d

1 files changed, 57 insertions, 0 deletions

diff --git a/ext/libelf/elf_cntl.c b/ext/libelf/elf_cntl.c
new file mode 100644
index 000000000..20b0af8ca
--- /dev/null
+++ b/ext/libelf/elf_cntl.c
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2006 Joseph Koshy
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+
+#include "libelf.h"
+
+#include "_libelf.h"
+
+int
+elf_cntl(Elf *e, Elf_Cmd c)
+{
+        if (e == NULL ||
+            (c != ELF_C_FDDONE && c != ELF_C_FDREAD)) {
+                LIBELF_SET_ERROR(ARGUMENT, 0);
+                return (-1);
+        }
+
+        if (e->e_parent) {
+                LIBELF_SET_ERROR(ARCHIVE, 0);
+                return (-1);
+        }
+
+        if (c == ELF_C_FDREAD) {
+                if (e->e_cmd == ELF_C_WRITE) {
+                        LIBELF_SET_ERROR(MODE, 0);
+                        return (-1);
+                }
+                else
+                        return (0);
+        }
+
+        e->e_fd = -1;
+        return 0;
+}