Fix compiler warnings from GCC 4.7.1 on ARCH Linux

4 files changed, 35 insertions, 12 deletions

diff --git a/erts/emulator/beam/erl_bif_re.c b/erts/emulator/beam/erl_bif_re.c
index 88f980d19f..d00a63967c 100644
--- a/erts/emulator/beam/erl_bif_re.c
+++ b/erts/emulator/beam/erl_bif_re.c
@@ -184,6 +184,7 @@ static Eterm make_signed_integer(int x, Process *p)
 #define CAPSPEC_VALUES 0
 #define CAPSPEC_TYPE 1
 #define CAPSPEC_SIZE 2
+#define CAPSPEC_INIT {0,0}
 
 static int /* 0 == ok, < 0 == error */ 
 parse_options(Eterm listp, /* in */
@@ -864,7 +865,7 @@ re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
     size_t code_size;
     Uint loop_limit_tmp;
     unsigned long loop_count;
-    Eterm capture[CAPSPEC_SIZE];
+    Eterm capture[CAPSPEC_SIZE] = CAPSPEC_INIT;
     int is_list_cap;
 
     if (parse_options(arg3,&comp_options,&options,&pflags,&startoffset,capture)
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 09c8e760f4..9874e2605f 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -282,11 +282,16 @@ busy_wait_move_to_busy_queue(Port *pp, ErtsPortTask *ptp)
     }
     else {
 	int i;
+#ifdef DEBUG
 	erts_aint32_t flags;
-
+#endif
 	pp->sched.taskq.local.busy.first = ptp;
-	flags = erts_smp_atomic32_read_bor_nob(&pp->sched.flags,
-					       ERTS_PTS_FLG_HAVE_BUSY_TASKS);
+
+#ifdef DEBUG
+	flags = 
+#endif
+	    erts_smp_atomic32_read_bor_nob(&pp->sched.flags,
+					   ERTS_PTS_FLG_HAVE_BUSY_TASKS);
 	ASSERT(!(flags & ERTS_PTS_FLG_HAVE_BUSY_TASKS));
 
 	ASSERT(!tabp);
@@ -1220,15 +1225,14 @@ erts_port_task_abort(ErtsPortTaskHandle *pthp)
 void
 erts_port_task_abort_nosuspend_tasks(Port *pp)
 {
-    erts_aint32_t flags;
     ErtsPortTaskHandleList *abort_list;
 #ifdef ERTS_SMP
     ErtsThrPrgrDelayHandle dhndl = ERTS_THR_PRGR_DHANDLE_INVALID;
 #endif
 
     erts_port_task_sched_lock(&pp->sched);
-    flags = erts_smp_atomic32_read_band_nob(&pp->sched.flags,
-					    ~ERTS_PTS_FLG_HAVE_NS_TASKS);
+    erts_smp_atomic32_read_band_nob(&pp->sched.flags,
+				    ~ERTS_PTS_FLG_HAVE_NS_TASKS);
     abort_list = pp->sched.taskq.local.busy.nosuspend;
     pp->sched.taskq.local.busy.nosuspend = NULL;
     erts_port_task_sched_unlock(&pp->sched);
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 6e9bf7ca12..70a2dc82f6 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -4270,6 +4270,7 @@ erts_early_init_scheduling(int no_schedulers)
 int
 erts_sched_set_wakeup_other_thresold(char *str)
 {
+#ifdef ERTS_SMP
     ErtsSchedWakeupOtherThreshold threshold;
     if (sys_strcmp(str, "very_high") == 0)
 	threshold = ERTS_SCHED_WAKEUP_OTHER_THRESHOLD_VERY_HIGH;
@@ -4283,16 +4284,23 @@ erts_sched_set_wakeup_other_thresold(char *str)
 	threshold = ERTS_SCHED_WAKEUP_OTHER_THRESHOLD_VERY_LOW;
     else
 	return EINVAL;
-#ifdef ERTS_SMP
     wakeup_other.threshold = threshold;
     set_wakeup_other_data();
-#endif
     return 0;
+#else
+    if (sys_strcmp(str, "very_high") == 0 || sys_strcmp(str, "high") == 0 ||
+	sys_strcmp(str, "medium") == 0 || sys_strcmp(str, "low") == 0 ||
+	sys_strcmp(str, "very_low") == 0) {
+	return 0;
+    } 
+    return EINVAL;
+#endif
 }
 
 int
 erts_sched_set_wakeup_other_type(char *str)
 {
+#ifdef ERTS_SMP
     ErtsSchedWakeupOtherType type;
     if (sys_strcmp(str, "default") == 0)
 	type = ERTS_SCHED_WAKEUP_OTHER_TYPE_DEFAULT;
@@ -4300,10 +4308,15 @@ erts_sched_set_wakeup_other_type(char *str)
 	type = ERTS_SCHED_WAKEUP_OTHER_TYPE_LEGACY;
     else
 	return EINVAL;
-#ifdef ERTS_SMP
     wakeup_other.type = type;
-#endif
     return 0;
+#else
+    if (sys_strcmp(str, "proposal") == 0 || sys_strcmp(str, "default") == 0 ||
+	sys_strcmp(str, "legacy") == 0) {
+	return 0;
+    } 
+    return EINVAL;
+#endif
 }
 
 int
diff --git a/erts/emulator/beam/export.c b/erts/emulator/beam/export.c
index 6b5121f917..5a9baf5572 100644
--- a/erts/emulator/beam/export.c
+++ b/erts/emulator/beam/export.c
@@ -383,7 +383,9 @@ void export_start_staging(void)
     IndexTable* dst = &export_tables[dst_ix];
     IndexTable* src = &export_tables[src_ix];
     struct export_entry* src_entry;
+#ifdef DEBUG
     struct export_entry* dst_entry;
+#endif
     int i;
 
     ASSERT(dst_ix != src_ix);
@@ -396,7 +398,10 @@ void export_start_staging(void)
     for (i = 0; i < src->entries; i++) {
 	src_entry = (struct export_entry*) erts_index_lookup(src, i);
         src_entry->ep->addressv[dst_ix] = src_entry->ep->addressv[src_ix];
-	dst_entry = (struct export_entry*) index_put_entry(dst, src_entry);
+#ifdef DEBUG
+	dst_entry = (struct export_entry*) 
+#endif
+	    index_put_entry(dst, src_entry);
 	ASSERT(entry_to_blob(src_entry) == entry_to_blob(dst_entry));
     }
     export_staging_unlock();