diff --git a/v2/tools/pathscale.jam b/v2/tools/pathscale.jam
index 1dfc78540..b5aa910d7 100644
--- a/v2/tools/pathscale.jam
+++ b/v2/tools/pathscale.jam
@@ -12,7 +12,7 @@ import common ;
 import fortran ;
 
 feature.extend toolset : pathscale ;
-toolset.inherit  pathscale : unix ;
+toolset.inherit pathscale : unix ;
 generators.override pathscale.prebuilt : builtin.prebuilt ;
 generators.override pathscale.searched-lib-generator : searched-lib-generator ;
 
@@ -63,41 +63,46 @@ generators.register-fortran-compiler pathscale.compile.fortran : FORTRAN : OBJ :
 generators.register-fortran90-compiler pathscale.compile.fortran90 : FORTRAN90 : OBJ : <toolset>pathscale ;
 
 # Declare flags and actions for compilation
-flags pathscale.compile OPTIONS <debug-symbols>on : -g ;
-flags pathscale.compile OPTIONS <profiling>on : -pg ;
-flags pathscale.compile OPTIONS <link>shared : -fPIC ;
+flags pathscale.compile OPTIONS <optimization>off   : -O0 ;
 flags pathscale.compile OPTIONS <optimization>speed : -O3 ;
 flags pathscale.compile OPTIONS <optimization>space : -Os ;
+
+flags pathscale.compile OPTIONS <inlining>off  : -noinline ;
+flags pathscale.compile OPTIONS <inlining>on   : -inline ;
+flags pathscale.compile OPTIONS <inlining>full : -inline ;
+
+flags pathscale.compile OPTIONS <warnings>off           : -woffall ;
+flags pathscale.compile OPTIONS <warnings>on            : -Wall ;
+flags pathscale.compile OPTIONS <warnings>all           : -Wall -pedantic ;
+flags pathscale.compile OPTIONS <warnings-as-errors>on  : -Werror ;
+
+flags pathscale.compile OPTIONS <debug-symbols>on : -ggdb ;
+flags pathscale.compile OPTIONS <profiling>on     : -pg ;
+flags pathscale.compile OPTIONS <link>shared      : -fPIC ;
 flags pathscale.compile OPTIONS <address-model>32 : -m32 ;
 flags pathscale.compile OPTIONS <address-model>64 : -m64 ;
 
-flags pathscale.compile OPTIONS <warnings>off : -woffall -Wno-uninitialized ;
-flags pathscale.compile OPTIONS <warnings>on : -Wall -Wno-uninitialized ;
-flags pathscale.compile OPTIONS <warnings>all : -Wall -Wno-uninitialized ;
-
-flags pathscale.compile.c++ OPTIONS <inlining>off : -noinline ;
-
-flags pathscale.compile OPTIONS <cflags> ;
-flags pathscale.compile.c++ OPTIONS <cxxflags> ;
+flags pathscale.compile USER_OPTIONS <cflags> ;
+flags pathscale.compile.c++ USER_OPTIONS <cxxflags> ;
 flags pathscale.compile DEFINES <define> ;
 flags pathscale.compile INCLUDES <include> ;
 
-flags pathscale.compile.fortran OPTIONS <fflags> ;
-flags pathscale.compile.fortran90 OPTIONS <fflags> ;
+flags pathscale.compile.fortran USER_OPTIONS <fflags> ;
+flags pathscale.compile.fortran90 USER_OPTIONS <fflags> ;
 
 actions compile.c
 {
-    "$(CONFIG_C_COMMAND)" $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_C_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
 actions compile.c++
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
 actions compile.fortran
 {
-    "$(CONFIG_F_COMMAND)" $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_F_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
 rule compile.fortran90 ( targets * : sources * : properties * )
@@ -112,15 +117,15 @@ rule compile.fortran90 ( targets * : sources * : properties * )
 
 actions compile.fortran90
 {
-    "$(CONFIG_F90_COMMAND)" $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -module $(<[1]:D) -c -o "$(<)" "$(>)"
+    "$(CONFIG_F90_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -module $(<[1]:D) -c -o "$(<)" "$(>)"
 }
 
 # Declare flags and actions for linking
-flags pathscale.link OPTIONS <debug-symbols>on : -g ;
+flags pathscale.link OPTIONS <debug-symbols>on : -ggdb -rdynamic ;
 # Strip the binary when no debugging is needed
 flags pathscale.link OPTIONS <debug-symbols>off : -g0 ;
 flags pathscale.link OPTIONS <profiling>on : -pg ;
-flags pathscale.link OPTIONS <linkflags> ;
+flags pathscale.link USER_OPTIONS <linkflags> ;
 flags pathscale.link LINKPATH <library-path> ;
 flags pathscale.link FINDLIBS-ST <find-static-library> ;
 flags pathscale.link FINDLIBS-SA <find-shared-library> ;
@@ -141,7 +146,7 @@ rule link ( targets * : sources * : properties * )
 
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
+    "$(CONFIG_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
 }
 
 # Slight mods for dlls
@@ -152,7 +157,7 @@ rule link.dll ( targets * : sources * : properties * )
 
 actions link.dll bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" -o "$(<)" -Wl,-soname$(SPACE)-Wl,$(<[1]:D=) -shared "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
+    "$(CONFIG_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" -o "$(<)" -Wl,-soname$(SPACE)-Wl,$(<[1]:D=) -shared "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
 }
 
 # Declare action for creating static libraries