Hakefiles: remove x86_32 from architectures
authorReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 20 Aug 2019 16:01:39 +0000 (18:01 +0200)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 20 Aug 2019 17:43:08 +0000 (19:43 +0200)
Signed-off-by: Reto Achermann <reto.achermann@inf.ethz.ch>

54 files changed:
lib/acpi_client/Hakefile
lib/acpica/Hakefile
lib/barrelfish/Hakefile
lib/bench/Hakefile
lib/driverkit/Hakefile
lib/elf/Hakefile
lib/gdtoa/Hakefile
lib/libc/Hakefile
lib/libc/gdtoa/Hakefile
lib/libc/gen/Hakefile
lib/libc/inet/Hakefile
lib/libc/locale/Hakefile
lib/libc/nls/Hakefile
lib/libc/resolv/Hakefile
lib/libc/stdio/Hakefile
lib/libc/stdlib/Hakefile
lib/libc/string/Hakefile
lib/libc/sys/Hakefile
lib/net/Hakefile
lib/openssl-1.0.0d/Hakefile
lib/pci/Hakefile
lib/posixcompat/Hakefile
lib/spawndomain/Hakefile
usr/acpi/Hakefile
usr/bench/Hakefile
usr/bench/ahci/Hakefile
usr/bench/largepage/Hakefile
usr/bench/mem_appel/Hakefile
usr/bench/mem_bench/Hakefile
usr/block_server/Hakefile
usr/block_server_user/Hakefile
usr/bulk_transfer_passthrough/Hakefile
usr/drivers/ahcid/Hakefile
usr/drivers/cpuboot/Hakefile
usr/drivers/megaraid/Hakefile
usr/drivers/serial/Hakefile
usr/drivers/vbe/Hakefile
usr/examples/xmpl-thc-lang/Hakefile
usr/fish/Hakefile
usr/kaluga/Hakefile
usr/mem_serv_dist/Hakefile
usr/monitor/Hakefile
usr/pci/Hakefile
usr/proc_mgmt/Hakefile
usr/skb/Hakefile
usr/spawnd/Hakefile
usr/startd/Hakefile
usr/tests/filetests/Hakefile
usr/tests/large_page/Hakefile
usr/tests/memtest/Hakefile
usr/tests/multihoptest/Hakefile
usr/tests/nkm/Hakefile
usr/tests/octopus/Hakefile
usr/vnode_map_test/Hakefile

index 54bd50d..16eecf9 100644 (file)
@@ -8,7 +8,7 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for lib/pci
--- 
+--
 --------------------------------------------------------------------------
 
 [ build library { target = "acpi_client",
@@ -16,6 +16,6 @@
                   flounderBindings = [ "acpi" ],
                   flounderExtraBindings = [ ("acpi", ["rpcclient"]) ],
                   flounderExtraDefs = [ ("monitor_blocking", ["rpcclient"]) ],
-                  architectures = [ "x86_64", "x86_32", "armv8" ]
+                  architectures = [ "x86_64", "armv8" ]
                 }
 ]
index 225ac88..7a7cb75 100644 (file)
@@ -7,7 +7,7 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for usr/pci/acpica
--- 
+--
 --------------------------------------------------------------------------
 let subdirs = [ "source/components/dispatcher",
                 "source/components/events",
@@ -220,6 +220,6 @@ in
                         "-fno-strict-aliasing" ] ++ (flagsArch arch),
          addIncludes = [ "source/include", "source/tools/acpidump" ],
          architectures = [ arch ]
-                  } | arch <- [ "x86_64", "x86_32", "armv8" ]
+                  } | arch <- [ "x86_64", "armv8" ]
   ]
 
index ffde9d6..f98657f 100644 (file)
@@ -33,13 +33,6 @@ let
                   ]
 
     -- sources specific to the architecture family
