Merge branch 'bsdlibc'
authorAdam Turowski <adam.turowski@inf.ethz.ch>
Tue, 11 Jul 2017 13:27:38 +0000 (15:27 +0200)
committerAdam Turowski <adam.turowski@inf.ethz.ch>
Tue, 11 Jul 2017 13:27:38 +0000 (15:27 +0200)
Signed-off-by: Adam Turowski <adam.turowski@inf.ethz.ch>

1  2 
hake/ARMv7.hs
hake/ArchDefaults.hs
if/Hakefile
platforms/Hakefile
usr/drivers/omap44xx/sdma/main.c

diff --cc hake/ARMv7.hs
Simple merge
@@@ -313,11 -307,15 +307,17 @@@ linker arch compiler opts objs libs mod
      ++
      [ In BuildTree arch o | o <- objs ]
      ++
+     [Str "-Wl,--start-group"]
+     ++
+     [ In BuildTree arch l | l <- libs ]
+     ++
      [Str "-Wl,--whole-archive"] ++ [ In BuildTree arch l | l <- mods ] ++ [Str "-Wl,--no-whole-archive"]
      ++
 +    [ In BuildTree arch l | l <- libs ]
 +    ++
      (optLibs opts)
+     ++
+     [Str "-Wl,--end-group"]
  
  
  --
diff --cc if/Hakefile
@@@ -96,8 -96,7 +96,9 @@@
                 "ddomain",
                 "dcontrol",
                 "net_filter",
 +               "twl6030",
-                "cm2"
++               "cm2",
+                "net_sockets"
             ],
               arch <- allArchitectures
  ] ++
Simple merge
  #include "sdma.h"
  #include "omap_sdma.h"
  
+ #define MIN(a,b) (((a)<(b))?(a):(b))
 -// Channel State. Filled by the interrupt callback, read by the request task.
 -static struct {
 -    awe_t *request;
 -    errval_t err;
 -} channel_state[OMAP44XX_SDMA_NUM_CHANNEL];
 -
  /**
   * \brief Interrupt callback which will be called when a channel interrupt
   * occurs.