fix some comments

Author: vidsinghal

benchrunner/benchrunner.cabal

@@ -32,10 +32,9 @@ executable benchrunner
     ghc-options:        -Wall -Wcompat
                         -threaded -rtsopts
                         -fdefer-typed-holes
-                        -O2 -optl -lstdc++ -optl -lgcc_s
-
-
+                        -O2 -optl -optl-lstdc++
 
+    extra-libraries: stdc++
 
     c-sources:
                       csorts/insertionsort.c
@@ -50,16 +49,7 @@ executable benchrunner
                       cxx/mergesort_int_wrapper.cpp
                       cxx/quicksort_int_wrapper.cpp
 
-	if impl(ghc >= 9.4)
-		build-depends:      system-cxx-std-lib
-	else
-    		if os(windows)
-			extra-libraries:  stdc++
-		if os(linux)
-			extra-libraries:  stdc++
-    		if os(darwin)
-      			extra-libraries:  stdc++
-
+    build-depends:      system-cxx-std-lib
 
     -- DNDEBUG disables asserts in cbits/
     cc-options:        -std=c11 -O3 -DNDEBUG=1

benchrunner/cxx/Makefile

@@ -7,9 +7,9 @@ DEBUG       := 0
 CILK        := 0
 
 ifeq ($(CILK), 1)
-	ifeq ($(USECLANG), 0)
-		$(error cilk can only be used with an opencilk compiler!)
-	endif
+  ifeq ($(USECLANG), 0)
+    $(error cilk can only be used with an opencilk compiler!)
+  endif
 endif
 
 OpenCILK_CLANG       := clang-16
@@ -26,23 +26,23 @@ CDEBUG := -DCBENCH_DEBUG -O0 -g
 CFLAGS += -Wall -Wextra -Wpedantic -flto
 
 ifeq ($(USECLANG), 1)
-	CC     = $(CLANG)
-	CFLAGS = $(CLANG_FLAGS)
-	LFLAGS := -fuse-ld=lld
+  CC     = $(CLANG)
+  CFLAGS = $(CLANG_FLAGS)
+  LFLAGS := -fuse-ld=lld
 endif
 
 ifeq ($(CILK), 1)
-	ifeq ($(USECLANG), 1)
-		CC     = $(OpenCILK_CLANG)
-		CFLAGS = $(OpenCILK_CLANG_FLAGS)
-		LFLAGS := -fuse-ld=lld
-	endif
+  ifeq ($(USECLANG), 1)
+    CC     = $(OpenCILK_CLANG)
+    CFLAGS = $(OpenCILK_CLANG_FLAGS)
+    LFLAGS := -fuse-ld=lld
+  endif
 endif
 
 ifeq ($(DEBUG), 1)
-	CFLAGS += $(CDEBUG)
+  CFLAGS += $(CDEBUG)
 else
-	CFLAGS += -O3
+  CFLAGS += -O3
 endif
 
 all: $(OUT)
@@ -54,6 +54,6 @@ $(OUT): $(OBJFILES)
 	$(CC) $(CFLAGS) -c -o $@ $^
 
 clean:
-	rm -f $(OBJFILES) $(OUT)
+	rm -f  $(OUT)
 
 .PHONY: clean

benchrunner/cxx/insertionsort_glibc.c

@@ -42,17 +42,17 @@ void *insertionsort_glibc(void *const pbase, size_t total_elems, size_t size, __
 }
 
 /* Byte-wise swap two items of size SIZE. */
-#define SWAP(a, b, size)						      \
-  do									      \
-    {									      \
-      size_t __size = (size);						      \
-      char *__a = (a), *__b = (b);					      \
-      do								      \
-        {								      \
-          char __tmp = *__a;						      \
-          *__a++ = *__b;						      \
-          *__b++ = __tmp;						      \
-        } while (--__size > 0);						      \
+#define SWAP(a, b, size)                    \
+  do                                        \
+    {                                       \
+      size_t __size = (size);               \
+      char *__a = (a), *__b = (b);          \
+      do                                    \
+        {                                   \
+          char __tmp = *__a;                \
+          *__a++ = *__b;                    \
+          *__b++ = __tmp;                   \
+        } while (--__size > 0);             \
     } while (0)
 
 #define MAX_THRESH 4

benchrunner/cxx/quicksort.cpp

@@ -10,7 +10,7 @@
 // void quicksort_inplace_helper(void *_a, size_t n, size_t es);
 
 template<typename T>
-void quicksort_inplace_helper(T *_a, size_t n);
+inline void quicksort_inplace_helper(T *_a, size_t n);
 
 // void *quicksort_glibc(void *const pbase, size_t total_elems, size_t size, __compar_fn_t cmp)
 // {
@@ -121,7 +121,7 @@ T *quicksort_inplace(T *_a, size_t n){
 }
 
 template<typename T>
-void quicksort_inplace_helper(T *_a, size_t n)
+inline void quicksort_inplace_helper(T *_a, size_t n)
 {
     T *a = (T *) _a;
     int j;