-    archfam_srcs "x86_32"  = [ "arch/x86_32/debug.c" ,
-                           "arch/x86_32/dispatch.c" , "arch/x86_32/syscalls.c" ,
-                           "arch/x86_32/sys_debug.c", "arch/x86_32/pmap.c",
-                           "arch/x86/pmap.c", "vspace/arch/x86_32/layout.c",
-                           "vspace/memobj_pinned.c", "vspace/pinned.c",
-                           "arch/x86/perfmon.c", "arch/x86/tls.c",
-                           "arch/x86/sys_debug.c"]
     archfam_srcs "x86_64"  = [ "arch/x86_64/debug.c", "arch/x86_64/dispatch.c" ,
                               "arch/x86_64/syscalls.c", "arch/x86_64/sys_debug.c",
                               "arch/x86_64/ldt.c", "arch/x86_64/pmap.c",
@@ -68,12 +61,10 @@ let
     archfam_srcs _         = []
 
     -- sources specific to the architecture
-    arch_srcs "x86_32" = [ "arch/x86/ipi_notify.c" ]
     arch_srcs "x86_64" = [ "arch/x86/ipi_notify.c" ]
     arch_srcs "k1om" = [ "arch/x86/ipi_notify.c" ]
     arch_srcs _     = []
 
-    arch_assembly "x86_32"  = [ "arch/x86_32/entry.S" ]
     arch_assembly "x86_64"  = [ "arch/x86_64/entry.S" ]
     arch_assembly "k1om"    = [ "arch/x86_64/entry.S" ]
     arch_assembly "arm"     = [ "arch/arm/entry.S", "arch/arm/syscall.S" ]
@@ -98,9 +89,6 @@ let
         "large" -> "LARGE_PAGE_SIZE"
         "huge"  -> "HUGE_PAGE_SIZE"
         _       -> "BASE_PAGE_SIZE"
-    morecore_pagesize "x86_32" = case Config.morecore_pagesize of
-        "large" -> "LARGE_PAGE_SIZE"
-        _       -> "BASE_PAGE_SIZE"
     morecore_pagesize _ = "BASE_PAGE_SIZE"
 
     libraryos :: String -> Maybe Args.Args -> Args.Args
index 8b3c95f..156055f 100644 (file)
@@ -7,13 +7,12 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for lib/bench
--- 
+--
 --------------------------------------------------------------------------
 
 [(let
      common_srcs = [ "bench.c", "bench_ctl.c" ]
 
-     arch_srcs "x86_32"        = [ "arch/x86/bench_arch.c" ]
      arch_srcs "x86_64"        = [ "arch/x86/bench_arch.c" ]
      arch_srcs "k1om"          = [ "arch/x86/bench_arch.c" ]
      arch_srcs "arm"           = [ "arch/arm/bench_arch.c" ]
index 5268dff..44443eb 100644 (file)
@@ -18,7 +18,7 @@
         flounderDefs = [
             "ddomain",
             "dcontrol",
-            "iommu", 
+            "iommu",
             "mem"
         ],
         flounderBindings = [
@@ -33,8 +33,8 @@
             ("iommu", ["rpcclient"])
         ],
         addLibraries = [ "collections", "skb" ],
-        cFiles = [ "dcontrol_client.c", 
-                   "dcontrol_service.c", 
+        cFiles = [ "dcontrol_client.c",
+                   "dcontrol_service.c",
                    "ddomain_client.c",
                    "ddomain_service.c",
                    "map_devices.c",
@@ -54,8 +54,8 @@
             ("iommu", ["rpcclient"])
         ],
         addLibraries = [ "collections", "skb" ],
-        cFiles = [ "hwmodel.c", 
+        cFiles = [ "hwmodel.c",
                    "iommu_client.c" ],
-        architectures = [ "x86_64", "k1om", "armv8"]
+        architectures = [ "x86_64", "k1om", "armv8", "armv7" ]
     }
 ]
index 12730a9..8882209 100644 (file)
@@ -7,7 +7,7 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for lib/elf
--- 
+--
 --------------------------------------------------------------------------
 
 [
@@ -21,6 +21,6 @@
                            "-mno-sse3", "-mno-ssse3", "-mno-sse4.1",
                            "-mno-sse4.2", "-mno-sse4", "-mno-sse4a",
                            "-mno-3dnow" ],
-             architectures = [ "x86_64", "x86_32", "k1om" ]
+             architectures = [ "x86_64", "k1om" ]
            }
 ]
index 7966b55..f028889 100644 (file)
@@ -23,7 +23,6 @@
             "strtopx.c", "strtopxL.c", "strtorQ.c", "strtord.c", "strtordd.c", "strtorf.c",
             "strtorx.c", "strtorxL.c", "sum.c", "ulp.c" ],
         addIncludes = [ "/lib/libc/include", "/lib/libc/locale" ] ++ (case arch of
-                        "x86_32" ->  [ "/lib/libc/x86" ]
                         "x86_64" ->  [ "/lib/libc/amd64" ]
                         "k1om" ->  [ "/lib/libc/amd64" ]
                         "armv7" ->  [ "/lib/libc/arm" ]
index 114db46..3bd4b7d 100644 (file)
@@ -13,7 +13,7 @@
 let
     arch_srcs "x86_64"  = [ "amd64/" ++ x | x <- ["gen/fabs.S", "gen/setjmp.S", "gen/_setjmp.S", "string/memcpy.S", "string/memset.S"]]
     arch_srcs "k1om"    = [ "amd64/" ++ x | x <- ["gen/setjmp.S", "gen/_setjmp.S", "string/memcpy.S", "string/memset.S"]]
-    arch_srcs "armv7"   = [ "arm/" ++ x | x <- ["gen/setjmp.S", "string/memcpy.S", "string/memset.S", "aeabi/aeabi_vfp_double.S", "aeabi/aeabi_vfp_float.S"]]
+    arch_srcs "armv7"   = [ "arm/" ++ x | x <- ["gen/setjmp.S", "gen/_setjmp.S", "string/memcpy.S", "string/memset.S", "aeabi/aeabi_vfp_double.S", "aeabi/aeabi_vfp_float.S"]]
     arch_srcs "armv8"   = [ "aarch64/" ++ x | x <- ["gen/setjmp.S", "gen/_setjmp.S",  "gen/fabs.S"]]
     arch_srcs  x        = error ("Unknown architecture for libc: " ++ x)
 in
index 758f422..8dc38b0 100644 (file)
@@ -15,7 +15,6 @@
         target = "libc_gdtoa",
         cFiles = concat [ find cInDir "." ],
         addIncludes = [ "../include", "../locale", "/lib/gdtoa" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index 4c67bae..6989644 100644 (file)
@@ -15,7 +15,6 @@
         target = "libc_gen",
         cFiles = concat [ find cInDir "." ],
         addIncludes = [ "../include", "../locale", "/lib/tzcode/stdtime" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index cee4972..92d0983 100644 (file)
@@ -15,7 +15,6 @@
         target = "libc_inet",
         cFiles = concat [ find cInDir "." ],
         addIncludes = [ "../include", "../locale" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index d9c8a1c..d4737ea 100644 (file)
@@ -15,7 +15,6 @@
         target = "locale",
         cFiles = concat [ find cInDir "." ],
         addIncludes = [ "../include", "../locale" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index ae0e776..457ce5f 100644 (file)
@@ -15,7 +15,6 @@
         target = "libc_nls",
         cFiles = concat [ find cInDir "." ],
         addIncludes = [ "../include", "../locale" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index ad7d362..0a3ce08 100644 (file)
@@ -15,7 +15,6 @@
         target = "libc_resolv",
         cFiles = [ "h_errno.c", "herror.c", "res_state.c", "res_init.c" ],
         addIncludes = [ "../include", "../locale" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index f95b271..4a9d0cb 100644 (file)
@@ -15,7 +15,6 @@
         target = "stdio",
         cFiles = concat [ find cInDir "." ],
         addIncludes = [ "../include", "../locale" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index b15648b..8de0d3a 100644 (file)
@@ -15,7 +15,6 @@
         target = "stdlib",
         cFiles = concat [ find cInDir "." ],
         addIncludes = [ "../include", "/lib/libc/locale" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index 04dba98..675c6ce 100644 (file)
@@ -15,7 +15,6 @@
         target = "string",
         cFiles = concat [ find cInDir "." ],
         addIncludes = [ "../include", "../locale" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index 8f9de79..2d8c3cc 100644 (file)
@@ -15,7 +15,6 @@
         target = "libc_sys",
         cFiles = [ "__error.c", "interposing_table.c", "barrelfish_mmap.c", "barrelfish_syscalls.c" ],
         addIncludes = [ "../include", "../locale" ] ++ (case arch of
-                        "x86_32" ->  [ "../x86" ]
                         "x86_64" ->  [ "../amd64" ]
                         "k1om" ->  [ "../amd64" ]
                         "armv7" ->  [ "../arm" ]
index 8bc8f3a..f1aa3ab 100644 (file)
     flounderDefs = [ "net_filter", "octopus", "net_ARP" ],
     flounderExtraDefs = [ ("net_filter",["rpcclient"]) ],
     addLibraries = libDeps [ "lwip2", "devif", "devif_backend_idc",
+                             "devif_backend_loopback",
+                             "debug_log", "net_sockets",
+                             "octopus", "octopus_parser" , "driverkit_iommu",
+                             "queue_service_client"],
+    architectures = ["armv7"]
+  },
+
+build library {
+    target       = "net",
+    cFiles       = [ "net.c", "netbufs.c",  "netif.c", "pbuf.c", "dhcp.c",
+                     "net_filter.c", "arp.c", "net_queue.c"],
+    flounderBindings = [ "net_filter", "net_ARP"],
+    flounderDefs = [ "net_filter", "octopus", "net_ARP" ],
+    flounderExtraDefs = [ ("net_filter",["rpcclient"]) ],
+    addLibraries = libDeps [ "lwip2", "devif", "devif_backend_idc",
                              "devif_backend_solarflare", "devif_backend_e10k",
                              "devif_backend_loopback",  "devif_backend_e1000",
-                             "devif_backend_mlx4", "debug_log", "net_sockets", 
+                             "devif_backend_mlx4", "debug_log", "net_sockets",
                              "octopus", "octopus_parser" , "driverkit_iommu",
-                             "queue_service_client"]
+                             "queue_service_client"],
+    architectures = [ "armv8", "x86_64" ]
   },
 
   build application {
     cFiles       = [ "test/udp_echo.c" ],
     addLibraries = libDeps [ "net", "lwip2" ]
   },
-  
+
   build application {
     target       = "ping",
     cFiles       = [ "test/ping.c" ],
     addLibraries = libDeps [ "net", "lwip2" ]
   },
-  
+
   build application {
     target       = "udp_ping",
     cFiles       = [ "test/udp_ping.c" ],
index ced51f2..2d27942 100644 (file)
@@ -11,9 +11,9 @@
 --------------------------------------------------------------------------
 -- file list generated with this command:
 -- asq@schlaptop2:~/tmp/openssl/compile_linux/openssl-1.0.0d/crypto$ \
--- for i in [ `objdump -f libcrypto.a |sed -e '/o:/!d' -e 's/o:.*/c/' `; \ 
+-- for i in [ `objdump -f libcrypto.a |sed -e '/o:/!d' -e 's/o:.*/c/' `; \
 -- do find . -name $i; done |sed -e 's/^/"/'|sed -e 's/$/",/' >> \
--- /home/asq/hg/barrelfish.dyn_adpt/usr/skb/testapps/openssl-1.0.0d/crypto/Hakefile 
+-- /home/asq/hg/barrelfish.dyn_adpt/usr/skb/testapps/openssl-1.0.0d/crypto/Hakefile
 
 
 
                                  "-Wmissing-declarations",
                                  "-Wmissing-field-initializers",
                                  "-Wredundant-decls", "-std=c99" ],
-                 architectures = [ "x86_64", "x86_32" ]
+                 architectures = [ "x86_64" ]
                 }
 ]
 
index 3db57ad..d810af1 100644 (file)
@@ -8,17 +8,17 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for lib/pci
--- 
+--
 --------------------------------------------------------------------------
 
-[ 
+[
 
   build library { target = "pci_driver_client",
                   cFiles = [ "pci_driver_client.c" ],
                   flounderBindings = [ "pci_driver_client" ],
                   flounderExtraBindings = [ ("pci_driver_client", ["rpcclient"]) ],
                   flounderExtraDefs = [  ],
-                  architectures = [ "x86_64", "x86_32", "armv8" ],
+                  architectures = [ "x86_64", "armv8" ],
                   addLibraries = libDeps [ "int_route_client" ]
                 },
 
                   flounderBindings = [ "pci" ],
                   flounderExtraBindings = [ ("pci", ["rpcclient"]) ],
                   flounderExtraDefs = [ ("monitor_blocking",["rpcclient"]) ],
-                  architectures = [ "x86_64", "x86_32", "armv8" ],
+                  architectures = [ "x86_64", "armv8" ],
                   addLibraries = libDeps [ "acpi_client", "int_route_client" ]
                 },
-  
+
   -- XXX: This library is a bit weird right now.
   -- I added this to avoid code duplication in acpi/pci because they both have to
   -- read/write the PCI configuration space (see acpi_osglue.c).
@@ -40,6 +40,6 @@
   build library { target = "pciconfspace",
                   flounderExtraDefs = [ ("acpi", ["rpcclient"]) ],
                   cFiles = [ "confspace/pci_confspace.c", "confspace/pcie_confspace.c" ],
-                  architectures = [ "x86_64", "x86_32", "armv8" ]
+                  architectures = [ "x86_64", "armv8" ]
                 }
 ]
index c139f21..5328a5f 100644 (file)
@@ -104,7 +104,7 @@ in
         flounderExtraBindings = [ ("octopus", [ "rpcclient" ]) ],
         flounderTHCStubs = [ "octopus" ],
         addLibraries = libDeps [ "vfs_ramfs",  "term_server", "octopus", "lwip" ],
-        architectures = [ "x86_32", "k1om", "armv7", "armv8" ]
+        architectures = [ "k1om", "armv7", "armv8" ]
     },
     build library {
         target = "posixcompat_arrakis",
index 567afb4..6fe698a 100644 (file)
@@ -7,14 +7,13 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for lib/spawndomain
--- 
+--
 --------------------------------------------------------------------------
 
 [(let
      common_srcs = [ "spawn_vspace.c", "spawn.c", "getopt.c", "multiboot.c",
                      "spawn_omp.c" ]
 
-     arch_srcs "x86_32"  = [ "arch/x86/spawn_arch.c" ]
      arch_srcs "x86_64"  = [ "arch/x86/spawn_arch.c" ]
      arch_srcs "k1om"    = [ "arch/x86/spawn_arch.c" ]
      arch_srcs "arm"     = [ "arch/arm/spawn_arch.c" ]
@@ -24,7 +23,7 @@
   in
     build library { target = "spawndomain",
                     cFiles = common_srcs ++ arch_srcs (archFamily arch),
-                    addIncludes = [ "/lib/barrelfish/include/arch" 
+                    addIncludes = [ "/lib/barrelfish/include/arch"
                                     </> archFamily arch ],
                     flounderDefs = [ "monitor", "octopus" ],
                     flounderExtraDefs = [ ("octopus", ["rpcclient"]) ],
index 1ea90b0..e14357e 100644 (file)
@@ -23,7 +23,6 @@ let commonCFiles = [
         ]
 
     archCFiles arch = case arch of
-        "x86_32" -> archCFiles "x86_64"
         "x86_64" -> [
             "acpi_ec.c",
             "arch/x86/ioapic.c",
@@ -44,7 +43,6 @@ let commonCFiles = [
     commonDevices = [ "lpc_ioapic" ]
 
     archDevices arch = case arch of
-        "x86_32" -> archDevices "x86_64"
         "x86_64" -> ["acpi_ec"]
         "armv8" -> [ ]
 
@@ -53,7 +51,6 @@ let commonCFiles = [
         "-Wno-unused-function" ]
 
     archCFlags arch = case arch of
-        "x86_32" -> archCFlags "x86_64"
         "x86_64" -> [ "-DACPI_PROBE_ECDT", "-DACPI_HAVE_VTD" ]
         "armv8" -> [ "-DACPI_REDUCED_HARDWARE=1", "-DACPI_MISALIGNMENT_NOT_SUPPORTED" ]
 
@@ -81,5 +78,5 @@ let commonCFiles = [
             "thc",
             "acpi_client" ],
         architectures = [ arch ] }
-        | arch <- [ "x86_64", "x86_32", "armv8" ]
+        | arch <- [ "x86_64", "armv8" ]
     ]
index d43076e..5c71498 100644 (file)
@@ -15,7 +15,7 @@
   build application { target = "stsc_bench",
                       cFiles = ["stsc_bench.c"],
                       addLibraries = [ "rcce" ],
-                      architectures = ["x86_64", "x86_32"]
+                      architectures = ["x86_64"]
                     },
 
   build application { target = "lrpc_bench",
index bdfd27d..fa8107d 100644 (file)
@@ -7,12 +7,13 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for bmp_bench
--- 
+--
 --------------------------------------------------------------------------
 
 [
 build application { target = "ahci_bench",
                   cFiles = [ "main.c" ],
-                  addLibraries = libDeps [ "pci", "trace", "skb", "vfs", "lwip" ]
+                  addLibraries = libDeps [ "pci", "trace", "skb", "vfs", "lwip" ],
+                  architectures = ["armv8", "x86_64"]
                  }
 ]
index 404646d..37b3ceb 100644 (file)
@@ -7,12 +7,13 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for bmp_bench
--- 
+--
 --------------------------------------------------------------------------
 
 [
 build application { target = "largepage_64_bench",
                   cFiles = [ "largepage_64_bench.c" ],
-                  addLibraries = [ "bench"]
+                  addLibraries = [ "bench"],
+                  architectures = ["armv8", "x86_64"]
                   }
 ]
index bcb75db..0677b4e 100644 (file)
 
 [ build application { target = "benchmarks/mem_appel",
                       cFiles = [ "vmpup.c" ],
-                      addLibraries = libDeps [ "posixcompat"]
+                      addLibraries = libDeps [ "posixcompat"],
+                      architectures = ["x86_64", "armv8", "k1om"]
                     },
   build application { target = "benchmarks/mem_appel_di",
                       cFiles = [ "vmpup.c" ],
                       addLibraries = libDeps [ "posixcompat"],
-                      addCFlags = [ "-DDIRECT_INVOKE" ]
+                      addCFlags = [ "-DDIRECT_INVOKE" ],
+                      architectures = ["x86_64", "armv8", "k1om"]
                     },
   build application { target = "benchmarks/mem_appel_ff",
                       cFiles = [ "vmpup.c" ],
                       addLibraries = libDeps [ "posixcompat"],
-                      addCFlags = [ "-DFULL_FLUSH" ]
+                      addCFlags = [ "-DFULL_FLUSH" ],
+                      architectures = ["x86_64", "armv8", "k1om"]
                     },
   build application { target = "benchmarks/mem_appel_di_ff",
                       cFiles = [ "vmpup.c" ],
                       addLibraries = libDeps [ "posixcompat"],
-                      addCFlags = [ "-DFULL_FLUSH", "-DDIRECT_INVOKE" ]
+                      addCFlags = [ "-DFULL_FLUSH", "-DDIRECT_INVOKE" ],
+                      architectures = ["x86_64", "armv8", "k1om"]
                     },
   build application { target = "benchmarks/mem_appel_sf",
                       cFiles = [ "vmpup.c" ],
                       addLibraries = libDeps [ "posixcompat"],
-                      addCFlags = [ "-DSELECTIVE_FLUSH" ]
+                      addCFlags = [ "-DSELECTIVE_FLUSH" ],
+                      architectures = ["x86_64", "armv8", "k1om"]
                     },
   build application { target = "benchmarks/mem_appel_sfh",
                       cFiles = [ "vmpup.c" ],
                       addLibraries = libDeps [ "posixcompat"],
-                      addCFlags = [ "-DSELECTIVE_FLUSH", "-DSF_HINT" ]
+                      addCFlags = [ "-DSELECTIVE_FLUSH", "-DSF_HINT" ],
+                      architectures = ["x86_64", "armv8", "k1om"]
                     },
   build application { target = "benchmarks/mem_appel_di_sf",
                       cFiles = [ "vmpup.c" ],
                       addLibraries = libDeps [ "posixcompat"],
-                      addCFlags = [ "-DDIRECT_INVOKE", "-DSELECTIVE_FLUSH" ]
+                      addCFlags = [ "-DDIRECT_INVOKE", "-DSELECTIVE_FLUSH" ],
+                      architectures = ["x86_64", "armv8", "k1om"]
                     },
   build application { target = "benchmarks/mem_appel_di_sfh",
                       cFiles = [ "vmpup.c" ],
                       addLibraries = libDeps [ "posixcompat"],
-                      addCFlags = [ "-DDIRECT_INVOKE", "-DSELECTIVE_FLUSH", "-DSF_HINT" ]
+                      addCFlags = [ "-DDIRECT_INVOKE", "-DSELECTIVE_FLUSH", "-DSF_HINT" ],
+                      architectures = ["x86_64", "armv8", "k1om"]
                     }
 ]
index 26ceeb6..b46f19b 100644 (file)
 [
 build application { target = "mem_kpi_bench",
                   cFiles = [ "membench.c" ],
-                  addLibraries = [ "bench"]
+                  addLibraries = [ "bench"],
+                  architectures = [ "x86_64" ]
                   },
 build application { target = "mem_kpi_loadgen",
                   cFiles = [ "membench.c" ],
                   addLibraries = [ "bench"],
-                  addCFlags = [ "-DLOADGEN" ]
+                  addCFlags = [ "-DLOADGEN" ],
+                  architectures = [ "x86_64" ]
                   },
 
 build application { target = "memeasy",
index acab2f5..59d5fa9 100644 (file)
@@ -17,7 +17,7 @@
     addLibraries = libDeps [ "bulk_transfer", "lwip", "net_if_raw", "bench"],
     flounderDefs = [ "block_service", "bulk_ctrl", "net_queue_manager" ],
     flounderBindings = [ "block_service", "bulk_ctrl" ],
-    architectures = [ "x86_64", "x86_32" ],
+    architectures = [ "x86_64" ],
     mackerelDevices = [ "e10k", "e10k_q" ] --  used by bulk_transfer
   },
 
@@ -29,7 +29,7 @@
     addLibraries = libDeps [ "bulk_transfer", "lwip", "bench" ],
     flounderDefs = [ "block_service", "bulk_ctrl", "net_queue_manager" ],
     flounderBindings = [ "block_service", "bulk_ctrl" ],
-    architectures = [ "x86_64", "x86_32" ],
+    architectures = [ "x86_64" ],
     mackerelDevices = [ "e10k", "e10k_q" ] -- used by bulk_transfer
   }
 ]
\ No newline at end of file
index bdbcf9e..f2be33c 100644 (file)
@@ -16,6 +16,6 @@
     addLibraries = libDeps [ "bulk_transfer"],
     flounderDefs = [ "block_service" ],
     flounderBindings = [ "block_service", "bulk_ctrl" ],
-    architectures = [ "x86_64", "x86_32" ]
+    architectures = [ "x86_64" ]
   }
 ]
index 1ac2806..1a13b2f 100644 (file)
@@ -16,7 +16,7 @@
     flounderDefs = [ "bulk_ctrl" ],
     flounderBindings = [ "bulk_ctrl" ],
     addLibraries = libDeps [ "bulk_transfer"],
-    architectures = [ "x86_64", "x86_32" ],
+    architectures = [ "x86_64" ],
     mackerelDevices = [ "e10k", "e10k_q" ] -- used by bulk_transfer
   }
 ]
index 809fda5..01a5e3d 100644 (file)
@@ -16,7 +16,8 @@
         mackerelDevices = [ "ata_identify", "ahci_port", "ahci_hba" ],
         cFiles = [ "ahcid.c", "test.c" ],
         addCFlags = ["-Wno-unused-variable", "-Wno-unused-function"],
-        addLibraries = [ "blk", "pci", "skb", "bench", "devif" ]
+        addLibraries = [ "blk", "pci", "skb", "bench", "devif" ],
+        architectures = [ "x86_64", "armv8" ]
     },
 
     build application {
@@ -24,6 +25,7 @@
         mackerelDevices = [ "ata_identify", "ahci_port", "ahci_hba" ],
         cFiles = [ "ahcid.c", "test.c" ],
         addCFlags = ["-DTESTING"],
-        addLibraries = [ "blk", "pci", "skb", "bench" , "devif"]
+        addLibraries = [ "blk", "pci", "skb", "bench" , "devif"],
+        architectures = [ "x86_64", "armv8" ]
     }
 ]
index 36cd20f..117aea2 100644 (file)
@@ -13,7 +13,6 @@
 let commonCFiles = [ "common.c", "main.c" ]
 
     archCFiles arch = case arch of
-        "x86_32" -> [ "arch/x86/boot_arch.c" ]
         "x86_64" -> [ "arch/x86/boot_arch.c" ]
         "k1om"   -> [ "arch/x86/boot_arch.c" ]
         "armv7"  -> [ "arch/armv7/boot_arch.c" ]
@@ -25,7 +24,6 @@ let commonCFiles = [ "common.c", "main.c" ]
 
     archIncludes arch = case arch of
         "x86_64" -> [ "../../../kernel/include/arch/x86_64/"]
-        "x86_32" -> [ "../../../kernel/include/arch/x86_32/"]
         "k1om"   -> [ "../../../kernel/include/arch/x86_64/"]
         "armv7"  -> [ "../../../kernel/include/arch/armv7/"]
         "armv8"  -> [ "../../../kernel/include/arch/armv8/"]
@@ -36,14 +34,12 @@ let commonCFiles = [ "common.c", "main.c" ]
 
     archFlounderDefs arch = case arch of
         "x86_64" -> [ "acpi" ]
-        "x86_32" -> [ "acpi" ]
         "k1om"   -> []
         "armv7"  -> []
         "armv8"  -> [ "acpi" ]
 
     archFlounderExtraDefs arch =  case arch of
         "x86_64" -> [ ("monitor_blocking", ["rpcclient"]), ("acpi", ["rpcclient"]) ]
-        "x86_32" -> [ ("monitor_blocking", ["rpcclient"]), ("acpi", ["rpcclient"]) ]
         "k1om"   -> [ ("monitor_blocking", ["rpcclient"]) ]
         "armv7"  -> [ ("monitor_blocking", ["rpcclient"]) ]
         "armv8"  -> [ ("monitor_blocking", ["rpcclient"]), ("acpi", ["rpcclient"]) ]
@@ -52,9 +48,8 @@ let commonCFiles = [ "common.c", "main.c" ]
 
     commonLibraries = [ "spawndomain", "elf", "octopus", "bench", "skb" ]
 
-    archLibraries arch = case arch of 
+    archLibraries arch = case arch of
         "x86_64" -> [ "vfs", "acpi_client" ]
-        "x86_32" -> [ "vfs",  "acpi_client" ]
         "k1om"   -> [ "vfs_noblockdev"  ]
         "armv7"  -> [ "vfs_ramfs" ]
         "armv8"  -> [ "vfs_ramfs", "acpi_client" ]
@@ -63,7 +58,6 @@ let commonCFiles = [ "common.c", "main.c" ]
 
     archAssembyFiles arch =  case arch of
         "x86_64" -> ["arch/x86/init_ap_x86_64.S", "arch/x86/init_ap_x86_32.S"]
-        "x86_32" -> ["arch/x86/init_ap_x86_64.S", "arch/x86/init_ap_x86_32.S"]
         "k1om"   -> ["arch/x86/init_ap_x86_64.S", "arch/x86/init_ap_x86_32.S"]
         _        -> []
 
@@ -76,9 +70,9 @@ let commonCFiles = [ "common.c", "main.c" ]
             assemblyFiles = archAssembyFiles arch,
             addLibraries = libDeps (commonLibraries ++ (archLibraries arch)),
             flounderDefs = commonFlounderDefs ++ (archFlounderDefs arch),
-            flounderExtraDefs = archFlounderExtraDefs arch, 
+            flounderExtraDefs = archFlounderExtraDefs arch,
             flounderBindings = [ "intermon", "octopus" ],
-            architectures = [ arch ] 
+            architectures = [ arch ]
         } | arch <- allArchitectures
 
       ]
index 99249b2..1610cce 100644 (file)
                       cFiles = [ "megaraid.c", "main.c", "megaraid_vsic.c" ],
                       mackerelDevices = [ "megaraid" ],
                       addLibraries = libDeps [ "driverkit", "skb", "pci", "lwip" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
   build library { target = "megaraid",
                       cFiles = [ "megaraid.c", "megaraid_vsic.c" ],
                       mackerelDevices = [ "megaraid" ],
                       addCFlags = [ "-DLIBRARY" ],
                       addLibraries = libDeps [ "driverkit", "skb", "pci", "lwip" ],
-                      architectures = [ "x86_64", "x86_32", "armv8" ]
+                      architectures = [ "x86_64", "armv8" ]
                     }
 ]
index 99208bb..8e9c92a 100644 (file)
@@ -8,10 +8,10 @@
 -- Attn: Systems Group.
 --
 -- Hakefile for drivers/serial
--- 
+--
 --------------------------------------------------------------------------
 
-[ 
+[
  --  build application { target = "serial_omap44xx",
  --                      cFiles = [ "serial_omap44xx.c", "main.c", "main_common.c"
  --                                 "basic_service.c", "terminal_service.c" ],
@@ -61,7 +61,7 @@
                       cFiles = [ "serial_pc16550d.c" ],
                       flounderDefs = [ "terminal" , "terminal_config",
                                        "terminal_session" ],
-                      architectures = [ "x86_32", "x86_64"],
+                      architectures = [ "x86_64"],
                       mackerelDevices = ["pc16550d"],
                       addLibraries = [ "serial_common", "int_route_client", "thc", "term_server"]
                     },
index c632a64..a19cfac 100644 (file)
@@ -7,12 +7,12 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for /usr/drivers/vbe
--- 
+--
 --------------------------------------------------------------------------
 
 [ build application { target = "vbe",
                       cFiles = [ "main.c", "vbe.c", "int10.c" ],
-                      architectures = [ "x86_64", "x86_32" ],
+                      architectures = [ "x86_64" ],
                       flounderBindings = ["fb"],
                       flounderExtraBindings = [ ("acpi", ["rpcclient"]) ],
                       addLibraries = [ "x86emu", "pci", "acpi_client" ]
index 8a52c77..158c114 100644 (file)
@@ -18,7 +18,7 @@
                      flounderBindings = [ "xmplthc" ],
                      flounderTHCStubs = [ "xmplthc" ],
                      addLibraries = [ "thc" ],
-                     architectures = [ "x86_64", "x86_32" ]
+                     architectures = [ "x86_64" ]
                     }
     -}
 ]
index f6147f7..ecf7d58 100644 (file)
 --
 --------------------------------------------------------------------------
 
-[ 
+[
 
   build application { target = "fish",
                       cFiles = [ "fish_common.c", "fish_x86.c", "font.c" ],
                       addLibraries = libDeps ["trace", "skb", "pci", "vfs", "acpi_client", "lwip", "octopus", "linenoise", "posixcompat" ],
                       flounderExtraBindings = [("acpi", ["rpcclient"]), ("octopus", ["rpcclient"])],
                       flounderBindings = [ "pixels", "acpi" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
   build application { target = "fish",
                       cFiles = [ "fish_common.c", "fish_x86.c", "font.c" ],
index 4bc9c26..813af3c 100644 (file)
@@ -32,7 +32,7 @@ let commonCFiles = [ "boot_modules.c",
                                                "acpi_client", "collections",
                                                "driverkit", "pci" , "queue_service"],
 
-                      architectures = [ "x86_64", "x86_32" ] },
+                      architectures = [ "x86_64" ] },
   build application { target = "kaluga",
                       cFiles = commonCFiles ++ ["start_pci.c"],
                       flounderDefs = [ "monitor" , "kaluga"],
@@ -63,7 +63,7 @@ let commonCFiles = [ "boot_modules.c",
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = libDeps [ "skb", "octopus", "vfs_ramfs",
                                                "spawndomain", "elf", "mm", "collections",
-                                               "trace", "int_route_client", 
+                                               "trace", "int_route_client",
                                                "driverkit", "pci", "queue_service"],
                       architectures = [ "armv8" ] }
 ]
index 917477f..7c95201 100644 (file)
@@ -30,7 +30,7 @@
                                                 ("monitor_blocking", ["rpcclient"])],
                     addLibraries = [ "mm", "trace", "skb", "dist" ]
                       ,
-                     architectures = [ "x86_64", "x86_32" ]
+                     architectures = [ "x86_64" ]
                     },
 
 -- fully thc
@@ -43,7 +43,7 @@
                                                 ("spawn", ["rpcclient"]),
                                                 ("monitor_blocking", ["rpcclient"])],
                       ,
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
 -}
   build application { target = "mem_bench",
index a3b3620..b16b0b2 100644 (file)
@@ -13,7 +13,6 @@
 [(let
      arch_dir = "arch" </> archFamily arch
 
-     arch_dirs "x86_32" = [ arch_dir, "arch/x86" ]
      arch_dirs "x86_64" = [ arch_dir, "arch/x86" ]
      arch_dirs "k1om"   = [ arch_dir, "arch/x86" ]
      arch_dirs _        = [ arch_dir ]
@@ -28,7 +27,6 @@
                      "capops/revoke.c", "capops/retype.c", "capops/init.c",
                      "capops/deletestep.c" ]
 
-     arch_srcs "x86_32"  = [ "arch/x86/boot.c", "arch/x86/inter.c", "arch/x86/monitor_server.c", "arch/x86/notify_ipi.c" ]
      arch_srcs "x86_64"  = [ "arch/x86/boot.c", "arch/x86/inter.c", "arch/x86/monitor_server.c", "arch/x86/notify_ipi.c" ]
      arch_srcs "k1om"    = [ "arch/x86/boot.c", "arch/x86/inter.c", "arch/x86/monitor_server.c", "arch/x86/notify_ipi.c" ]
      arch_srcs "armv7"   = [ "arch/armv7/boot.c", "arch/armv7/inter.c", "arch/armv7/monitor_server.c", "arch/armv7/notify_ipi.c" ]
             getsrcs "ump" = [ "ump_support.c" ]
             getsrcs "multihop" = [ "multihop_support.c" ]
             getsrcs _     = []
-            
+
      idc_libraries = concat $ map getsrcs $ optInterconnectDrivers $ options arch
           where
             getsrcs "multihop" = [ "collections" ]
             getsrcs _     = []
-                     
+
   in
     build application { target = "monitor",
                         architectures = [arch],
index 95d0d59..f652996 100644 (file)
@@ -4,7 +4,7 @@
 --
 -- This file is distributed under the terms in the attached LICENSE file.
 -- If you do not find this file, copies can be found by writing to:
--- ETH Zurich D-INFK, CAB F.78, Universitaetstrasse 6, CH-8092 Zurich. 
+-- ETH Zurich D-INFK, CAB F.78, Universitaetstrasse 6, CH-8092 Zurich.
 -- Attn: Systems Group.
 --
 -- Hakefile for /usr/pci, the PCI bus driver.
@@ -12,7 +12,7 @@
 --------------------------------------------------------------------------
 
 [  build application { target = "pci",
-                      flounderDefs = [ "acpi", "monitor", "monitor_blocking", "kaluga" , 
+                      flounderDefs = [ "acpi", "monitor", "monitor_blocking", "kaluga" ,
                                        "pci_iommu"],
                       flounderExtraDefs = [ ("monitor_blocking", ["rpcclient"]) ,
                                             ("pci_iommu", ["rpcclient"])],
                       mackerelDevices = [ "pci_hdr0", "pci_hdr1", "ht_config",
                                           "pci_sr_iov_cap", "pci_e1000_msix_cap",
                                           "pci_msix_cap" ],
-                      cFiles = [ "pcimain.c", "pci.c", "pci_service.c", 
+                      cFiles = [ "pcimain.c", "pci.c", "pci_service.c",
                                  "ht_config.c", "pcie.c", "pci_msix.c",
                                  "pci_int_ctrl.c"],
                       addCFlags = [ "-Wno-redundant-decls" ],
-                      addLibraries = [ "skb", "pciconfspace", "acpi_client", 
+                      addLibraries = [ "skb", "pciconfspace", "acpi_client",
                                        "octopus", "octopus_parser", "thc",
                                        "int_route_server" ],
-                      architectures = [ "x86_64", "x86_32", "armv8" ]
+                      architectures = [ "x86_64", "armv8" ]
                     }
 ]
index 4c4a889..c8cdd26 100644 (file)
 --------------------------------------------------------------------------
 
 [ build application { target = "proc_mgmt",
-                      cFiles = [ "main.c", "service.c", "spawnd_state.c", 
+                      cFiles = [ "main.c", "service.c", "spawnd_state.c",
                                  "domain.c" ],
                       addLibraries = libDeps [ "skb", "dist", "lwip",
                                                "collections" ],
                       flounderDefs = [ "monitor", "monitor_blocking" ],
-                      flounderExtraDefs = [ ("monitor_blocking",["rpcclient"]), 
+                      flounderExtraDefs = [ ("monitor_blocking",["rpcclient"]),
                                             ("spawn",["rpcclient"]) ],
                       flounderBindings = [ "proc_mgmt" ],
-                      architectures = [ "x86_64", "x86_32" , "k1om", "armv7", 
+                      architectures = [ "x86_64" , "k1om", "armv7",
                                         "armv8"]
                     }
 ]
index 6c5094f..2818702 100644 (file)
@@ -18,7 +18,7 @@ let ramfs_files = find inDir "programs" ".pl" ++
                         target = "skb",
                                cFiles = [ "skb_main.c", "skb_service.c", "queue.c",
                                    "octopus/code_generator.c",
-                                   "octopus/predicates.c", "octopus/skb_query.c", 
+                                   "octopus/predicates.c", "octopus/skb_query.c",
                                    "octopus/skiplist.c", "octopus/fnv.c", "octopus/bitfield.c" ],
                         -- some include files cause problems...
                         omitCFlags = [ "-Wshadow", "-Wstrict-prototypes" ],
@@ -28,13 +28,13 @@ let ramfs_files = find inDir "programs" ".pl" ++
                         addIncludes = [ "/usr/eclipseclp/Kernel/src"],
                         addLibraries = libDeps [ "eclipse", "shm", "dummies",
                                                  "icsolver", "vfs_ramfs",
-                                                 "posixcompat", "hashtable", "pcre", 
+                                                 "posixcompat", "hashtable", "pcre",
                                                  "octopus_server", "octopus_parser", "skb",
                                                  "bench", "lwip" ],
                        architectures = [ arch ]
                 }
 in
-  [ Rules [build (args arch) | arch <- [ "x86_64", "x86_32", "armv8", "armv7" ]],
+  [ Rules [build (args arch) | arch <- [ "x86_64", "armv8", "armv7" ]],
     Rule ( [ Str "bash",
              In SrcTree "src" "skripts/mkcpio",
              NoDep SrcTree "src" "", Out "root" ramdisk]
index 0b476e8..7535a6d 100644 (file)
@@ -17,7 +17,7 @@
                       flounderDefs = [ "monitor", "monitor_blocking" ],
                       flounderExtraDefs = [ ("monitor_blocking",["rpcclient"]) ],
                       flounderBindings = [ "spawn" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
   build application { target = "spawnd",
                       cFiles = [ "main.c", "service.c", "ps.c" ],
index 1cc3cf5..6a50c0b 100644 (file)
@@ -16,7 +16,7 @@
                                        "dist", "vfs" ],
                       flounderDefs = [ "proc_mgmt" ],
                       flounderExtraDefs = [ ("proc_mgmt",["rpcclient"]) ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                    },
  build application { target = "startd",
                       cFiles = [ "main.c", "spawn.c" ],
index 09189b7..df58a06 100644 (file)
   build application { target = "fread_test",
                       cFiles = [ "fread_test.c" ],
                       addLibraries = libDeps ["vfs", "lwip" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
   build application { target = "fscanf_test",
                       cFiles = [ "fscanf_test.c" ],
                       addLibraries = libDeps ["vfs", "lwip" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
   build application { target = "fread_test",
                       cFiles = [ "fread_test.c" ],
@@ -32,6 +32,6 @@
   build application { target = "fat_test",
                       cFiles = [ "fat_test.c" ],
                       addLibraries = libDeps ["vfs", "lwip" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     }
   ]
index 61b4b87..b929d36 100644 (file)
@@ -7,7 +7,7 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for /usr/tests/large_page
--- 
+--
 --------------------------------------------------------------------------
 
 [ build application { target = "test_large_mappings",
@@ -20,7 +20,7 @@
                     },
   build application { target = "test_large_mappings",
                       cFiles = [ "map_test_32.c" ],
-                      architectures = [ "x86_32", "armv7" ]
+                      architectures = [ "armv7" ]
                     }
 
 ]
index 0c53cd7..d2d8276 100644 (file)
@@ -15,7 +15,8 @@
 [ build application { target = "memtest", cFiles = [ "memtest.c" ] },
   build application { target = "memtest_pmap_array",
                       cFiles = [ "memtest.c" ],
-                      libraryOs = Config.libbarrelfish_pmap_array
+                      libraryOs = Config.libbarrelfish_pmap_array,
+                      architectures = [ "armv8", "x86_64" ]
                     },
   build application { target = "memtest_pmap_list",
                       cFiles = [ "memtest.c" ],
                     },
   build application { target = "memtest_pmap_array_mcn",
                       cFiles = [ "memtest.c" ],
-                      libraryOs = Config.libbarrelfish_pmap_array_mcn
+                      libraryOs = Config.libbarrelfish_pmap_array_mcn,
+                      architectures = [ "armv8", "x86_64" ]
                     },
   build application { target = "memtest_pmap_list_mcn",
                       cFiles = [ "memtest.c" ],
-                      libraryOs = Config.libbarrelfish_pmap_list_mcn
+                      libraryOs = Config.libbarrelfish_pmap_list_mcn,
+                      architectures = [ "armv8", "x86_64" ]
                     },
   build application { target = "mem_alloc", cFiles = [ "mem_alloc.c" ],
                      addLibraries = [ "rcce_nobulk" ] },
index 99dd4f6..1a5ff43 100644 (file)
@@ -7,17 +7,19 @@
 -- ETH Zurich D-INFK, Universitaetstrasse 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for idctest
--- 
+--
 --------------------------------------------------------------------------
 
 [
 build application { target = "multihoptest",
                   cFiles = [ "multihoptest.c" ],
-                  flounderBindings = [ "test" ]
+                  flounderBindings = [ "test" ],
+                  architectures = ["armv8", "x86_64"]
                  },
-                 
+
 build application { target = "multihop_latency_bench",
                      cFiles = [ "latencytest.c" ],
                       flounderBindings = [ "bench" ],
-                      addLibraries = ["bench", "trace"] }  
+                      addLibraries = ["bench", "trace"],
+                      architectures = ["armv8", "x86_64"] }
 ]
index afaeedb..0c94f3a 100644 (file)
@@ -50,6 +50,6 @@
                                  "modify_flags.c", "nkmtest.c",
                                  "vspace_dump.c" ],
                       addLibraries = [ "cap_predicates" ],
-                      architectures = [ "x86_32", "armv7" ]
+                      architectures = [ "armv7" ]
                     }
 ]
index 95f1bd8..b2dd69d 100644 (file)
@@ -17,7 +17,7 @@
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
 
   build application { target = "d2getset_idcap",
@@ -26,7 +26,7 @@
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
 
   build application { target = "d2pubsub",
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
 
-  
+
   build application { target = "d2trigger",
                       cFiles = [ "d2trigger.c" ],
                       flounderDefs = [ "octopus" ],
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
 
   build application { target = "d2barrier",
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
-                                        
+
   build application { target = "d2locksimple",
                       cFiles = [ "d2locksimple.c" ],
                       flounderDefs = [ "octopus" ],
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
 
   build application { target = "d2read",
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
-                    
+
   build application { target = "d2sem",
                       cFiles = [ "d2sem.c" ],
                       flounderDefs = [ "octopus" ],
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
-                    
+
   build application { target = "d2bench",
                       cFiles = [ "d2bench.c" ],
                       flounderDefs = [ "octopus" ],
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc", "bench" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
 
   build application { target = "d2bench1",
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc", "bench" ],
-                      architectures = [ "x86_64", "x86_32" ]
+                      architectures = [ "x86_64" ]
                     },
-                    
+
   build application { target = "d2bench2",
                       cFiles = [ "d2bench2.c" ],
                       flounderDefs = [ "octopus" ],
                       flounderBindings = [ "octopus" ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = [ "octopus", "octopus_parser", "thc", "bench" ],
-                      architectures = [ "x86_64", "x86_32" ]
-                    }    
+                      architectures = [ "x86_64" ]
+                    }
 ]
index 310ac09..8ed00f2 100644 (file)
@@ -7,7 +7,7 @@
 -- ETH Zurich D-INFK, Universitaetsstr. 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for /usr/vnode_map_test
--- 
+--
 --------------------------------------------------------------------------
 
 [ build application { target = "vnode_map_test",