k1om: some fix-ups
[barrelfish] / lib / libc / Hakefile
index 259da0a..9c17b6f 100644 (file)
 
 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"    = [ "x86_64/" ++ x | x <- ["setjmp.S", "memcpy.S", "memset.S"]]
---    arch_srcs "armv7"   = [ "arm/setjmp.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", "string/memcpy.S", "string/memset.S"]]
     arch_srcs "armv8"   = [ "aarch64/" ++ x | x <- ["gen/setjmp.S", "gen/fabs.S"]]
     arch_srcs  x        = error ("Unknown architecture for libc: " ++ x)
 in
@@ -31,7 +29,7 @@ in
                         "armv8" ->  [ "aarch64" ]),
         cFiles = [ "gen/assert.c" ] ++ case arch of
                         "x86_64" ->  [ "amd64/gen/flt_rounds.c" ]
-                        "k1om" ->  [ "amd64/gen/flt_rounds.c" ]
+                        "k1om" ->  [ "amd64/gen/flt_rounds.c", "arm/gen/fabs.c" ]
                         "armv7" ->  [ "arm/gen/flt_rounds.c", "arm/gen/fabs.c", "arm/gen/arm_initfini.c",
                             "arm/aeabi/aeabi_atexit.c", "arm/aeabi/aeabi_unwind_cpp.c",
                             "arm/aeabi/aeabi_unwind_exidx.c" ]