Add support for new pnacl native toolchain driver

ports/regal/nacl.patch

 diff --git a/.travis.yml b/.travis.yml
 --- a/.travis.yml
 +++ b/.travis.yml
-@@ -19,10 +19,14 @@ install:
+@@ -19,10 +19,16 @@ install:
   - "if [ \"$SYSTEM\" = linux ]; then sudo apt-get install libxmu-dev libxi-dev; fi"
  env:
   - SYSTEM=linux
 - - SYSTEM=nacl-i686
 + - SYSTEM=nacl-x86_64 TOOLCHAIN=clang-newlib
 + - SYSTEM=nacl-x86_64 TOOLCHAIN=glibc
   - SYSTEM=nacl-x86_64
 + - SYSTEM=nacl-i686
   - SYSTEM=nacl-arm
 + - SYSTEM=nacl-pnacl
++ - SYSTEM=nacl-le32
   - MODE=debug SYSTEM=linux
 - - MODE=debug SYSTEM=nacl-i686
   - MODE=debug SYSTEM=nacl-x86_64
 + - MODE=debug SYSTEM=nacl-i686
   - MODE=debug SYSTEM=nacl-arm
 + - MODE=debug SYSTEM=nacl-pnacl
++ - MODE=debug SYSTEM=nacl-le32
 diff --git a/Makefile.glu b/Makefile.glu
 --- a/Makefile.glu
 +++ b/Makefile.glu
 @@ -36,7 +36,6 @@ GLU.OBJS       := $(GLU.OBJS:.c=.o) $(GLU.OBJS:.cc=.o)
  GLU.OBJS       := $(filter %.o,$(GLU.OBJS))
  GLU.DEPS       := $(GLU.OBJS:.o=.d)
  GLU.LIBS       := -Llib/$(SYSTEM) -lRegal
 -GLU.LIBS       += -lstdc++
  GLU.LIBS       += -pthread -lm
  
@@ skipping 118 matching lines @@
 +++ b/Makefile.regaltest
 @@ -7,7 +7,7 @@ include build/common.inc
  
  # Not supported for Emscripten - Revisit
  
 -ifeq ($(filter emscripten% nacl-pnacl,$(SYSTEM)),)
 +ifeq ($(filter emscripten%,$(SYSTEM)),)
  
  include build/regaltest.inc
  
-@@ -58,15 +58,24 @@ tmp/$(SYSTEM)/regaltest/static/%.o: tests/%.cpp
+@@ -49,7 +49,10 @@ REGALTEST.LIBS       := -Llib/$(SYSTEM) $(LDFLAGS.X11) -lm
+ ifeq ($(filter nacl%,$(SYSTEM)),)
+ REGALTEST.LIBS += -ldl
+ else
+-REGALTEST.LIBS += -lnacl_io -lppapi -lppapi_gles2
++ifneq ($(NACL_ARCH),le32)
++REGALTEST.LIBS += -lnacl_io -lppapi_gles2
++endif
++REGALTEST.LIBS += -lppapi
+ endif
+ 
+ -include $(REGALTEST.DEPS)
+@@ -58,15 +61,24 @@ tmp/$(SYSTEM)/regaltest/static/%.o: tests/%.cpp
         @mkdir -p $(dir $@)
         $(LOG_CXX)$(CCACHE) $(CXX) $(REGAL.CFLAGS) $(REGALTEST.CFLAGS) $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
  
 +ifeq ($(NACL_ARCH),pnacl)
 +LINK_OUTPUT_EXT=.bc
 +else
 +LINK_OUTPUT_EXT=$(BIN_EXTENSION)
 +endif
 +
  bin/$(SYSTEM)/regaltest$(BIN_EXTENSION): $(REGALTEST.OBJS) lib/$(SYSTEM)/$(GTEST.STATIC) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(PCRE.STATIC) $(REGAL.SHARED.DEPEND)
         @mkdir -p $(dir $@)
  ifdef APITRACE.STATIC
         $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGALTEST.LIBS) lib/$(SYSTEM)/$(PCRE.STATIC) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS)
  else
 -       $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(PCRE.STATIC) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGALTEST.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS)
 +       $(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $(@:$(BIN_EXTENSION)=$(LINK_OUTPUT_EXT)) $(REGALTEST.OBJS) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(PCRE.STATIC) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGALTEST.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS)
  endif
  ifneq ($(STRIP),)
 -       $(LOG_STRIP)$(STRIP) -x $@
 +       $(LOG_STRIP)$(STRIP) $(@:$(BIN_EXTENSION)=$(LINK_OUTPUT_EXT))
 +endif
 +ifeq ($(NACL_ARCH),pnacl)
 +       $(LOG_FINALIZE)$(FINALIZE) -o $@ $(@:$(BIN_EXTENSION)=$(LINK_OUTPUT_EXT))
  endif
  
  ifneq ($(NACL_ARCH),arm)
-@@ -75,7 +84,10 @@ test: bin/$(SYSTEM)/regaltest$(BIN_EXTENSION)
+@@ -75,7 +84,12 @@ test: bin/$(SYSTEM)/regaltest$(BIN_EXTENSION)
  ifeq ($(filter nacl%,$(SYSTEM)),)
         $^
  else
 -       "$(NACL_SDK_ROOT)/tools/sel_ldr.py" $^
 +ifeq ($(NACL_ARCH),pnacl)
 +       $(LOG_FINALIZE)$(TRANSLATE) -arch x86-64 -o $(^:.pexe=.nexe) $^
