From a85c90e892142a8bc43d31967bc7afd390e57179 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Fri, 24 Feb 2023 18:23:45 +0100
Subject: [PATCH] [machdep] remove json files in favor of yaml
---
share/machdeps/machdep-schema.json | 132 ------------------------
share/machdeps/machdep_avr_16.json | 36 -------
share/machdeps/machdep_gcc_x86_16.json | 32 ------
share/machdeps/machdep_gcc_x86_32.json | 34 ------
share/machdeps/machdep_gcc_x86_64.json | 34 ------
share/machdeps/machdep_msvc_x86_64.json | 32 ------
share/machdeps/machdep_ppc_32.json | 36 -------
share/machdeps/machdep_x86_16.json | 32 ------
share/machdeps/machdep_x86_32.json | 34 ------
share/machdeps/machdep_x86_64.json | 32 ------
10 files changed, 434 deletions(-)
delete mode 100644 share/machdeps/machdep-schema.json
delete mode 100644 share/machdeps/machdep_avr_16.json
delete mode 100644 share/machdeps/machdep_gcc_x86_16.json
delete mode 100644 share/machdeps/machdep_gcc_x86_32.json
delete mode 100644 share/machdeps/machdep_gcc_x86_64.json
delete mode 100644 share/machdeps/machdep_msvc_x86_64.json
delete mode 100644 share/machdeps/machdep_ppc_32.json
delete mode 100644 share/machdeps/machdep_x86_16.json
delete mode 100644 share/machdeps/machdep_x86_32.json
delete mode 100644 share/machdeps/machdep_x86_64.json
diff --git a/share/machdeps/machdep-schema.json b/share/machdeps/machdep-schema.json
deleted file mode 100644
index 378e1dfa111..00000000000
--- a/share/machdeps/machdep-schema.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
- "$schema": "https://json-schema.org/draft/2020-12/schema",
- "$id" : "FRAMAC_SHARE/machdeps/machdep-schema.json",
- "type" : "object",
- "properties": {
- "version": {
- "description": "information on this machdep",
- "type" : "string"
- },
- "compiler": {
- "description": "compiler being used",
- "type" : "string"
- },
- "cpp_arch_flags": {
- "description": "arguments to be given to the compiler when this machdep is selected (e.g. '-m32')",
- "type" : "array",
- "items" : { "type": "string" }
- },
- "sizeof_short": {
- "description": "size of 'short' type",
- "type": "integer"
- },
- "sizeof_int": {
- "description": "size of 'int' type",
- "type": "integer"
- },
- "sizeof_long": {
- "description": "size of 'long' type",
- "type": "integer"
- },
- "sizeof_longlong": {
- "description": "size of 'long long' type",
- "type": "integer"
- },
- "sizeof_ptr": {
- "description": "size of 'void*' type",
- "type": "integer"
- },
- "sizeof_float": {
- "description": "size of 'float' type",
- "type": "integer"
- },
- "sizeof_double": {
- "description": "size of 'double' type",
- "type": "integer"
- },
- "sizeof_longdouble": {
- "description": "size of 'long double' type",
- "type": "integer"
- },
- "sizeof_void": {
- "description": "(non-standard) size of 'void' type. Negative if unsupported",
- "type": "integer"
- },
- "sizeof_fun": {
- "description": "(non-standard) size of a function type. Negative if unsupported",
- "type": "integer"
- },
- "size_t": {
- "description": "type of 'sizeof e'",
- "type": "string"
- },
- "wchar_t": {
- "description": "definition of 'wchar_t'",
- "type": "string"
- },
- "ptr_diff_t": {
- "description": "definition of 'ptrdiff_t'",
- "type": "string"
- },
- "alignof_short": {
- "description": "alignment of 'short' type",
- "type": "integer"
- },
- "alignof_int": {
- "description": "alignment of 'int' type",
- "type": "integer"
- },
- "alignof_long": {
- "description": "alignment of 'long' type",
- "type": "integer"
- },
- "alignof_longlong": {
- "description": "alignment of 'long long' type",
- "type": "integer"
- },
- "alignof_ptr": {
- "description": "alignment of 'void*' type",
- "type": "integer"
- },
- "alignof_float": {
- "description": "alignment of 'float' type",
- "type": "integer"
- },
- "alignof_double": {
- "description": "alignment of 'double' type",
- "type": "integer"
- },
- "alignof_longdouble": {
- "description": "alignment of 'long double' type",
- "type": "integer"
- },
- "alignof_string": {
- "description": "alignment of string",
- "type": "integer"
- },
- "alignof_void": {
- "description": "(non-standard) alignment of 'void' type. Negative if unsupported",
- "type": "integer"
- },
- "alignof_fun": {
- "description": "(non-standard) alignment of a function type. Negative if unsupported",
- "type": "integer"
- },
- "char_is_unsigned": {
- "description": "whether 'char' is unsigned",
- "type": "boolean"
- },
- "little_endian": {
- "description": "whether the architecture is little-endian",
- "type" : "boolean"
- },
- "alignof_aligned": {
- "description": "alignment of a type with 'aligned' attribute",
- "type" : "integer"
- },
- "has__builtin_va_list" : {
- "description": "Whether '__builtin_va_list' is a known type",
- "type" : "boolean"
- }
- }
-}
diff --git a/share/machdeps/machdep_avr_16.json b/share/machdeps/machdep_avr_16.json
deleted file mode 100644
index 73c347759aa..00000000000
--- a/share/machdeps/machdep_avr_16.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "alignof_aligned": 1,
- "alignof_double": 1,
- "alignof_float": 1,
- "alignof_fun": 4,
- "alignof_int": 1,
- "alignof_long": 1,
- "alignof_longdouble": 1,
- "alignof_longlong": 1,
- "alignof_ptr": 1,
- "alignof_short": 2,
- "alignof_str": 1,
- "char_is_unsigned": false,
- "compiler": "clang",
- "cpp_arch_flags": [
- "-target",
- "avr",
- "-m16"
- ],
- "has__builtin_va_list": true,
- "little_endian": true,
- "ptrdiff_t": "int",
- "size_t": "unsigned int",
- "sizeof_double": 4,
- "sizeof_float": 4,
- "sizeof_fun": 1,
- "sizeof_int": 2,
- "sizeof_long": 4,
- "sizeof_longdouble": 4,
- "sizeof_longlong": 8,
- "sizeof_ptr": 2,
- "sizeof_short": 2,
- "sizeof_void": 1,
- "version": "clang version 15.0.7",
- "wchar_t": "int"
-}
diff --git a/share/machdeps/machdep_gcc_x86_16.json b/share/machdeps/machdep_gcc_x86_16.json
deleted file mode 100644
index bc6a35bddbb..00000000000
--- a/share/machdeps/machdep_gcc_x86_16.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "alignof_aligned": 8,
- "alignof_double": 8,
- "alignof_float": 2,
- "alignof_fun": 1,
- "alignof_int": 2,
- "alignof_long": 4,
- "alignof_longdouble": 16,
- "alignof_longlong": 4,
- "alignof_ptr": 4,
- "alignof_short": 2,
- "alignof_str": 1,
- "char_is_unsigned": false,
- "compiler": "gcc",
- "cpp_arch_flags": ["-m16"],
- "has__builtin_va_list": true,
- "little_endian": true,
- "ptrdiff_t": "int",
- "size_t": "unsigned int",
- "sizeof_double": 8,
- "sizeof_float": 4,
- "sizeof_fun": 1,
- "sizeof_int": 2,
- "sizeof_long": 4,
- "sizeof_longdouble": 16,
- "sizeof_longlong": 8,
- "sizeof_ptr": 4,
- "sizeof_short": 2,
- "sizeof_void": 1,
- "version": "none",
- "wchar_t": "int"
-}
diff --git a/share/machdeps/machdep_gcc_x86_32.json b/share/machdeps/machdep_gcc_x86_32.json
deleted file mode 100644
index 242baf3bcf9..00000000000
--- a/share/machdeps/machdep_gcc_x86_32.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "alignof_aligned": 16,
- "alignof_double": 4,
- "alignof_float": 4,
- "alignof_fun": 1,
- "alignof_int": 4,
- "alignof_long": 4,
- "alignof_longdouble": 4,
- "alignof_longlong": 4,
- "alignof_ptr": 4,
- "alignof_short": 2,
- "alignof_str": 1,
- "char_is_unsigned": false,
- "compiler": "gcc",
- "cpp_arch_flags": [
- "-m32"
- ],
- "has__builtin_va_list": true,
- "little_endian": true,
- "ptrdiff_t": "int",
- "size_t": "unsigned int",
- "sizeof_double": 8,
- "sizeof_float": 4,
- "sizeof_fun": 1,
- "sizeof_int": 4,
- "sizeof_long": 4,
- "sizeof_longdouble": 12,
- "sizeof_longlong": 8,
- "sizeof_ptr": 4,
- "sizeof_short": 2,
- "sizeof_void": 1,
- "version": "gcc (GCC) 12.2.1 20230201",
- "wchar_t": "long"
-}
diff --git a/share/machdeps/machdep_gcc_x86_64.json b/share/machdeps/machdep_gcc_x86_64.json
deleted file mode 100644
index 426898d9c08..00000000000
--- a/share/machdeps/machdep_gcc_x86_64.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "alignof_aligned": 16,
- "alignof_double": 8,
- "alignof_float": 4,
- "alignof_fun": 1,
- "alignof_int": 4,
- "alignof_long": 8,
- "alignof_longdouble": 16,
- "alignof_longlong": 8,
- "alignof_ptr": 8,
- "alignof_short": 2,
- "alignof_str": 1,
- "char_is_unsigned": false,
- "compiler": "gcc",
- "cpp_arch_flags": [
- "-m64"
- ],
- "has__builtin_va_list": true,
- "little_endian": true,
- "ptrdiff_t": "long",
- "size_t": "unsigned long",
- "sizeof_double": 8,
- "sizeof_float": 4,
- "sizeof_fun": 1,
- "sizeof_int": 4,
- "sizeof_long": 8,
- "sizeof_longdouble": 16,
- "sizeof_longlong": 8,
- "sizeof_ptr": 8,
- "sizeof_short": 2,
- "sizeof_void": 1,
- "version": "gcc (GCC) 12.2.1 20230201",
- "wchar_t": "int"
-}
diff --git a/share/machdeps/machdep_msvc_x86_64.json b/share/machdeps/machdep_msvc_x86_64.json
deleted file mode 100644
index 955972155bd..00000000000
--- a/share/machdeps/machdep_msvc_x86_64.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "version" : "MSVC - X86-64bits mode",
- "compiler" : "msvc",
- "cpp_arch_flags" : ["-m64"],
- "sizeof_short" : 2,
- "sizeof_int" : 4,
- "sizeof_long" : 4,
- "sizeof_longlong" : 8,
- "sizeof_ptr" : 8,
- "sizeof_float" : 4,
- "sizeof_double" : 8,
- "sizeof_longdouble" : 8,
- "sizeof_void" : 0,
- "sizeof_fun" : -1,
- "size_t" : "unsigned long long",
- "wchar_t" : "unsigned short",
- "ptrdiff_t": "long long",
- "alignof_short": 2,
- "alignof_int" : 4,
- "alignof_long" : 4,
- "alignof_longlong": 8,
- "alignof_ptr" : 8,
- "alignof_float" : 4,
- "alignof_double" : 8,
- "alignof_longdouble": 8,
- "alignof_str" : 1,
- "alignof_fun" : -1,
- "alignof_aligned": 1,
- "char_is_unsigned" : false,
- "little_endian": true,
- "has__builtin_va_list": false
-}
diff --git a/share/machdeps/machdep_ppc_32.json b/share/machdeps/machdep_ppc_32.json
deleted file mode 100644
index aec4b71b5ba..00000000000
--- a/share/machdeps/machdep_ppc_32.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "alignof_aligned": 16,
- "alignof_double": 8,
- "alignof_float": 4,
- "alignof_fun": 4,
- "alignof_int": 4,
- "alignof_long": 4,
- "alignof_longdouble": 16,
- "alignof_longlong": 8,
- "alignof_ptr": 4,
- "alignof_short": 2,
- "alignof_str": 1,
- "char_is_unsigned": true,
- "compiler": "clang",
- "cpp_arch_flags": [
- "-target",
- "powerpc-apple-linux",
- "-mcpu=603"
- ],
- "has__builtin_va_list": true,
- "little_endian": false,
- "ptrdiff_t": "int",
- "size_t": "unsigned int",
- "sizeof_double": 8,
- "sizeof_float": 4,
- "sizeof_fun": 1,
- "sizeof_int": 4,
- "sizeof_long": 4,
- "sizeof_longdouble": 16,
- "sizeof_longlong": 8,
- "sizeof_ptr": 4,
- "sizeof_short": 2,
- "sizeof_void": 1,
- "version": "clang version 15.0.7",
- "wchar_t": "int"
-}
diff --git a/share/machdeps/machdep_x86_16.json b/share/machdeps/machdep_x86_16.json
deleted file mode 100644
index 59eff226c3e..00000000000
--- a/share/machdeps/machdep_x86_16.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "alignof_aligned": 8,
- "alignof_double": 8,
- "alignof_float": 2,
- "alignof_fun": -1,
- "alignof_int": 2,
- "alignof_long": 4,
- "alignof_longdouble": 16,
- "alignof_longlong": 4,
- "alignof_ptr": 4,
- "alignof_short": 2,
- "alignof_str": 1,
- "char_is_unsigned": false,
- "compiler": "generic",
- "cpp_arch_flags": [ "-m16" ],
- "has__builtin_va_list": true,
- "little_endian": true,
- "ptrdiff_t": "int",
- "size_t": "unsigned int",
- "sizeof_double": 8,
- "sizeof_float": 4,
- "sizeof_fun": -1,
- "sizeof_int": 2,
- "sizeof_long": 4,
- "sizeof_longdouble": 16,
- "sizeof_longlong": 8,
- "sizeof_ptr": 4,
- "sizeof_short": 2,
- "sizeof_void": -1,
- "version": "none",
- "wchar_t": "int"
-}
diff --git a/share/machdeps/machdep_x86_32.json b/share/machdeps/machdep_x86_32.json
deleted file mode 100644
index 44d776d1d3f..00000000000
--- a/share/machdeps/machdep_x86_32.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "alignof_aligned": 16,
- "alignof_double": 4,
- "alignof_float": 4,
- "alignof_fun": -1,
- "alignof_int": 4,
- "alignof_long": 4,
- "alignof_longdouble": 4,
- "alignof_longlong": 4,
- "alignof_ptr": 4,
- "alignof_short": 2,
- "alignof_str": 1,
- "char_is_unsigned": false,
- "compiler": "generic",
- "cpp_arch_flags": [
- "-m32"
- ],
- "has__builtin_va_list": true,
- "little_endian": true,
- "ptrdiff_t": "int",
- "size_t": "unsigned int",
- "sizeof_double": 8,
- "sizeof_float": 4,
- "sizeof_fun": -1,
- "sizeof_int": 4,
- "sizeof_long": 4,
- "sizeof_longdouble": 12,
- "sizeof_longlong": 8,
- "sizeof_ptr": 4,
- "sizeof_short": 2,
- "sizeof_void": -1,
- "version": "gcc (GCC) 12.2.1 20230201",
- "wchar_t": "long"
-}
diff --git a/share/machdeps/machdep_x86_64.json b/share/machdeps/machdep_x86_64.json
deleted file mode 100644
index b3b357f58cf..00000000000
--- a/share/machdeps/machdep_x86_64.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "alignof_aligned": 16,
- "alignof_double": 8,
- "alignof_float": 4,
- "alignof_fun": -1,
- "alignof_int": 4,
- "alignof_long": 8,
- "alignof_longdouble": 16,
- "alignof_longlong": 8,
- "alignof_ptr": 8,
- "alignof_short": 2,
- "alignof_str": 1,
- "char_is_unsigned": false,
- "compiler": "generic",
- "cpp_arch_flags": [ "-m64" ],
- "has__builtin_va_list": true,
- "little_endian": true,
- "ptrdiff_t": "long",
- "size_t": "unsigned long",
- "sizeof_double": 8,
- "sizeof_float": 4,
- "sizeof_fun": -1,
- "sizeof_int": 4,
- "sizeof_long": 8,
- "sizeof_longdouble": 16,
- "sizeof_longlong": 8,
- "sizeof_ptr": 8,
- "sizeof_short": 2,
- "sizeof_void": -1,
- "version": "clang version 15.0.7",
- "wchar_t": "int"
-}
--
GitLab