On 11/17/2016 06:06 AM, Rainer Orth wrote:
I happened to notice that my libcilkrts SPARC port has been applied
upstream. So to reach closure on this issue for the GCC 7 release, I'd
like to import upstream into mainline which seems to be covered by the
free-for-all clause in https://gcc.gnu.org/svnwrite.html#policies, even
though https://gcc.gnu.org/codingconventions.html#upstream lists nothing
specific and we have no listed maintainer.
A few issues are worth mention:
* Upstream still has a typo in the git URL in many files. I've
corrected that during the import to avoid a massive diff:
-# https://bitbucket.org/intelcilkruntime/itnel-cilk-runtime.git are
+# https://bitbucket.org/intelcilkruntime/intel-cilk-runtime.git are
* libcilkrts.spec.in is missing upstream. I've no idea if this is
intentional.
* A few of my changes have been lost and I can't tell if this is by
accident:
** Lost whitespace:
--- libcilkrts-old/Makefile.am 2016-05-04 16:44:24.000000000 +0000
+++ libcilkrts-new/Makefile.am 2016-11-17 11:35:33.782987017 +0000
@@ -54,7 +54,7 @@ GENERAL_FLAGS = -I$(top_srcdir)/include
# Enable Intel Cilk Plus extension
GENERAL_FLAGS += -fcilkplus
-# Always generate unwind tables
+#Always generate unwind tables
GENERAL_FLAGS += -funwind-tables
AM_CFLAGS = $(XCFLAGS) $(GENERAL_FLAGS) -std=c99
** Lost alphabetical order of targets:
diff -rup libcilkrts-old/configure.ac libcilkrts-new/configure.ac
--- libcilkrts-old/configure.ac 2016-11-16 18:34:28.000000000 +0000
+++ libcilkrts-new/configure.ac 2016-11-17 11:35:33.800015570 +0000
@@ -143,14 +145,14 @@ esac
# contains information on what's needed
case "${target}" in
- arm-*-*)
- config_dir="arm"
- ;;
-
i?86-*-* | x86_64-*-*)
config_dir="x86"
;;
+ arm-*-*)
+ config_dir="arm"
+ ;;
+
sparc*-*-*)
config_dir="sparc"
;;
diff -rup libcilkrts-old/configure.tgt libcilkrts-new/configure.tgt
--- libcilkrts-old/configure.tgt 2016-11-16 18:34:28.000000000 +0000
+++ libcilkrts-new/configure.tgt 2016-11-17 11:35:33.807873451 +0000
@@ -44,10 +44,10 @@
# Disable Cilk Runtime library for unsupported architectures.
case "${target}" in
- arm-*-*)
- ;;
i?86-*-* | x86_64-*-*)
;;
+ arm-*-*)
+ ;;
sparc*-*-*)
;;
*-*-*)
I've done nothing about those, just wanted to point them out.
The following patch has passed x86_64-pc-linux-gnu bootstrap without
regressions; i386-pc-solaris2.12 and sparc-sun-solaris2.12 bootstraps
are currently running.
Ok for mainline if they pass?
Yes. Sorry for not getting back to you sooner.
jeff
