From: Sergiu Moga <sergiu.moga@protonmail.com>
Date: Thu, 12 Aug 2021 11:50:46 +0000 (+0300)
Subject: Makefile.uk: Remove conflicting `resource.c` from build process
X-Git-Tag: RELEASE-0.6~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fa5929686a0387fbb1a2b19f597fbf2657eb2d89;p=unikraft%2Flibs%2Fnewlib.git

Makefile.uk: Remove conflicting `resource.c` from build process

This commit removes the conflicting function definitions for `getrlimit`,
`setrlimit` and `getrusage` by removing `resource.c` from the build process.

Signed-off-by: Sergiu Moga <sergiu.moga@protonmail.com>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Pull-Request: #9
---

diff --git a/Makefile.uk b/Makefile.uk
index ced131f..6858cc3 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -130,7 +130,6 @@ LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/console.c
 LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/plat.c
 LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/file.c
 LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/mem.c
-LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/resource.c
 LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/pty.c
 LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/locale.c
 LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/dev.c
diff --git a/resource.c b/resource.c
deleted file mode 100644
index a1954f7..0000000
--- a/resource.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-/*
- * libnewlib glue code
- *
- * Authors: Felipe Huici <felipe.huici@neclab.eu>
- *
- *
- * Copyright (c) 2017, NEC Europe Ltd., NEC Corporation. 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.
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * 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 HOLDER 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 <sys/resource.h>
-#include <uk/essentials.h>
-
-int getrlimit(int resource __unused, struct rlimit *rlim __unused)
-{
-	return 0;
-}
-
-int setrlimit(int resource __unused, const struct rlimit *rlim __unused)
-{
-	return 0;
-}
-
-int getrusage(int who __unused, struct rusage *usage __unused)
-{
-	return 0;
-}