Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Unified Diff: ports/clapack/nacl.patch

Issue 1804293003: Add support for new pnacl native toolchain driver (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Fix according to Brad's comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ports/clapack/nacl.patch
diff --git a/ports/clapack/nacl.patch b/ports/clapack/nacl.patch
index 8e353f99a0c765dea93809ee538035b85c902db7..89b5b3518d11301a8860981440f8c60b94d690a6 100644
--- a/ports/clapack/nacl.patch
+++ b/ports/clapack/nacl.patch
@@ -1,16 +1,20 @@
diff --git a/F2CLIBS/libf2c/Makefile b/F2CLIBS/libf2c/Makefile
--- a/F2CLIBS/libf2c/Makefile
+++ b/F2CLIBS/libf2c/Makefile
-@@ -20,7 +20,7 @@ include $(TOPDIR)/make.inc
+@@ -20,8 +20,10 @@ include $(TOPDIR)/make.inc
# compile, then strip unnecessary symbols
.c.o:
$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
- ld -r -x -o $*.xxx $*.o
-+ $(LOADER) ${LDEMULATION} -r -o $*.xxx $*.o
- mv $*.xxx $*.o
+- mv $*.xxx $*.o
++ if [ $(NACL_ARCH) != le32 ]; then \
++ $(LOADER) ${LDEMULATION} -r -o $*.xxx $*.o; \
++ mv $*.xxx $*.o;\
++ fi
## Under Solaris (and other systems that do not understand ld -x),
## omit -x in the ld line above.
-@@ -72,8 +72,8 @@ OFILES = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
+ ## If your system does not have the ld command, comment out
+@@ -72,8 +74,8 @@ OFILES = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
all: f2c.h signal1.h sysdep1.h libf2c.a clapack_install
libf2c.a: $(OFILES)
@@ -21,7 +25,7 @@ diff --git a/F2CLIBS/libf2c/Makefile b/F2CLIBS/libf2c/Makefile
## Shared-library variant: the following rule works on Linux
## systems. Details are system-dependent. Under Linux, -fPIC
-@@ -119,7 +119,7 @@ sysdep1.h: sysdep1.h0
+@@ -119,7 +121,7 @@ sysdep1.h: sysdep1.h0
install: libf2c.a
cp libf2c.a $(LIBDIR)
@@ -30,7 +34,7 @@ diff --git a/F2CLIBS/libf2c/Makefile b/F2CLIBS/libf2c/Makefile
clapack_install: libf2c.a
mv libf2c.a ..
-@@ -181,9 +181,11 @@ xwsne.o: fio.h
+@@ -181,9 +183,11 @@ xwsne.o: fio.h
xwsne.o: lio.h
xwsne.o: fmt.h
« make_all.sh ('K') | « ports/bullet/build.sh ('k') | ports/clipper/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698