From cfc36e5fd3108a18a6541b8032e091be1d8da914 Mon Sep 17 00:00:00 2001 From: Antoine Leca Date: Thu, 28 Mar 2013 18:44:45 +0000 Subject: [PATCH] Drop obsolete and Change-Id: I05da32bd2bdf014b6fd5c39d6e808d3c73812dc0 --- distrib/sets/lists/minix/mi | 4 +-- include/minix/Makefile | 4 +-- include/minix/compiler.h | 49 ------------------------------------- include/minix/crtso.h | 8 ------ servers/pm/main.c | 1 - servers/vm/main.c | 1 - 6 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 include/minix/compiler.h delete mode 100644 include/minix/crtso.h diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 96bbc8d4d..b8b910e2c 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -1105,11 +1105,11 @@ ./usr/include/minix/chardriver.h minix-sys ./usr/include/minix/clkconf.h minix-sys ./usr/include/minix/com.h minix-sys -./usr/include/minix/compiler.h minix-sys +./usr/include/minix/compiler.h minix-sys obsolete ./usr/include/minix/config.h minix-sys ./usr/include/minix/const.h minix-sys ./usr/include/minix/cpufeature.h minix-sys -./usr/include/minix/crtso.h minix-sys +./usr/include/minix/crtso.h minix-sys obsolete ./usr/include/minix/debug.h minix-sys ./usr/include/minix/devio.h minix-sys ./usr/include/minix/devman.h minix-sys diff --git a/include/minix/Makefile b/include/minix/Makefile index c2de2a71c..bf2cdd730 100644 --- a/include/minix/Makefile +++ b/include/minix/Makefile @@ -6,8 +6,8 @@ INCS+= dirent.h paths.h param.h INCS+= acpi.h audio_fw.h bitmap.h \ bdev.h blockdriver.h blockdriver_mt.h \ btrace.h \ - callnr.h chardriver.h clkconf.h com.h compiler.h \ - config.h const.h cpufeature.h crtso.h \ + callnr.h chardriver.h clkconf.h com.h \ + config.h const.h cpufeature.h \ debug.h devio.h devman.h dmap.h \ driver.h drivers.h drvlib.h ds.h \ endpoint.h fb.h fslib.h gpio.h gcov.h hash.h \ diff --git a/include/minix/compiler.h b/include/minix/compiler.h deleted file mode 100644 index 75b5d6350..000000000 --- a/include/minix/compiler.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Definitions for compiler-specific features. */ - -#ifndef _MINIX_COMPILER_H -#define _MINIX_COMPILER_H - -/*===========================================================================* - * Compiler overrides * - *===========================================================================*/ -/* ACK */ -#ifdef __ACK__ -#include -#endif - -/*===========================================================================* - * Default values * - *===========================================================================*/ -/* - * cdecl calling convention expects the callee to pop the hidden pointer on - * struct return. For example, GCC and LLVM comply with this (tested on IA32). - */ -#ifndef BYTES_TO_POP_ON_STRUCT_RETURN -#define BYTES_TO_POP_ON_STRUCT_RETURN $4 -#endif - -/* - * cdecl calling convention requires to push arguments on the stack in a - * reverse order to easily support variadic arguments. Thus, instead of - * using the proper stdarg.h macros (that nowadays are - * compiler-dependant), it may be tempting to directly take the address of - * the last argument and considering it as the start of an array. This is - * a shortcut that avoid looping to get all the arguments as the CPU - * already pushed them on the stack before the call to the function. - * - * Unfortunately, such an assumption is strictly compiler-dependant and - * compilers are free to move the last argument on the stack, as a local - * variable, and return the address of the location where the argument was - * stored, if asked for. This will break things as the rest of the array's - * argument are stored elsewhere (typically, a couple of words above the - * location where the argument was stored). - * - * Conclusion: if unsure on what the compiler may do, do not make any - * assumption and use the right (typically compiler-dependant) macros. - */ - -#ifndef FUNC_ARGS_ARRAY -#define FUNC_ARGS_ARRAY 0 -#endif - -#endif /* _MINIX_COMPILER_H */ diff --git a/include/minix/crtso.h b/include/minix/crtso.h deleted file mode 100644 index 93d56f68f..000000000 --- a/include/minix/crtso.h +++ /dev/null @@ -1,8 +0,0 @@ -/* Prototypes for crtso.s. */ - -#ifndef _MINIX_CRTSO_H -#define _MINIX_CRTSO_H - -void _minix_unmapzero(void); - -#endif diff --git a/servers/pm/main.c b/servers/pm/main.c index 6957ff895..ace611bf4 100644 --- a/servers/pm/main.c +++ b/servers/pm/main.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/servers/vm/main.c b/servers/vm/main.c index 95e64486d..1d9f0c723 100644 --- a/servers/vm/main.c +++ b/servers/vm/main.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include -- 2.44.0