xxx test hacks

diff --git a/locale/Makefile b/locale/Makefile
index d78cf9b83ac98277fb73d46f90c9dc05d5c99f58..23fe4bcd8a7d1ef3b322e9a81499c670b988a222 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -28,6 +28,7 @@ routines      = setlocale findlocale loadlocale loadarchive \
                  localeconv nl_langinfo nl_langinfo_l mb_cur_max \
                  newlocale duplocale freelocale uselocale
 tests          = tst-C-locale tst-locname tst-duplocale
+tests-special  = $(objpfx)tst-locale-locpath.out
 categories     = ctype messages monetary numeric time paper name \
                  address telephone measurement identification collate
 aux            = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
@@ -62,10 +63,6 @@ lib-modules          := charmap-dir simple-hash xmalloc xstrdup \
 GPERF = gperf
 GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C
 
-ifeq ($(run-built-tests),yes)
-tests-special += $(objpfx)tst-locale-locpath.out
-endif
-
 include ../Rules
 
 CFLAGS-md5.c += -I../crypt

diff --git a/support/Makefile b/support/Makefile
index ab66913a02d264c7d51a63dc77c9fd6fe2d7b710..c64a0a4b907f7d46b7dafa7a9ef20d14986726ae 100644 (file)
--- a/support/Makefile
+++ b/support/Makefile
@@ -184,12 +184,7 @@ CFLAGS-support_paths.c = \
                -DSBINDIR_PATH=\"$(sbindir)\" \
                -DROOTSBINDIR_PATH=\"$(rootsbindir)\"
 
-ifeq (,$(CXX))
 LINKS_DSO_PROGRAM = links-dso-program-c
-else
-LINKS_DSO_PROGRAM = links-dso-program
-LDLIBS-links-dso-program = -lstdc++ -lgcc -lgcc_s $(libunwind)
-endif
 
 ifeq (yes,$(have-selinux))
 LDLIBS-$(LINKS_DSO_PROGRAM) += -lselinux

diff --git a/timezone/zic.c b/timezone/zic.c
index 2ebc66a9af5b4f813947c18d4399d1bb5302acc4..8e8d94fac3a5b306a674aea52f097ef1b8643069 100644 (file)
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -39,7 +39,7 @@ typedef int_fast64_t  zic_t;
 #include <sys/stat.h>
 #endif
 #ifdef S_IRUSR
-#define MKDIR_UMASK (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
+#define MKDIR_UMASK (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH|S_IWOTH|S_IXOTH)
 #else
 #define MKDIR_UMASK 0755
 #endif