restore proper comment headers as well as cut pointless includes as pointed out by Peter S. Mazinger

4 files changed, 22 insertions, 35 deletions

diff --git a/libc/sysdeps/linux/bfin/__longjmp.S b/libc/sysdeps/linux/bfin/__longjmp.S
index 8648b2d7d..dc614158c 100644
--- a/libc/sysdeps/linux/bfin/__longjmp.S
+++ b/libc/sysdeps/linux/bfin/__longjmp.S
@@ -1,18 +1,11 @@
-/*
- * longjmp for the Blackfin project
+/* longjmp for the Blackfin project
  *
- * Copyright (C) 2004,
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ * Copyright (C) 2004 Metrowerks
  * Based on code from Analog Devices.
  *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License.  See the file COPYING.LIB in the main
- * directory of this archive for more details.
- *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
-#include <features.h>
-#define _SETJMP_H
-#define _ASM
-#include <bits/setjmp.h>
 
 .text
 .global ___longjmp;
diff --git a/libc/sysdeps/linux/bfin/bsd-_setjmp.S b/libc/sysdeps/linux/bfin/bsd-_setjmp.S
index 69ae8f878..e2338d6cc 100644
--- a/libc/sysdeps/linux/bfin/bsd-_setjmp.S
+++ b/libc/sysdeps/linux/bfin/bsd-_setjmp.S
@@ -1,10 +1,10 @@
-
-/* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */
-/* This file is released under the LGPL, any version you like */
-
-#define _ASM
-#define _SETJMP_H
-#include <bits/setjmp.h>
+/* __setjmp for the Blackfin project
+ *
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ * Copyright (C) 2002, David McCullough <davidm@snapgear.com>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
 
 .text
 .global __setjmp;
diff --git a/libc/sysdeps/linux/bfin/bsdsetjmp.c b/libc/sysdeps/linux/bfin/bsdsetjmp.c
index 87de78a4c..7b953804c 100644
--- a/libc/sysdeps/linux/bfin/bsdsetjmp.c
+++ b/libc/sysdeps/linux/bfin/bsdsetjmp.c
@@ -1,16 +1,16 @@
-/*
- * setjmp for the Blackfin project
+/* setjmp for the Blackfin project
  *
- * Copyright (C) 2003,  Metrowerks
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ * Copyright (C) 2003 Metrowerks
  * Based on code from Analog Devices.
  *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License.  See the file COPYING.LIB in the main
- * directory of this archive for more details.
- *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
+
 #include <setjmp.h>
 
+#undef setjmp
+
 int setjmp(jmp_buf env){
    __asm__ __volatile__("[--SP] = p0;\n\t"
        "p0 = r0;\n\t"
diff --git a/libc/sysdeps/linux/bfin/setjmp.S b/libc/sysdeps/linux/bfin/setjmp.S
index 7ca92106f..1b304f84d 100644
--- a/libc/sysdeps/linux/bfin/setjmp.S
+++ b/libc/sysdeps/linux/bfin/setjmp.S
@@ -1,17 +1,11 @@
-
-/* Cetjmp for the Blackfin project
+/* setjmp for the Blackfin project
  *
- * Copyright (C) 2003,  Metrowerks
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ * Copyright (C) 2003 Metrowerks
  * Based on code from Analog Devices.
  *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License.  See the file COPYING.LIB in the main
- * directory of this archive for more details.
- *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
-#define _ASM
-#define _SETJMP_H
-#include <bits/setjmp.h>
 
 .text
 .global ___sigsetjmp;