++else ifeq ($(NACL_ARCH),le32)
++       $(TRANSLATE) -arch x86-64 -o $(^:.pexe=.nexe) $^
 +endif
 +       "$(NACL_SDK_ROOT)/tools/sel_ldr.py" $(^:.pexe=.nexe)
  endif
  endif
  
 diff --git a/Makefile.regalw b/Makefile.regalw
 --- a/Makefile.regalw
 +++ b/Makefile.regalw
 @@ -12,18 +12,23 @@ include build/regal.inc
  #
@@ skipping 180 matching lines @@
  CC     := $(NACL_TOOLCHAIN)/bin/i686-nacl-gcc
  CXX    := $(NACL_TOOLCHAIN)/bin/i686-nacl-g++
  LD     := $(NACL_TOOLCHAIN)/bin/i686-nacl-g++
  AR     := $(NACL_TOOLCHAIN)/bin/i686-nacl-ar
  OBJDUMP:= $(NACL_TOOLCHAIN)/bin/i686-nacl-objdump
 +endif
 +
  RANLIB :=
  STRIP  ?=
  
+diff --git a/config/Makefile.nacl-le32 b/config/Makefile.nacl-le32
+new file mode 100644
+--- /dev/null
++++ b/config/Makefile.nacl-le32
+@@ -0,0 +1,25 @@
++NACL_ARCH := le32
++TOOLCHAIN := pnacl
++
++include config/nacl.inc
++
++NACL_TOOLCHAIN := $(NACL_SDK_ROOT)/toolchain/$(NACL_OS)_pnacl
++
++CC        := $(NACL_TOOLCHAIN)/bin/le32-nacl-clang
++CXX       := $(NACL_TOOLCHAIN)/bin/le32-nacl-clang++
++LD        := $(NACL_TOOLCHAIN)/bin/le32-nacl-clang++
++TRANSLATE := $(NACL_TOOLCHAIN)/bin/pnacl-translate
++AR        := $(NACL_TOOLCHAIN)/bin/le32-nacl-ar
++RANLIB    := $(NACL_TOOLCHAIN)/bin/le32-nacl-ranlib
++STRIP     ?=
++
++BIN_EXTENSION = .pexe
++LIBDIR =
++CFLAGS.EXTRA += -Wno-tautological-undefined-compare -Wno-unused-function
++LDFLAGS.EXTRA +=
++LDFLAGS.GL =
++LDFLAGS.GLU = -lRegalGLU
++LDFLAGS.GLUT = -lRegalGLUT
++LDFLAGS.STATIC =
++BIN.SUFFIX =
++LIB.STATIC = lib$(NAME).a
 diff --git a/config/Makefile.nacl-pnacl b/config/Makefile.nacl-pnacl
 --- a/config/Makefile.nacl-pnacl
 +++ b/config/Makefile.nacl-pnacl
 @@ -1,29 +1,26 @@
  NACL_ARCH := pnacl
 +TOOLCHAIN := pnacl
  
  include config/nacl.inc
  
  NACL_TOOLCHAIN := $(NACL_SDK_ROOT)/toolchain/$(NACL_OS)_pnacl
@@ skipping 118 matching lines @@
  
  CFLAGS.EXTRA += -I$(NACL_SDK_ROOT)/include -MMD
  WARN = -Wall -Wno-unused-parameter -Wno-char-subscripts -Wno-strict-aliasing
 -# WARN += -Werror
 +#WARN += -Werror
  CFLAGS.DEBUG = -g
  CFLAGS.RELEASE = -O2
 diff --git a/nacl-regal.sh b/nacl-regal.sh
 --- a/nacl-regal.sh
 +++ b/nacl-regal.sh
-@@ -10,22 +10,24 @@
+@@ -10,22 +10,28 @@
  #   - Pepper 25 is needed for the ARM build.
  #   - Makefile needs to be specified for branches that have GNUmakefiles
  #   - MODE=debug for debug-mode build
 -#   - NACL_LIBC=glibc on the command-line for glibc rather than newlib
 +#   - TOOLCHAIN=glibc or clang-newlib to use and alternative to the default
 +#     newlib toolchain.
  #   - CCACHE=ccache is supported (and recommended)
  
  set -e
  
@@ skipping 10 matching lines @@
 -    echo "Building ARM"
 -    make -f Makefile SYSTEM=nacl-arm $*
 -fi
 +echo "Building ARM"
 +make -f Makefile SYSTEM=nacl-arm $*
 +make -f Makefile SYSTEM=nacl-arm $* test
  
  echo "Building pnacl"
  make -f Makefile SYSTEM=nacl-pnacl $*
 +make -f Makefile SYSTEM=nacl-pnacl $* test
++
++echo "Building pnacl"
++make -f Makefile SYSTEM=nacl-le32 $*
++make -f Makefile SYSTEM=nacl-le32 $* test
 diff --git a/src/apitrace/common/os_posix.cpp b/src/apitrace/common/os_posix.cpp
 --- a/src/apitrace/common/os_posix.cpp
 +++ b/src/apitrace/common/os_posix.cpp
 @@ -123,7 +123,7 @@ getCurrentDir(void)
      size_t size = PATH_MAX;
      char *buf = path.buf(size);
  
 -    getcwd(buf, size);
 +    buf = getcwd(buf, size);
      buf[size - 1] = 0;
@@ skipping 28 matching lines @@
 +++ b/src/regal/RegalUtil.h
 @@ -56,7 +56,7 @@
  #endif
  
  #ifndef REGAL_UNUSED
 -#if defined(__GNUC__) && !defined(__clang__)
 +#if defined(__GNUC__)
  #define REGAL_UNUSED __attribute__((unused))
  #else
  #define REGAL_UNUSED