[PATCH] klibc_fixups: remove no longer needed stuff

diff --git a/Makefile b/Makefile
index ac60ade52a9b6ca32e28dc44717f67b5f16e332b..8184620a2d50c6af5879e4e84ae2c1e68b16018c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
                $(OPTFLAGS) $(REQFLAGS)                         \
                -D__KLIBC__ -fno-builtin-printf                 \
                -I$(KLIBC_FIXUPS_DIR)                           \
                $(OPTFLAGS) $(REQFLAGS)                         \
                -D__KLIBC__ -fno-builtin-printf                 \
                -I$(KLIBC_FIXUPS_DIR)                           \

-               -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h     \

                -I$(INCLUDE_DIR)                                \
                -I$(INCLUDE_DIR)/arch/$(ARCH)                   \
                -I$(INCLUDE_DIR)/bits$(BITSIZE)                 \
                -I$(INCLUDE_DIR)                                \
                -I$(INCLUDE_DIR)/arch/$(ARCH)                   \
                -I$(INCLUDE_DIR)/bits$(BITSIZE)                 \


@@ -201,7 +200,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
        LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
 
        HEADERS += \
        LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
 
        HEADERS += \

-               klibc_fixups/klibc_fixups.h     \

                klibc_fixups/pwd.h
 
        KLIBC_FIXUP_OBJS = \
                klibc_fixups/pwd.h
 
        KLIBC_FIXUP_OBJS = \

diff --git a/klibc_fixups/klibc_fixups.h b/klibc_fixups/klibc_fixups.h
deleted file mode 100644 (file)
index 13011b6..0000000
--- a/klibc_fixups/klibc_fixups.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifdef __KLIBC__
-
-#ifndef _KLIBC_FIXUPS_H
-#define _KLIBC_FIXUPS_H
-
-#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
-#include <unistd.h>
-
-#define _SC_PAGESIZE           0x66
-static inline long int sysconf(int name)
-{
-       if (name == _SC_PAGESIZE)
-               return getpagesize();
-
-       return -1;
-}
-
-struct exit_status {
-       short int e_termination;        /* process termination status */
-       short int e_exit;               /* process exit status */
-};
-
-#endif /* KLIBC_FIXUPS_H */
-#endif /* __KLIBC__ */

diff --git a/libsysfs/sysfs_dir.c b/libsysfs/sysfs_dir.c
index c86617934bb47c37a5955e0546f9551fe009c9d1..63eec7bb9ac06aa0e042d2a2cc530da636cfb294 100644 (file)
--- a/libsysfs/sysfs_dir.c
+++ b/libsysfs/sysfs_dir.c
@@ -150,7 +150,7 @@ int sysfs_read_attribute(struct sysfs_attribute *sysattr)
                errno = EACCES;
                return -1;
        }
                errno = EACCES;
                return -1;
        }

-       pgsize = sysconf(_SC_PAGESIZE);
+       pgsize = getpagesize();

        fbuf = (char *)calloc(1, pgsize+1);
        if (!fbuf) {
                dprintf("calloc failed\n");
        fbuf = (char *)calloc(1, pgsize+1);
        if (!fbuf) {
                dprintf("calloc failed\n");