1 files changed, 10 insertions, 16 deletions

diff --git a/ruby.c b/ruby.c
index b50ee4507..854854b0a 100644
--- a/ruby.c
+++ b/ruby.c
@@ -407,25 +407,19 @@ ruby_init_loadpath_safe(int safe_level)
     incpush(RUBY_RELATIVE(RUBY_SEARCH_PATH));
 #endif
 
-    incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
-#ifdef RUBY_SITE_THIN_ARCHLIB
-    incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB));
-#endif
-    incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
+    incpush(RUBY_RELATIVE(RUBY_SITE_ARCH));
+    incpush(RUBY_RELATIVE(RUBY_SITE_ARCH2));
+    incpush(RUBY_RELATIVE(RUBY_SITE_ARCH3));
     incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+    incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
+    incpush(RUBY_RELATIVE(RUBY_SITE_LIB3));
 
-    incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2));
-#ifdef RUBY_VENDOR_THIN_ARCHLIB
-    incpush(RUBY_RELATIVE(RUBY_VENDOR_THIN_ARCHLIB));
-#endif
-    incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB));
+    incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCH));
+    incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCH2));
+    incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCH3));
     incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB));
-
-    incpush(RUBY_RELATIVE(RUBY_LIB));
-#ifdef RUBY_THIN_ARCHLIB
-    incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));
-#endif
-    incpush(RUBY_RELATIVE(RUBY_ARCHLIB));
+    incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2));
+    incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB3));
 
     if (safe_level == 0) {
 	incpush(".");