From 4ae178f81dcf5f66bfb04affa807fb4c48df011f Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Fri, 21 Nov 2014 14:42:53 -0800 Subject: [PATCH] Mips: remove arch-specific atexit.h Change-Id: I687ff4ead6c5e81db44782bf851cb84f87bfe085 --- libc/arch-mips/bionic/atexit.h | 29 ----------------------------- libc/arch-mips/bionic/crtbegin.c | 2 +- libc/arch-mips64/bionic/atexit.h | 29 ----------------------------- libc/arch-mips64/bionic/crtbegin.c | 2 +- 4 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 libc/arch-mips/bionic/atexit.h delete mode 100644 libc/arch-mips64/bionic/atexit.h diff --git a/libc/arch-mips/bionic/atexit.h b/libc/arch-mips/bionic/atexit.h deleted file mode 100644 index b0284217b..000000000 --- a/libc/arch-mips/bionic/atexit.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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 "../../arch-common/bionic/atexit.h" diff --git a/libc/arch-mips/bionic/crtbegin.c b/libc/arch-mips/bionic/crtbegin.c index 28e8817f9..50e9eeb02 100644 --- a/libc/arch-mips/bionic/crtbegin.c +++ b/libc/arch-mips/bionic/crtbegin.c @@ -91,4 +91,4 @@ __asm__ ( ); #include "../../arch-common/bionic/__dso_handle.h" -#include "atexit.h" +#include "../../arch-common/bionic/atexit.h" diff --git a/libc/arch-mips64/bionic/atexit.h b/libc/arch-mips64/bionic/atexit.h deleted file mode 100644 index b0284217b..000000000 --- a/libc/arch-mips64/bionic/atexit.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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 "../../arch-common/bionic/atexit.h" diff --git a/libc/arch-mips64/bionic/crtbegin.c b/libc/arch-mips64/bionic/crtbegin.c index 2ea31ad64..1374fea35 100644 --- a/libc/arch-mips64/bionic/crtbegin.c +++ b/libc/arch-mips64/bionic/crtbegin.c @@ -91,4 +91,4 @@ __asm__ ( ); #include "../../arch-common/bionic/__dso_handle.h" -#include "atexit.h" +#include "../../arch-common/bionic/atexit.h" -- 2.11.0