Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ab2d1f331478
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 69e0d2b9a697
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 10, 2014

  1. Fix Atomic MACROs

    It is necessary to not consider 64bit architecture as X86.
    Gustavo Frederico Temple Pedrosa committed Nov 10, 2014
    Copy the full SHA
    0210da0 View commit details

Commits on Nov 14, 2014

  1. Merge pull request #3194 from gustavotemple/fix-vm-atomic-macros

    Fix Atomic MACROs
    Yorick Peterse committed Nov 14, 2014
    Copy the full SHA
    69e0d2b View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 vm/include/capi/rbxti/atomic.hpp
  2. +1 −1 vm/util/atomic.hpp
4 changes: 2 additions & 2 deletions vm/include/capi/rbxti/atomic.hpp
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
#elif defined(__APPLE__)
#define APPLE_SYNC 1

#elif defined(_LP64) || defined(__LP64__) || defined(__x86_64__) || defined(__amd64__)
#elif (defined(_LP64) || defined(__LP64__)) && (defined(__x86_64__) || defined(__amd64__))
#define X86_SYNC 1
#define X86_64_SYNC 1

@@ -43,7 +43,7 @@

#endif

#if defined(_LP64) || defined(__LP64__) || defined(__x86_64__) || defined(__amd64__)
#if (defined(_LP64) || defined(__LP64__)) && (defined(__x86_64__) || defined(__amd64__))
#define X86_PAUSE 1
#elif defined(i386) || defined(__i386) || defined(__i386__)
#define X86_PAUSE 1
2 changes: 1 addition & 1 deletion vm/util/atomic.hpp
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4))
#define GCC_BARRIER 1

#elif defined(_LP64) || defined(__LP64__) || defined(__x86_64__) || defined(__amd64__)
#elif (defined(_LP64) || defined(__LP64__)) && (defined(__x86_64__) || defined(__amd64__))
#define X86_BARRIER 1

#elif defined(i386) || defined(__i386) || defined(__i386__)