From 9bf1d548fc51fdc097876db9b254956ddee3eac7 Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 22 Jun 2018 23:43:15 +0200 Subject: [PATCH] Rearrange the libc config files, ready for adding new options. --- .../include => lang/cem/libcc.ansi/headers}/ack/config.h | 2 +- lang/cem/libcc.ansi/headers/build.lua | 1 + plat/cpm/include/ack/{config.h => plat.h} | 4 ++-- plat/cpm/include/build.lua | 2 +- plat/em22/include/ack/plat.h | 6 ++++++ plat/em22/include/build.lua | 2 +- plat/linux386/include/ack/{config.h => plat.h} | 4 ++-- plat/linux386/include/build.lua | 2 +- plat/linux68k/include/ack/{config.h => plat.h} | 4 ++-- plat/linux68k/include/build.lua | 2 +- plat/linuxppc/include/ack/{config.h => plat.h} | 4 ++-- plat/linuxppc/include/build.lua | 2 +- plat/osx/include/ack/{config.h => plat.h} | 4 ++-- plat/osx/include/build.lua | 2 +- plat/pc86/include/ack/{config.h => plat.h} | 4 ++-- plat/pc86/include/build.lua | 2 +- plat/pdpv7/include/ack/{config.h => plat.h} | 4 ++-- plat/pdpv7/include/build.lua | 2 +- plat/qemuppc/include/ack/{config.h => plat.h} | 4 ++-- plat/qemuppc/include/build.lua | 2 +- plat/rpi/include/ack/{config.h => plat.h} | 4 ++-- plat/rpi/include/build.lua | 2 +- 22 files changed, 36 insertions(+), 29 deletions(-) rename {plat/em22/include => lang/cem/libcc.ansi/headers}/ack/config.h (60%) rename plat/cpm/include/ack/{config.h => plat.h} (88%) create mode 100644 plat/em22/include/ack/plat.h rename plat/linux386/include/ack/{config.h => plat.h} (82%) rename plat/linux68k/include/ack/{config.h => plat.h} (86%) rename plat/linuxppc/include/ack/{config.h => plat.h} (89%) rename plat/osx/include/ack/{config.h => plat.h} (82%) rename plat/pc86/include/ack/{config.h => plat.h} (81%) rename plat/pdpv7/include/ack/{config.h => plat.h} (89%) rename plat/qemuppc/include/ack/{config.h => plat.h} (85%) rename plat/rpi/include/ack/{config.h => plat.h} (89%) diff --git a/plat/em22/include/ack/config.h b/lang/cem/libcc.ansi/headers/ack/config.h similarity index 60% rename from plat/em22/include/ack/config.h rename to lang/cem/libcc.ansi/headers/ack/config.h index 2618ad74c..de714af4e 100644 --- a/plat/em22/include/ack/config.h +++ b/lang/cem/libcc.ansi/headers/ack/config.h @@ -1,6 +1,6 @@ #ifndef _ACK_CONFIG_H #define _ACK_CONFIG_H -#define ACKCONF_TIME_IS_A_SYSCALL +#include #endif diff --git a/lang/cem/libcc.ansi/headers/build.lua b/lang/cem/libcc.ansi/headers/build.lua index 80feaf073..57e4c12ee 100644 --- a/lang/cem/libcc.ansi/headers/build.lua +++ b/lang/cem/libcc.ansi/headers/build.lua @@ -13,6 +13,7 @@ end addheader("", filenamesof("./*.h")) addheader("sys/", filenamesof("./sys/*.h")) +addheader("ack/", filenamesof("./ack/*.h")) acklibrary { name = "headers", diff --git a/plat/cpm/include/ack/config.h b/plat/cpm/include/ack/plat.h similarity index 88% rename from plat/cpm/include/ack/config.h rename to plat/cpm/include/ack/plat.h index ebd5c1198..5f785b0e1 100644 --- a/plat/cpm/include/ack/config.h +++ b/plat/cpm/include/ack/plat.h @@ -3,8 +3,8 @@ * $Revision$ */ -#ifndef _ACK_CONFIG_H -#define _ACK_CONFIG_H +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H /* We're providing a time() system call rather than wanting a wrapper around * gettimeofday() in the libc. */ diff --git a/plat/cpm/include/build.lua b/plat/cpm/include/build.lua index b6f713684..0fdc2903d 100644 --- a/plat/cpm/include/build.lua +++ b/plat/cpm/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/cpm/include/"..h] = "./"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("cpm.h") addheader("unistd.h") diff --git a/plat/em22/include/ack/plat.h b/plat/em22/include/ack/plat.h new file mode 100644 index 000000000..87be3d0ec --- /dev/null +++ b/plat/em22/include/ack/plat.h @@ -0,0 +1,6 @@ +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H + +#define ACKCONF_TIME_IS_A_SYSCALL + +#endif diff --git a/plat/em22/include/build.lua b/plat/em22/include/build.lua index 298f9b033..ab7564b5c 100644 --- a/plat/em22/include/build.lua +++ b/plat/em22/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/em22/include/"..h] = "./"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("sys/types.h") addheader("sys/timeb.h") addheader("unistd.h") diff --git a/plat/linux386/include/ack/config.h b/plat/linux386/include/ack/plat.h similarity index 82% rename from plat/linux386/include/ack/config.h rename to plat/linux386/include/ack/plat.h index af4a90ed2..f65adb8d7 100644 --- a/plat/linux386/include/ack/config.h +++ b/plat/linux386/include/ack/plat.h @@ -3,8 +3,8 @@ * $Revision$ */ -#ifndef _ACK_CONFIG_H -#define _ACK_CONFIG_H +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H /* We're providing a time() system call rather than wanting a wrapper around * gettimeofday() in the libc. */ diff --git a/plat/linux386/include/build.lua b/plat/linux386/include/build.lua index ce1f2adc6..129fd9035 100644 --- a/plat/linux386/include/build.lua +++ b/plat/linux386/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/linux386/include/"..h] = "./"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("sys/ioctl.h") addheader("unistd.h") diff --git a/plat/linux68k/include/ack/config.h b/plat/linux68k/include/ack/plat.h similarity index 86% rename from plat/linux68k/include/ack/config.h rename to plat/linux68k/include/ack/plat.h index 77ac5528d..9145197c4 100644 --- a/plat/linux68k/include/ack/config.h +++ b/plat/linux68k/include/ack/plat.h @@ -3,8 +3,8 @@ * $Revision: 1.1 $ */ -#ifndef _ACK_CONFIG_H -#define _ACK_CONFIG_H +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H /* We're providing a time() system call rather than wanting a wrapper around * gettimeofday() in the libc. */ diff --git a/plat/linux68k/include/build.lua b/plat/linux68k/include/build.lua index 291fa0c36..131a52ba9 100644 --- a/plat/linux68k/include/build.lua +++ b/plat/linux68k/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/linux68k/include/"..h] = "./"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("sys/ioctl.h") addheader("unistd.h") diff --git a/plat/linuxppc/include/ack/config.h b/plat/linuxppc/include/ack/plat.h similarity index 89% rename from plat/linuxppc/include/ack/config.h rename to plat/linuxppc/include/ack/plat.h index 7c3c147b3..e25914574 100644 --- a/plat/linuxppc/include/ack/config.h +++ b/plat/linuxppc/include/ack/plat.h @@ -3,8 +3,8 @@ * $Revision: 1.1 $ */ -#ifndef _ACK_CONFIG_H -#define _ACK_CONFIG_H +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H /* We're providing a time() system call rather than wanting a wrapper around * gettimeofday() in the libc. */ diff --git a/plat/linuxppc/include/build.lua b/plat/linuxppc/include/build.lua index 27325b43d..5fef69c6e 100644 --- a/plat/linuxppc/include/build.lua +++ b/plat/linuxppc/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/linuxppc/include/"..h] = "./"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("sys/ioctl.h") addheader("unistd.h") diff --git a/plat/osx/include/ack/config.h b/plat/osx/include/ack/plat.h similarity index 82% rename from plat/osx/include/ack/config.h rename to plat/osx/include/ack/plat.h index 9f58a3941..ba64a6d56 100644 --- a/plat/osx/include/ack/config.h +++ b/plat/osx/include/ack/plat.h @@ -3,8 +3,8 @@ * $Revision$ */ -#ifndef _ACK_CONFIG_H -#define _ACK_CONFIG_H +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H /* We're providing a time() system call rather than wanting a wrapper around * gettimeofday() in the libc. */ diff --git a/plat/osx/include/build.lua b/plat/osx/include/build.lua index ff7c87a4d..859a3730a 100644 --- a/plat/osx/include/build.lua +++ b/plat/osx/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/osx/include/"..h] = "plat/osx/include/"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("sys/dirent.h") addheader("sys/mman.h") addheader("sys/stat.h") diff --git a/plat/pc86/include/ack/config.h b/plat/pc86/include/ack/plat.h similarity index 81% rename from plat/pc86/include/ack/config.h rename to plat/pc86/include/ack/plat.h index dac9af4c1..cbd879396 100644 --- a/plat/pc86/include/ack/config.h +++ b/plat/pc86/include/ack/plat.h @@ -3,8 +3,8 @@ * $Revision$ */ -#ifndef _ACK_CONFIG_H -#define _ACK_CONFIG_H +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H /* We're providing a time() system call rather than wanting a wrapper around * gettimeofday() in the libc. */ diff --git a/plat/pc86/include/build.lua b/plat/pc86/include/build.lua index 6ae120358..cb504b837 100644 --- a/plat/pc86/include/build.lua +++ b/plat/pc86/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/pc86/include/"..h] = "./"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("unistd.h") acklibrary { diff --git a/plat/pdpv7/include/ack/config.h b/plat/pdpv7/include/ack/plat.h similarity index 89% rename from plat/pdpv7/include/ack/config.h rename to plat/pdpv7/include/ack/plat.h index 73dbbc34d..42a302513 100644 --- a/plat/pdpv7/include/ack/config.h +++ b/plat/pdpv7/include/ack/plat.h @@ -5,8 +5,8 @@ * See the file 'Copying' in the root of the distribution for the full text. */ -#ifndef _ACK_CONFIG_H -#define _ACK_CONFIG_H +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H /* We're providing a time() system call rather than wanting a wrapper around * gettimeofday() in the libc. */ diff --git a/plat/pdpv7/include/build.lua b/plat/pdpv7/include/build.lua index c0334a341..70d9666c6 100644 --- a/plat/pdpv7/include/build.lua +++ b/plat/pdpv7/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/pdpv7/include/"..h] = "./"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("sys/select.h") addheader("termios.h") addheader("unistd.h") diff --git a/plat/qemuppc/include/ack/config.h b/plat/qemuppc/include/ack/plat.h similarity index 85% rename from plat/qemuppc/include/ack/config.h rename to plat/qemuppc/include/ack/plat.h index f58ee3a43..4ad324142 100644 --- a/plat/qemuppc/include/ack/config.h +++ b/plat/qemuppc/include/ack/plat.h @@ -3,8 +3,8 @@ * $Revision: 1.1 $ */ -#ifndef _ACK_CONFIG_H -#define _ACK_CONFIG_H +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H /* We're providing a time() system call rather than wanting a wrapper around * gettimeofday() in the libc. */ diff --git a/plat/qemuppc/include/build.lua b/plat/qemuppc/include/build.lua index dc1b0bb43..896043e63 100644 --- a/plat/qemuppc/include/build.lua +++ b/plat/qemuppc/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/qemuppc/include/"..h] = "./"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("sys/ioctl.h") addheader("unistd.h") diff --git a/plat/rpi/include/ack/config.h b/plat/rpi/include/ack/plat.h similarity index 89% rename from plat/rpi/include/ack/config.h rename to plat/rpi/include/ack/plat.h index 995673236..9f9d08b27 100644 --- a/plat/rpi/include/ack/config.h +++ b/plat/rpi/include/ack/plat.h @@ -5,8 +5,8 @@ * See the file 'Copying' in the root of the distribution for the full text. */ -#ifndef _ACK_CONFIG_H -#define _ACK_CONFIG_H +#ifndef _ACK_PLAT_H +#define _ACK_PLAT_H /* We're providing a time() system call rather than wanting a wrapper around * gettimeofday() in the libc. */ diff --git a/plat/rpi/include/build.lua b/plat/rpi/include/build.lua index 4e6b8521b..105f05988 100644 --- a/plat/rpi/include/build.lua +++ b/plat/rpi/include/build.lua @@ -8,7 +8,7 @@ local function addheader(h) packagemap["$(PLATIND)/rpi/include/"..h] = "./"..h end -addheader("ack/config.h") +addheader("ack/plat.h") addheader("pi.h") addheader("sys/select.h") addheader("termios.h")