[PATCH] STDCXX-1067 Mac builds

[Liviu Nicoara]

The default compiler on recent Apple Macs is LLVM with Clang and gcc C++ 
front-ends. The compiler does not come with a C++ language support library. 
However, gcc Mac builds are fine with GNU stock compilers, modulo the issues for 
which I attach the patch below, for review.


I built successfully and ran the test suite on both Mac and Linux, wigh gcc 
4.5.4 and 4.5.2, respectively.


Thanks.

Liviu


Index: src/x86_64/atomic.s
===
--- src/x86_64/atomic.s (revision 1382343)
+++ src/x86_64/atomic.s (working copy)
@@ -26,8 +26,17 @@
  * 
  **/
 
+#if defined (__MACH__)
+// Mac OS X Mach-O assembler: no .type, power of two alignment
+#  define ALIGN_DIR   .align 4
+#  define TYPE_DIR(ignore,ignore2) 
+#else
+#  define ALIGN_DIR   .align 16
+#  define TYPE_DIR(sym,attr)  .type sym, attr
+#endif // __MACH__
+
 .text
-.align 16
+ALIGN_DIR
 
 /***
  * extern C int8_t __rw_atomic_xchg8 (int8_t *x, int8_t y);
@@ -37,7 +46,7 @@
  **/
 
 .globl __rw_atomic_xchg8
-.type __rw_atomic_xchg8, @function
+TYPE_DIR (__rw_atomic_xchg8, STT_FUNC)
 __rw_atomic_xchg8: /* ; int8_t (int8_t *x, int8_t y)  */
 movq  %rdi, %rcx   /* ; %rcx = x  */
 movb  %sil,  %al   /* ; %al = y   */
@@ -53,7 +62,7 @@
  **/
 
 .globl __rw_atomic_xchg16
-.type __rw_atomic_xchg16, @function
+TYPE_DIR (__rw_atomic_xchg16, STT_FUNC)
 __rw_atomic_xchg16:/* ; int16_t (int16_t *x, int16_t y) */
 movq  %rdi, %rcx   /* ; %rcx = x*/
 movw  %si,  %ax/* ; %ax = y */
@@ -69,7 +78,7 @@
  **/
 
 .globl __rw_atomic_xchg32
-.type __rw_atomic_xchg32, @function
+TYPE_DIR (__rw_atomic_xchg32, STT_FUNC)
 __rw_atomic_xchg32:/* ; int32_t (int32_t *x, int32_t y) */
 movq  %rdi,  %rcx  /* ; %rcx = x*/
 movl  %esi,  %eax  /* ; %eax = y*/
@@ -85,7 +94,7 @@
  **/
 
 .globl __rw_atomic_xchg64
-.type __rw_atomic_xchg64, @function
+TYPE_DIR (__rw_atomic_xchg64, STT_FUNC)
 __rw_atomic_xchg64:/* ; int64_t (int64_t *x, int64_t y) */
 movq  %rdi,  %rcx  /* ; %rcx = x*/
 movq  %rsi,  %rax  /* ; %rax = y*/
@@ -101,7 +110,7 @@
  **/
 
 .globl __rw_atomic_add8
-.type __rw_atomic_add8, @function
+TYPE_DIR (__rw_atomic_add8, STT_FUNC)
 __rw_atomic_add8:  /* ; int8_t (int8_t *dst, int8_t inc) */
 movq   %rdi, %rcx  /* ; %rcx = dst   */
 movl   %esi, %eax  /* ; %eax = inc   */
@@ -123,7 +132,7 @@
  **/
 
  .globl __rw_atomic_add16
-.type __rw_atomic_add16, @function
+TYPE_DIR (__rw_atomic_add16, STT_FUNC)
 __rw_atomic_add16: /* ; int16_t (int16_t *dst, int16_t inc) */
 movq   %rdi, %rcx  /* ; %rcx = dst  */
 movw   %si,  %ax   /* ; %ax = inc   */
@@ -146,7 +155,7 @@
  **/
 
 .globl __rw_atomic_add32
-.type __rw_atomic_add32, @function
+TYPE_DIR (__rw_atomic_add32, STT_FUNC)
 __rw_atomic_add32: /* ; int32_t (int32_t *dst, int32_t inc) */
 movq   %rdi, %rcx  /* ; %rcx = dst  */
 movl   %esi, %edx  /* ; %edx = inc  */
@@ -169,7 +178,7 @@
  **/
 
 .globl __rw_atomic_add64
-.type __rw_atomic_add64, @function
+TYPE_DIR (__rw_atomic_add64, STT_FUNC)
 __rw_atomic_add64: /* ; int64_t (int64_t *dst, int64_t inc) */
 movq   %rdi, %rcx  /* ; %rcx = dst  */
 movq   %rsi, %rdx  /* ; %edx = inc  */
Index: etc/config/gcc.config
===
--- etc/config/gcc.config   (revision 1382343)
+++ etc/config/gcc.config   (working copy)
@@ -40,6 +40,7 @@
 else
 ifeq ($(OSNAME),Darwin)
 OS_MAJOR := $(shell 

Re: [PATCH] STDCXX-1067 Mac builds

[Wojciech Meyer]

Hi Liviu,

I don't use Mac OS X at all but:

Liviu Nicoara nikko...@hates.ms writes:

 The default compiler on recent Apple Macs is LLVM with Clang and gcc
 C++ front-ends. The compiler does not come with a C++ language support
 library. However, gcc Mac builds are fine with GNU stock compilers,
 modulo the issues for which I attach the patch below, for review.

I think it will be a big win to support Clang for the community.

 I built successfully and ran the test suite on both Mac and Linux,
 wigh gcc 4.5.4 and 4.5.2, respectively.

That's cool!

 Thanks.

 Liviu

Thanks.

--
Wojciech Meyer
http://danmey.org

Re: [PATCH] STDCXX-1067 Mac builds

[Liviu Nicoara]

On 9/9/12 7:07 PM, Wojciech Meyer wrote:

Hi Liviu,

I don't use Mac OS X at all but:

Liviu Nicoara nikko...@hates.ms writes:


The default compiler on recent Apple Macs is LLVM with Clang and gcc
C++ front-ends. The compiler does not come with a C++ language support
library. However, gcc Mac builds are fine with GNU stock compilers,
modulo the issues for which I attach the patch below, for review.


I think it will be a big win to support Clang for the community.


AFAICT, there is only one problem with that, the lack of a complete language 
support library.


Pathscale released a replacement for libsupc++/libgcc_s in the form of the pair 
libcxxrt/libunwind, which provide equivalent functionality on *BSD/Linux, but 
not Darwin.


Perhaps Christopher can shed some light here.

Liviu