Browse Source

Merge pull request #121 from JuliaLang/sb/ppcarch

fix ARCH variable for powerpc, and rearrange fenv.h union for endianness
Viral B. Shah 9 years ago
parent
commit
9d7a76cca8
2 changed files with 11 additions and 0 deletions
  1. 6 0
      Make.inc
  2. 5 0
      include/openlibm_fenv_powerpc.h

+ 6 - 0
Make.inc

@@ -73,6 +73,12 @@ REAL_ARCH := $(ARCH)
 ifeq ($(findstring arm,$(ARCH)),arm)
 override ARCH := arm
 endif
+ifeq ($(findstring powerpc,$(ARCH)),powerpc)
+override ARCH := powerpc
+endif
+ifeq ($(findstring ppc,$(ARCH)),ppc)
+override ARCH := powerpc
+endif
 ifeq ($(ARCH),i386)
 override ARCH := i387
 endif

+ 5 - 0
include/openlibm_fenv_powerpc.h

@@ -97,8 +97,13 @@ extern const fenv_t	__fe_dfl_env;
 union __fpscr {
 	double __d;
 	struct {
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+		fenv_t __reg;
+		__uint32_t __junk;
+#else
 		__uint32_t __junk;
 		fenv_t __reg;
+#endif
 	} __bits;
 };