Merge pull request #121 from JuliaLang/sb/ppcarch

fix ARCH variable for powerpc, and rearrange fenv.h union for endianness
This commit is contained in:
Viral B. Shah 2016-02-26 18:46:17 -08:00
commit 9d7a76cca8
2 changed files with 11 additions and 0 deletions

View file

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

View file

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