Thanks, merged to staging at df2c47c3a7f3..9a8b7bed409e (from, to] You can see the entire diff with 'git diff' or at https://github.com/brho/akaros/compare/df2c47c3a7f3...9a8b7bed409e
On 2015-11-02 at 11:11 Dan Cross <[email protected]> wrote: > The following changes since commit > 2a9b3cdc47dbde55f9d125fde3e11832ca4c0b91: > > Avoid double declarations, integer overflow, and use branch hints > (2015-10-30 16:02:29 -0400) > > are available in the git repository at: > > [email protected]:dancrossnyc/akaros.git old > > for you to fetch changes up to > e65b12720d5191c5c2bbb5790d1a5457dcf03316: > > Remove unnecessary #if. (2015-11-02 11:07:08 -0500) > > ---------------------------------------------------------------- > Dan Cross (1): > Remove unnecessary #if. > > user/parlib/include/vcore.h | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/user/parlib/include/vcore.h b/user/parlib/include/vcore.h > index 00365b1..6945ce7 100644 > --- a/user/parlib/include/vcore.h > +++ b/user/parlib/include/vcore.h > @@ -208,7 +208,6 @@ static inline uint64_t > vcore_account_uptime_nsec(uint32_t vcoreid) > #else > > #include <features.h> > -#if __GNUC_PREREQ(4,4) > > /* These macro acrobatics trick the compiler into not caching the > (linear) > * address of TLS variables across loads/stores of the TLS > descriptor, in lieu > @@ -223,18 +222,6 @@ static inline uint64_t > vcore_account_uptime_nsec(uint32_t vcoreid) > } safe_access_tls_var_internal(); > \ > } > > -#else > - > -#define begin_safe_access_tls_vars() > \ > - printf("ERROR: For PIC use gcc 4.4 or above for tls support!\n"); > \ > - printf("ERROR: As a quick fix, recompile your app with > -static...\n"); \ > - exit(2); > - > -#define end_safe_access_tls_vars() > \ > - printf("Will never be called because we abort above!"); > \ > - exit(2); > - > -#endif //__GNUC_PREREQ > #endif // __PIC__ > > /* Switches into the TLS 'tls_desc'. Capable of being called from > either > -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
