summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2000-06-28 20:11:28 +0000
committerEric Andersen2000-06-28 20:11:28 +0000
commita44790f53919f0d129c78b8a288e5f5cac331c66 (patch)
tree8baa3cf3a7a6f6f6f6323403b24d772d9fb96c3a
parenta2db097d662e5d739b5a0748208dc76055260061 (diff)
downloadbusybox-a44790f53919f0d129c78b8a288e5f5cac331c66.zip
busybox-a44790f53919f0d129c78b8a288e5f5cac331c66.tar.gz
Better cross libc support.
-Erik
-rw-r--r--Makefile4
-rw-r--r--init.c1
-rw-r--r--init/init.c1
-rw-r--r--internal.h3
-rw-r--r--utility.c1
5 files changed, 3 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f44790c..16573ea 100644
--- a/Makefile
+++ b/Makefile
@@ -52,11 +52,11 @@ endif
# -D_GNU_SOURCE is needed because environ is used in init.c
ifeq ($(DODEBUG),true)
- CFLAGS += -Wall -g -fno-builtin -D_GNU_SOURCE
+ CFLAGS += -Wall -g -D_GNU_SOURCE
LDFLAGS +=
STRIP =
else
- CFLAGS += -Wall $(OPTIMIZATION) -fomit-frame-pointer -fno-builtin -D_GNU_SOURCE
+ CFLAGS += -Wall $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
LDFLAGS += -s
STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG)
#Only staticly link when _not_ debugging
diff --git a/init.c b/init.c
index 9289b86..2c27513 100644
--- a/init.c
+++ b/init.c
@@ -45,7 +45,6 @@
#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/mount.h>
-//#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/vt.h> /* for vt_stat */
#include <sys/wait.h>
diff --git a/init/init.c b/init/init.c
index 9289b86..2c27513 100644
--- a/init/init.c
+++ b/init/init.c
@@ -45,7 +45,6 @@
#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/mount.h>
-//#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/vt.h> /* for vt_stat */
#include <sys/wait.h>
diff --git a/internal.h b/internal.h
index c39dfde..6e4f06c 100644
--- a/internal.h
+++ b/internal.h
@@ -34,9 +34,6 @@
#include <sys/stat.h>
#include <sys/param.h>
#include <mntent.h>
-#if ! defined(__GLIBC__) && ! defined (__UCLIBC__)
-#include <asm/string.h>
-#endif
/* Some useful definitions */
diff --git a/utility.c b/utility.c
index 061ba64..a45edde 100644
--- a/utility.c
+++ b/utility.c
@@ -135,6 +135,7 @@ extern int get_kernel_revision(void)
#if defined BB_FREE || defined BB_INIT || defined BB_UNAME || defined BB_UPTIME
#include <sys/syscall.h>
+#include <linux/unistd.h>
_syscall1(int, sysinfo, struct sysinfo *, info);
#endif /* BB_INIT */